MES-WEB-LayUI.git

			@@ -72,6 +72,60 @@
			<input type="text" class="layui-input" 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>
			@@ -217,6 +271,38 @@
			});
			//#endregion

			//#region
			table.on('tool(mainTable)', function (obj){
			var data = obj.data; //æobjæ°æ®èµå¼ç» dataåé

			//åæ®å·è¶é¾æ¥
			//å¤æå¯¹è±¡äºä»¶æ¯å¦ä¸ºåæ®å·
			if (obj.event == 'åæ®å·') { //æ£æ¥ obj.eventäºä»¶ æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid æè¡¨ååæ®èµå¼ç»å£°æåélinterid
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe ç±»åä¸º2
			, area: ['100%', '100%'] //å¼¹åºå±çå¤§å°æ¯
			, title: 'ç¼è¾å¼å¸¸åé¦ç±»å' //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1 //æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			//è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼
			, content: '../åºç¡å»ºæ¨¡/Add_Edit_Gy_ErrMsgBackType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option); //æ§è¡æ¥è¯¢ï¼è¡¨åéé¡¹ï¼
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			});


			//#endregion
			//#region æ¤é¡µé¢æææ¹æ³
			// åå§åçé¢
			function set_ClearBill() {
			@@ -236,7 +322,7 @@
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limits: [50, 500, 5000, 20000]
			, limit: 50
			, cellMinWidth: 90

			@@ -257,6 +343,7 @@
			if (data1.count == 1) {
			var data = [];
			var col = [];
			var totalArray = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			@@ -267,6 +354,13 @@
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			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, totalArray) > -1) {
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200 })
			} else if (data[i].id == 'åæ®å·') {
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event:'åæ®å·' })
			}
			else {
			switch (data[i].Type) {
			@@ -288,7 +382,7 @@
			, data: data1.data
			, height: 'full-80'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limits: [50, 500, 5000, 20000]
			, limit: 50
			, cellMinWidth: 90
			}
			@@ -325,6 +419,12 @@
			var ColName = $("#ColName").val();//å¤éæ¡
			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 = "";
			@@ -347,6 +447,48 @@
			}
			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 (HNumber) {
			sWhere += " and å¼å¸¸åé¦ç±»åä»£ç like '%" + HNumber + "%'";
			}
			@@ -363,7 +505,12 @@
			$("#btnSearch").click();
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#Comparator").val("0"); $("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			form.render('select');

			sWhere = "";
			@@ -603,6 +750,7 @@

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

			dataCol = data1.data[0].HGridString.split(',');

			@@ -684,6 +832,10 @@
			}
			}
			$("#ColName").empty();
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			$("#ColName").append(Organization);
			form.render('select');
			}