MES-WEB-LayUI.git

			@@ -83,7 +83,13 @@
			</select>
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">IDå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBatchNo1" id="HBatchNo1">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å·¥åºåç§°</label>
			@@ -101,12 +107,33 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">è®¾å¤ç¼å·</label>
			<label class="layui-form-label" style="width: 85px;">çäº§èµæº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" lay-verify="HEquipNumber" name="HEquipNumber" id="HEquipNumber" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
			<input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" value="" style="background-color: #efefef4d; width: 70%; display: inline-block;" readonly>
			<input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæåæ¹æ¬¡</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBachNO_BCP" id="HBachNO_BCP" value="" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æåæ¹æ¬¡</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBachNO_CP" id="HBachNO_CP" value="" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			@@ -322,23 +349,31 @@
			var HBeginDate = $("#HBeginDate").val();
			var HEndDate = $("#HEndDate").val();
			var HBatchNo = $("#HBatchNo").val();
			var HBatchNo1 = $("#HBatchNo1").val();
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨
			var HProcName = $("#HProcName").val();//å·¥åº
			var HReceiveMan = $("#HReceiveMan").val();//æåå
			var HEquipNumber = $("#HEquipNumber").val();//è®¾å¤ç¼ç
			var HSourceID = $("#HSourceID").val();//è®¾å¤ç¼ç
			var HMaterName = $("#HMaterName").val();//ç©æåç§°
			var HBachNO_BCP = $("#HBachNO_BCP").val();//åæåæ¹æ¬¡
			var HBachNO_CP = $("#HBachNO_CP").val();//æåæ¹æ¬¡

			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HBatchNo: HBatchNo
			, HBatchNo1: HBatchNo1
			, HProject: HProject
			, HBatchWork: HBatchWork
			, HDivisionName: HDivisionName
			, HProcName: HProcName
			, HReceiveMan: HReceiveMan
			, HEquipNumber: HEquipNumber
			, HSourceID: HSourceID
			, HMaterName: HMaterName
			, HBachNO_BCP: HBachNO_BCP
			, HBachNO_CP: HBachNO_CP
			}
			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -353,7 +388,10 @@
			$("#HReceiveMan").val("");
			$("#HBatchNo").val("");
			$("#HProcName").val("");
			$("#HEquipNumber").val("");
			$("#HSourceID").val("");
			$("#HMaterName").val("");
			$("#HBachNO_BCP").val("");
			$("#HBachNO_CP").val("");
			form.render('select');
			sWhere = "";
			}
			@@ -469,6 +507,47 @@
			});
			});


			//çäº§èµæº
			form.on('submit(btnHSource)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'çäº§èµæºåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæºåç§°);
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});



			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			@@ -479,8 +558,7 @@
			if (data1.data.length != 0) {

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


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

			for (var i = 0; i < option.cols[0].length - 1; i++) {