MES-WEB-LayUI.git

			@@ -21,7 +21,7 @@
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<form class="layui-form" action="" lay-filter="component-form-group" >
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			@@ -81,6 +81,13 @@
			<input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-row" style="padding: 10px 0; margin-left: 4%;">
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			@@ -95,34 +102,90 @@
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top: 5px; margin-left: 4%;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			<div class="layui-row" style="margin-top: 5px; margin-left: 4%;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" 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="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" 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 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-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">

			<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 class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			@@ -158,6 +221,9 @@
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print1" id="Print1">
			<i class="layui-icon layui-icon-file"></i>æ®è²ç¹æå°
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="WhiteSave" id="WhiteSave">
			<i class="layui-icon layui-icon-file"></i>ç½æ çæ
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
			<i class="layui-icon layui-icon-file"></i>å é¤
			@@ -254,7 +320,10 @@
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);

			if ($("#HInitTimeCycle").val() == 0 && $("#HInitTimeCycle").val() == "") {
			setSelect_HInitTimeCycle();
			}

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			@@ -266,11 +335,30 @@
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			});
			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

			//æ§è¡æ¥è¯¢æ¹æ³
			$("#btnSearch").click;
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));//å¼å§æ¥æ
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#HBarCode_Pack").val("");//å¯ä¸æ¡ç
			$("#HICMOBillNo").val("");//æ¡ç
			@@ -281,6 +369,13 @@
			$("#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');
			$("#btnSearch").click();
			});
			@@ -299,6 +394,12 @@
			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) {
			@@ -319,6 +420,47 @@
			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 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HBarCode_Pack) {
			@@ -437,6 +579,28 @@

			//});

			//ç½æ çæä¿å
			form.on('submit(WhiteSave)', function (obj) {//éåº
			var checkStatus = table.checkStatus("mainTable"); //è·åéä¸è¡ç¶æ
			if (checkStatus.data.length == 1) {
			var HBarCode_Pack = checkStatus.data[0].å¯ä¸æ¡ç ;
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'ç½æ æå°' //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1//æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../è½¦é´ç®¡ç/äº§çº¿/MES_WhiteLabelGeneration.html?OperationType=1&HBarCode_Pack=' + HBarCode_Pack //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼
			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°

			})
			} else {
			layer.msg("è¯·éæ©ä¸è¡è¿è¡ç½æ çæ!");
			}
			});


			form.on('submit(Print)', function (obj) {//éåº
			var checkStatus = table.checkStatus("mainTable"); //è·åéä¸è¡ç¶æ
			@@ -445,7 +609,7 @@
			////var linterid = $("#HInterID").val();
			////var linterid = "28973";
			var Type = "HBarCodePrint";
			var OpenTmp = "ç½æ æå°";
			var OpenTmp = "ç½æ æå°1";
			//var ReportViewer = document.getElementById("ReportViewer");
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
			});
			@@ -530,8 +694,24 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			});
			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelistæ°ç»åå«ä¸æ¶é´ç¸å³çæ´æ°å¼
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"]; //itilelistä¸valuelistå¼ç¸å¯¹äºçè¡¨ï¼ä¸ä½ä¸ºä¸ææ¡ææ¬æ¾ç¤º

			//åææ¾ç¤ºä¸ææ¡
			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';//å®ä¹åç¬¦ä¸²HInitTimeCycle_ArrayList ä½ç¨äºä¸æåçhtmlåå®¹ åå«optionåç´ ï¼å¼ä¸ºâ1ï¼ä¸å¨ä¸ææ¡æ¾ç¤ºä»»æé´é
			for (var i = 0; i < valueList.length; i++) { // éåvalueList æ°ç» ä½¿æ¯ä¸ä¸ªå¼çæä¸ä¸ªå¯¹åºoptionåç´
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// æçæçoptionåç´ æ·»å å¥HInitTimeCycle_ArrayListåç¬¦ä¸²ä¸
			}

			$("#HInitTimeCycle").empty(); //ä½¿ç¨jqueryçemptyæ¹æ³æ¸ç©ºHInitTimeCycle_ArrayList <select>åç´ çå¼
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //ä½¿ç¨appendæ¹æ³æå»ºä¹åHInitTimeCycle_ArrayListåç¬¦ä¸² çåå®¹ä¼ å¥HInitTimeCycle
			form.render('select'); //è°ç¨ éæ°æ¸²æselectåç´

			$("#HInitTimeCycle").val("29"); //ä½¿ç¨jQueryçval()æ¹æ³å°ä¸æåè¡¨çéä¸å¼è®¾ç½®ä¸º"29 ï¼ä¸æ¾ç¤ºãè¿ä¸æå¤©ã
			}
			//#endregion
			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			@@ -541,9 +721,13 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}

			//#endregion
			//laydate.render({
			// elem: '#HDate'
			// , type: 'datetime'