MES-WEB-LayUI.git

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>ç½å¯åå¸æç»æ¥è¡¨</title>
			<title>æåæç»æ¥è¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			@@ -62,25 +62,37 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>-->
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>-->
			<!--<div class="layui-inline">
			<label class="layui-form-label">-</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</div>
			</div>-->
			<label class="layui-form-label">-</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</div>
			</div>-->
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-inline">
			<label class="layui-form-label">åè®¡å¬æ¤æ°</label>
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">ç½å¯åå¸åè®¡å¬æ¤æ°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumHMaterOutQty" id="SumHMaterOutQty" disabled="disabled">
			</div>
			</div>
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">æååºç«åè®¡å¬æ¤æ°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumDyeColorOut" id="SumDyeColorOut" disabled="disabled">
			</div>
			</div>
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">å·®é¢</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumCompare" id="SumCompare" disabled="disabled">
			</div>
			</div>
			<!--<div class="layui-inline">
			@@ -149,12 +161,69 @@
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			</div>
			@@ -188,6 +257,8 @@
			var HModName = "ProdProcessEntryReport_DyeColor";

			var detailBar = 0; //ç¨äºæ±æ»æ¥è¡¨æ¥çæç»æ¥è¡¨ï¼å½ä¸º0æ¶æ¾ç¤ºæç»æ±æ»æ¥è¡¨å¯¹åºæç»æ¥è¡¨ã

			var ins; //ç¨äºå¯¼åºexcel
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -201,6 +272,10 @@
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			break;
			@@ -216,9 +291,29 @@
			});
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			var ajaxLoad1 = layer.load();
			get_FastQuery();
			layer.close(ajaxLoad1);
			});

			//è¡çå¬äºä»¶-åå»
			table.on('row(mainTable)', function (obj) {
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			});
			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			@@ -226,20 +321,20 @@
			//åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¶é´
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd");
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd");
			laydate.render({
			elem: '#HBeginDate',
			type: 'datetime',
			type: 'date',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, format: 'yyyy-MM-dd'
			, value: HBeginDate
			});
			laydate.render({
			elem: '#HEndDate',
			type: 'datetime',
			type: 'date',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, format: 'yyyy-MM-dd'
			, value: HEndDate
			});

			@@ -256,76 +351,88 @@

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			var HBeginDate = $("#HBeginDate").val() + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val() + ":00:00";//ç»ææ¥æ
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProductName = $("#HProductName").val();//äº§ååç§°
			var HProductModel = $("#HProductModel").val();//äº§åè§æ ¼

			//ä»»æåæ®µæ¡ä»¶è¿æ»¤ æ¡ä»¶æå
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			var sProcessNo = $("#sProcessNo").val(); //æµè½¬å¡å·

			//æ¼æ¥ä»»ä¸åæ®µè¿æ»¤æ¥è¯¢æ¡ä»¶
			var com = "";
			if (ColName != 0 && Comparator != 0) {
			switch (Comparator) {
			case "7":
			com = "like ''%" + ColContent + "%''";
			break;
			case "8":
			com = "like ''%" + ColContent + "''";
			break;
			case "9":
			com = "like ''" + ColContent + "%''";
			break;
			case "10":
			com = "not like ''%" + ColContent + "%''";
			break;
			default:
			com = "" + Comparator + " ''" + ColContent + "''";
			break;
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, totalRow: true
			, height: 'full-70'
			, cols: [[
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 160 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 160 }
			, { field: 'å®¢æ·', title: 'å®¢æ·', width: 160 }
			, { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§ä»»å¡åæ°é', totalRow: true, width: 200 }
			, { field: 'ç½å¯åå¸', title: 'ç½å¯åå¸', width: 160, totalRow: true }
			, { field: 'æ¯å¦ä¸æ¨çææµè½¬å¡', title: 'æ¯å¦ä¸æ¨çææµè½¬å¡', width: 160 }
			]]
			, done: function (res) {
			}
			com = " and (" + ColName + " " + com + ")";
			}
			};
			}

			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HMaterNumber: HMaterNumber
			, HBillNo: HBillNo
			, HProductName: HProductName
			, HProductModel: HProductModel
			, RandomSearch: com
			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			sWhere = JSON.stringify(sWhere);
			$("#ColName").empty();
			$("#ColName").append(Organization); $("#ColName1").empty();
			$("#ColName1").append(Organization); $("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}

			//å¨æå-ç¼ååè¡¨

			//å è½½ç½æ ¼
			function get_Display(sWhere,sProcessNo) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor",
			type: "GET",
			url: GetWEBURL() + '/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor',
			async: false,
			data: { "sWhere": sWhere,"sProcessNo":''},
			//async: false,
			type: "GET",
			data: { "sWhere": sWhere, "sProcessNo": sProcessNo, "user": sessionStorage["HUserName"] },
			success: function (data1) {

			if (data1.count == 1) {
			//è°æ´æ¥ææ ¼å¼ï¼æ¾ç¤º å¹´ææ¥ å æ¶
			for (var i = 0; i < data1.data.length; i++) {
			if (data1.data[i].æååºç«æ¥æ != null) {
			data1.data[i].æååºç«æ¥æ = data1.data[i]["æååºç«æ¥æ"].split(":")[0] + ':' + data1.data[i]["æååºç«æ¥æ"].split(":")[1];
			data1.data[i].æååºç«æ¥æ = data1.data[i]["æååºç«æ¥æ"].replace("T", " ");
			}
			if (data1.data[i].ç½å¯åå¸æ¥æ != null) {
			data1.data[i].ç½å¯åå¸æ¥æ = data1.data[i]["ç½å¯åå¸æ¥æ"].split(":")[0] + ':' + data1.data[i]["ç½å¯åå¸æ¥æ"].split(":")[1];
			data1.data[i].ç½å¯åå¸æ¥æ = data1.data[i]["ç½å¯åå¸æ¥æ"].replace("T", " ");
			}
			if (data1.data[i].çäº§è®¢åæ¥æ != null) {
			data1.data[i].çäº§è®¢åæ¥æ = data1.data[i]["çäº§è®¢åæ¥æ"].split("T")[0];
			}
			}



			var totalArray = ["çäº§ä»»å¡åæ°é", "ç½èåå¸"];

			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}


			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, "") > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			if ($.inArray(data[i].name, totalArray) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			}
			else if (data[i].ColName == 'ç½å¯åå¸') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			@@ -341,91 +448,14 @@
			}
			}
			}
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, totalRow: true
			, height: 'full-70'
			, cols: [col]
			, data: data1.data
			};
			table.render(option);
			} else {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, totalRow: true
			, height: 'full-70'
			, cols: [[
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 160 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 160 }
			, { field: 'å®¢æ·', title: 'å®¢æ·', width: 160 }
			, { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§ä»»å¡åæ°é', width: 200 }
			, { field: 'ç½å¯åå¸', title: 'ç½å¯åå¸', width: 160, totalRow: true }
			, { field: 'æ¯å¦ä¸æ¨çææµè½¬å¡', title: 'æ¯å¦ä¸æ¨çææµè½¬å¡', width: 160 }
			]]
			, done: function (res) {
			}
			};
			table.render(option);
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			});
			}
			})
			}

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 0; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');
			}


			//å è½½ç½æ ¼
			function get_Display(sWhere,sProcessNo) {
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor',
			type: "GET",
			data: { "sWhere": sWhere, "sProcessNo": sProcessNo },
			success: function (data1) {
			if (data1.count == 1) {
			//è°æ´æ¥ææ ¼å¼ï¼æ¾ç¤º å¹´ææ¥ å æ¶
			for (var i = 0; i < data1.data.length; i++) {
			if (data1.data[i].æååºç«æ¥æ != null) {
			data1.data[i].æååºç«æ¥æ = data1.data[i]["æååºç«æ¥æ"].split(":")[0] + ':' + data1.data[i]["æååºç«æ¥æ"].split(":")[1];
			data1.data[i].æååºç«æ¥æ = data1.data[i]["æååºç«æ¥æ"].replace("T", " ");
			}
			if (data1.data[i].ç½å¯åå¸æ¥æ != null) {
			data1.data[i].ç½å¯åå¸æ¥æ = data1.data[i]["ç½å¯åå¸æ¥æ"].split(":")[0] + ':' + data1.data[i]["ç½å¯åå¸æ¥æ"].split(":")[1];
			data1.data[i].ç½å¯åå¸æ¥æ = data1.data[i]["ç½å¯åå¸æ¥æ"].replace("T", " ");
			}
			}

			option.cols = [col];
			option.data = data1.data;



			ins = table.render(option);
			//var num = 0;
			//for (let i = 0; i < data1.data.length; i++) {
			// for (let j = i + 1; j < data1.data.length; j++) {
			@@ -438,7 +468,7 @@
			// }
			// }
			//}
			table.render(option);
			ins = table.render(option);

			//è®¡ç®åè®¡å¬æ¤æ°
			var sumHMaterOutQty = 0;
			@@ -447,15 +477,26 @@
			}
			$("#SumHMaterOutQty").val(sumHMaterOutQty);

			layer.close(wait);
			//è®¡ç®æååºç«åè®¡å¬æ¤æ°
			var sumDyeColorOut = 0;
			for (var i = 0; i < data1.data.length; i++) {
			sumDyeColorOut += data1.data[i]["æååºç«"];
			}
			$("#SumDyeColorOut").val(sumDyeColorOut);

			//è®¡ç®å·®é¢
			var sumCompare = sumHMaterOutQty - sumDyeColorOut;
			$("#SumCompare").val(sumCompare);

			layer.close(ajaxLoad);
			} else {
			$("#SumHMaterOutQty").val("");
			layer.close(wait);
			layer.close(ajaxLoad);
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			$("#SumHMaterOutQty").val("");
			layer.close(wait);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			@@ -463,8 +504,20 @@

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val() + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val() + ":00:00";//ç»ææ¥æ
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ

			if (HBeginDate == '') {
			HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			} else {
			HBeginDate = $("#HBeginDate").val() + " 00:00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			}
			if (HEndDate == '') {
			HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//ç»ææ¥æ
			} else {
			HEndDate = $("#HEndDate").val() + " 00:00:00";//ç»ææ¥æ
			}

			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProductName = $("#HProductName").val();//äº§ååç§°
			@@ -477,6 +530,12 @@

			var sProcessNo = $("#sProcessNo").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();
			//æ¼æ¥ä»»ä¸åæ®µè¿æ»¤æ¥è¯¢æ¡ä»¶
			var com = "";
			if (ColName != 0 && Comparator != 0) {
			@@ -499,10 +558,60 @@
			}
			com = " 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;
			}
			var params = get_UrlVars();
			if (params[params[0]] != null && detailBar==0) {
			if (params[params[0]] != null && detailBar == 0) {
			//æ±æ»æ¥è¡¨ççäº§è®¢åå·
			HBillNo = params[params[0]];
			//è®¾ç½®çäº§è®¢åå·æ ç¾
			$("#HBillNo").val(HBillNo);

			//è®¾ç½®æ¶é´ä¸ºä¸ä¸ªå¾å¤§çå¼ï¼é»è®¤æç´¢æææ¶é´çæç»
			HBeginDate = "1900-01-01 00:00:00";
			HEndDate = "2200-01-01 00:00:00";


			detailBar = 1;
			} else {
			HBillNo = $("#HBillNo").val(); //åæ®å·
			@@ -526,22 +635,39 @@
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			//åå§åæ¶é´
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd");
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd");
			laydate.render({
			elem: '#HBeginDate',
			type: 'datetime',
			type: 'date',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, format: 'yyyy-MM-dd'
			, value: HBeginDate
			});
			laydate.render({
			elem: '#HEndDate',
			type: 'datetime',
			type: 'date',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, format: 'yyyy-MM-dd'
			, value: HEndDate
			});
			////åå§åæ¶é´
			//var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			//var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			//laydate.render({
			// elem: '#HBeginDate',
			// type: 'datetime',
			// fullPanel: true
			// , format: 'yyyy-MM-dd HH'
			// , value: HBeginDate
			//});
			//laydate.render({
			// elem: '#HEndDate',
			// type: 'datetime',
			// fullPanel: true
			// , format: 'yyyy-MM-dd HH'
			// , value: HEndDate
			//});

			//$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			//$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			@@ -552,16 +678,44 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			//form.render()
			ColFilter();
			sWhere = "";
			}

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Kf_ProdProcessEntryReport_DyeColor_ExportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins.config.id, option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 0; i < option.cols[0].length; i++) {
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			@@ -587,9 +741,11 @@

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			var ajaxLoad = layer.load();
			ColFilter();
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			async: false,
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			@@ -600,7 +756,7 @@

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

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			@@ -662,8 +818,9 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			layer.close(ajaxLoad);
			}



			//#endregion
			});