MES-WEB-LayUI.git

			@@ -86,6 +86,60 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -272,6 +326,33 @@
			});
			//#endregion


			form.on('tool(maintable)', function (obj) {
			var data = obj.data;
			if (obj.event == 'åæ®å·') {
			var a = data[i].hmainid.toString();
			layer.open({
			Type: 2,
			area:['80%','80%'],
			title: 'ç¼è¾' + HPageTitle,
			closeBtn: 1,
			maxmin: true,
			shade: 0.6,
			anim: 0,
			content: '../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectEndBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
			resize: false,
			end: function () {
			get_FastQuery(table, option);

			}
			, cancel: function () {

			}

			})

			}
			})
			//#endregion

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
			@@ -304,7 +385,7 @@
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 50000]
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			@@ -326,6 +407,8 @@
			if (data1.count == 1) {
			var data = [];
			var col = [];
			var tolalArray=[];

			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			@@ -335,6 +418,11 @@
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			} else if ($.inArray(data[i].name, tolalArray)>-1) {
			col.push({ filed: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 150 });

			} else if (data[i].name == 'åæ®å·') {
			col.push({ filed: data[i].id, title: data[i].name ,align: 'center', sort: true, width: 150, event:'åæ®å·' })
			}

			else {
			@@ -353,6 +441,23 @@
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			option = {
			elem: '#mainTable' // ä½¿ç¨#mainTableä½ä¸ºè¡¨æ ¼çDOMåç´
			, toolbar: '#toolbarDemo' //å è½½tolbardemoè¿ä¸ªè¡¨æ ¼
			, cols: [col] // é¡µé¢æ¾ç¤º
			, data: data1.data // è¡¨æ ¼æ°æ®
			, height: 800 //è¡¨æ ¼é«åº¦ä¸º800
			, page: true // å¼å¯åé¡µ
			, totalRow: true // æ¯å¦æ¾ç¤ºåè®¡è¡
			, cellMinWidth: 90 // ååæ ¼æå°å®½åº¦
			, limit: 50 // é»è®¤æ¯é¡µæ¾ç¤ºçæ¡æ°
			, limits: [50, 500, 5000, 20000] // å¯éçæ¯é¡µæ¾ç¤ºæ¡æ°
			//resä»æå¡å¨è¿åçæ°æ® currå½åé¡µç æ¾ç¤ºå½åé¡µç æ°æ® countï¼è¿éå¸¸è¡¨ç¤ºæ°æ®çæ»æ¡æ° åé¡µæ§ä»¶
			, done: function (res, curr, count) { // åè°è°ç¨æ¾ç¤ºå½åé¡µç æ°æ®åæ°æ®æ»æ¡æ°
			soulTable.render(this); // å¦æsoulTable.renderæ¯ç¨äºéæ°æ¸²æè¡¨æ ¼ç éæ°æ¸²æè¡¨æ ¼
			}
			}
			option.cols = [col];
			@@ -393,6 +498,13 @@
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			@@ -413,6 +525,48 @@
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HBillNo) {
			@@ -437,7 +591,12 @@
			$("#HName").val("");
			$("#HReceiveEmp").val("");
			$("#HBillStatus").val("");

			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			@@ -748,8 +907,7 @@
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			//var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å± var titleData = ["HInterID", "HBillStatus", "HProjectID", "HPMTeamID", "HPMEmpID", "HWorkEmpID", "HCusID", "HManagerID", "HOrgID", "HEntryID","HTestEmp"];
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {
			@@ -820,8 +978,7 @@
			})
			}
			//#endregion

			//#region ä»»æåæ®µè¿æ»¤ï¼ååæ¾ç¤ºä¸ææ¡
			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			@@ -831,6 +988,10 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion