MES-WEB-LayUI.git

			@@ -13,15 +13,24 @@
			<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../layuiadmin/PageTitle.js"></script>
			<style type="text/css">
			.layui-form-label {
			width: 95px;
			}
			/* é²æ¢ä¸ææ¡çä¸æåè¡¨è¢«éè---å¿é¡»è®¾ç½®--- */
			.layui-table-cell {
			overflow: visible !important;
			}
			/* ä½¿å¾ä¸ææ¡ä¸ååæ ¼åå¥½åé */
			td .layui-form-select {
			margin-top: -10px;
			margin-left: -15px;
			margin-right: -15px;
			}
			</style>
			</head>
			<body>

			<div id="layout1" class="layui-fluid">
			<div class="layui-row layui-col-space15">
			<div class="layui-col-md12">
			@@ -29,13 +38,9 @@
			<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">

			<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">éåº</button>


			</div>

			</div>
			<div class="layui-card-body">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			@@ -50,7 +55,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input id="HInterID" name="HInterID" type="hidden" />
			<input id="HMaker" name="HMaker" type="hidden" /><!--å¶åäºº-->
			</div>
			@@ -71,7 +76,7 @@
			<label class="layui-form-label">è®¾å¤<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;"readonly="readonly">
			<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -117,6 +122,36 @@
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¼å¸¸æåµè®°å½</label>
			<div class="layui-input-inline">
			<input type="text" name="HErrNote" id="HErrNote" class="layui-input">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éå¤§å®å¨<br />éæ£è®°å½</label>
			<div class="layui-input-inline" style="margin-top:10px;">
			<input type="text" name="HBigSafeNote" id="HBigSafeNote" class="layui-input">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç¹æ£æ°æ®</label>
			<div class="layui-input-inline">
			<input type="text" name="HDotCheckNote" id="HDotCheckNote" class="layui-input">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§çæ¬¡</label>
			<div class="layui-input-inline">
			<input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="text" name="HShiftsName" id="HShiftsName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHShifts" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-inline">
			<textarea placeholder="è¯·è¾å¥æè¦" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
			@@ -126,6 +161,13 @@
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-inline">
			<textarea placeholder="è¯·è¾å¥å¤æ³¨" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æç»ç»è®º</label>
			<div class="layui-input-inline">
			<input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
			<input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
			</div>
			</div>
			</div>
			@@ -154,6 +196,14 @@
			<script type="text/html" id="barDemo">
			<!--<a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>-->
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			<!--è¡ä¸æéæ©(ç¹æ£ç»æ)-->
			<script type="text/html" id="HDotCheckResult">
			<select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">
			<!--<option value="">è¯·éæ©</option>-->
			<option value="Y" selected>Y</option>
			<option value="X">X</option>
			</select>
			</script>
			<script>
			var OptionData = [];
			@@ -221,7 +271,7 @@
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
			var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "","HDotCheckResult":"Y"};
			switch (obj.event) {
			//æ°å¢ä¸è¡
			case 'btn-AddLine': btnAddLine(NewRow);
			@@ -272,6 +322,42 @@
			}
			});
			});

			//è¡¨å¤´ä¿¡æ¯çäº§çæ¬¡å¼¹çª
			form.on('submit(btnHShifts)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'çäº§çæ¬¡åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true
			, content: ['../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.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('è¯·éæ©æ°æ®');
			}
			$("#HShiftsID").val(checkStatus.data[0].HItemID);
			$("#HShiftsName").val(checkStatus.data[0].çæ¬¡åç§°);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			},
			success: function (layero, index) {
			}
			});
			});

			//è·åè®¾å¤ç¹æ£è§ç¨
			function get_DocCheckItem() {
			$.ajax({
			@@ -283,7 +369,7 @@
			if (result.count == 1) {
			var DJData = result;//
			var rowdate1 = layui.table.cache["mainTable"];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
			table.render(option);
			$("#HEquipDotCheckRuleInterID").val(DJData.data[0].HInterID);
			$("#HEquipDotCheckRuleInterNo").val(DJData.data[0].HBillNo);
			@@ -294,17 +380,20 @@
			var checkrow = {
			"HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
			"HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
			"HManagerName": DJData.data[i].HManagerName
			"HManagerName": DJData.data[i].HManagerName, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
			};
			buttonArr.push(checkrow); //å°ä¹åçæ°æ®åå¨
			}
			table.reload("mainTable", {
			data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			})

			option.data = buttonArr;
			table.render(option);
			//table.reload("mainTable", {
			// data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			//})
			}
			}
			else {
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
			table.render(option);
			//layer.alert("è¯¥è®¾å¤ææ é»è®¤ç¹æ£è®°å½", { icon: 5 });
			}
			@@ -348,6 +437,39 @@
			}
			});
			});
			//è¡éæ©å¤çï¼ç¹æ£ç»æï¼
			form.on('select(HDotCheckResult)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HDotCheckResult = data.value;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});

			//for (var i = 1; i <= option.data.length; i++) {
			// $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
			//}
			//form.render('select');
			console.log(table.cache['mainTable']);

			var HQty = 0;//è¡¨ä½è¡ä¸åæ ¼æ°é
			for (let i = 0; i < table.cache['mainTable'].length; i++) {
			if (table.cache['mainTable'][i].HDotCheckResult == "X") {
			HQty++;
			}
			}
			if (HQty > 0) {
			document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			} else {
			document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			}
			form.render('radio');
			});

			window.get_DocCheckItem2 = function () {
			$.ajax({
			url: GetWEBURL() + "/Web/GetDotCheckRuleItemByDotCheckRuleID",
			@@ -358,7 +480,7 @@
			if (result.count == 1) {
			var DJData = result;//
			var rowdate1 = layui.table.cache["mainTable"];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
			table.render(option);

			if (DJData.data.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			@@ -368,17 +490,19 @@
			var checkrow = {
			"HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
			"HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
			"HManagerName": DJData.data[i].HManagerName
			"HManagerName": DJData.data[i].HManagerName, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
			};
			buttonArr.push(checkrow); //å°ä¹åçæ°æ®åå¨
			}
			table.reload("mainTable", {
			data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			})
			option.data = buttonArr;
			table.render(option);
			//table.reload("mainTable", {
			// data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			//})
			}
			}
			else {
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
			table.render(option);
			//layer.alert("è¯¥è®¾å¤ææ é»è®¤ç¹æ£è®°å½", { icon: 5 });
			}
			@@ -433,7 +557,7 @@
			if (result.count == 1) {
			var DJData = result.data;//
			var rowdate1 = layui.table.cache["mainTable"];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
			table.render(option);

			if (DJData.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			@@ -444,19 +568,22 @@
			var checkrow = {
			"HDotCheckItemID": DJData[i].HDotCheckID, "HDotCheckCode": DJData[i].ç¹æ£é¡¹ç®ä»£ç , "HDotCheckItem": DJData[i].ç¹æ£é¡¹ç®,
			"HDotCheckPart": DJData[i].ç¹æ£é¨ä½, "HClaim": DJData[i].å·ä½è¦æ±, "HManagerID": DJData[i].HEmployeeID,
			"HManagerCode": DJData[i].è´è´£äººä»£ç , "HManagerName": DJData[i].è´è´£äººåç§°, "HRemark": DJData[i].HRemark
			"HManagerCode": DJData[i].è´è´£äººä»£ç , "HManagerName": DJData[i].è´è´£äººåç§°, "HRemark": DJData[i].HRemark,
			"HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
			};
			buttonArr.push(checkrow); //å°ä¹åçæ°æ®åå¨
			}
			table.reload("mainTable", {
			data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			})
			option.data = buttonArr;
			table.render(option);
			//table.reload("mainTable", {
			// data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			//})
			} else {
			layer.alert("ç¹åæ¶é´æ®µææ éè¦ç¹æ£çè§å", { icon: 5 });
			}
			}
			else {
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
			table.render(option);
			//layer.alert("è¯¥è®¾å¤ææ é»è®¤ç¹æ£è®°å½", { icon: 5 });
			}
			@@ -472,6 +599,7 @@
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
			console.log(sSubStr);
			if (AllowLoadData(sSubStr)) {
			$.ajax(
			{
			@@ -489,9 +617,7 @@
			});
			}
			else {

			f_alert(data.Message);
			console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
			}
			layer.closeAll("loading");
			},
			@@ -536,11 +662,16 @@
			function set_InitGrid() {
			//è¡¨å¤´
			columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡'}
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" }
			, { field: 'HDotCheckItemID', title: 'ç¹æ£é¡¹ç®ID', edit: 'text', hide: true }
			, { field: 'HDotCheckCode', title: 'ç¹æ£é¡¹ç®ä»£ç ', edit: 'text', event: "HDotCheckCode" }
			, { field: 'HDotCheckItem', title: 'ç¹æ£é¡¹ç®', edit: 'text', event: "" }
			, { field: 'HDotCheckItemClassID', title: 'ç¹æ£é¡¹ç®åç±»ID', edit: 'text', hide: true }
			, { field: 'HDotCheckItemClassName', title: 'ç¹æ£é¡¹ç®åç±»', edit: 'text', event: 'HDotCheckItemClassName' }
			, { field: 'HDotCheckItemMethodID', title: 'ç¹æ£æ¹æ³ID', edit: 'text', hide: true }
			, { field: 'HDotCheckItemMethodName', title: 'ç¹æ£æ¹æ³', edit: 'text', event: 'HDotCheckItemMethodName' }
			, { field: 'HDotCheckResult', title: 'ç¹æ£ç»æ', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
			, { field: 'HDotCheckPart', title: 'ç¹æ£é¨ä½', edit: 'text', event: "" }
			, { field: 'HClaim', title: 'å·ä½è¦æ±', edit: 'text' }
			, { field: 'HManagerID', title: 'è´è´£äººä»£ç ', edit: 'text', hide: true }
			@@ -567,15 +698,15 @@

			//å¢å ä¸è¡äºä»¶
			function btnAddLine(NewRow) {
			var tableBak = table.cache["mainTable"]; //è·åä¹åç¼è¾è¿çè¡¨æ ¼æ°æ®
			buttonArr = [];//æ¸ç©ºæ°ç»
			for (var i = 0; i < tableBak.length; i++) {
			buttonArr.push(tableBak[i]); //å°ä¹åçæ°æ®åå¨

			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);

			for (var i = 1; i <= option.data.length; i++) {
			$('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
			}
			buttonArr.push(NewRow); //å¨å°¾é¨å ä¸è¡
			table.reload("mainTable", {
			data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			})
			form.render('select');
			}
			//è¡¨æ ¼å¤å¶ä¸è¡äºä»¶
			function btnCopyLine(data) {
			@@ -592,6 +723,11 @@
			table.cache["mainTable"].push(JSON.parse(copyrow));//å°å¤å¶çè¡å¼ºè½¬æjsonè¿½å å°è¡¨æ ¼ä¸
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.render(option);//å°æ°æ®æ¸²æå°è¡¨æ ¼ä¸

			for (var i = 1; i <= option.data.length; i++) {
			$('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
			}
			form.render('select');
			}
			}
			// è¡¨æ ¼è¡åäºä»¶å é¤
			@@ -638,13 +774,15 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}


			if (checkStatus.data.length === 1) {
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HDotCheckItemID: checkStatus.data[0].HItemID,
			HDotCheckCode: checkStatus.data[0].ç¹æ£é¡¹ç®ä»£ç ,
			HDotCheckItem: checkStatus.data[0].ç¹æ£é¡¹ç®åç§°
			HDotCheckItem: checkStatus.data[0].ç¹æ£é¡¹ç®åç§°,
			HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
			HDotCheckItemClassName: checkStatus.data[0].ç¹æ£é¡¹ç®åç±»åç§°,
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			} else {
			@@ -659,15 +797,16 @@
			}
			//å°æ¹ééæ©çæ°æ®åå¥æ°ç»ï¼å¤éè¡ï¼
			for (var i = 0; i < checkStatus.data.length; i++) {
			buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].ç¹æ£é¡¹ç®ä»£ç , "HDotCheckItem": checkStatus.data[i].ç¹æ£é¡¹ç®åç§°, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" });
			buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].ç¹æ£é¡¹ç®ä»£ç , "HDotCheckItem": checkStatus.data[i].ç¹æ£é¡¹ç®åç§°, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" });
			}

			table.reload("mainTable", {
			data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			})
			option.data = buttonArr;
			table.render(option);
			//table.reload("mainTable", {
			// data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			//})

			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			}
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -679,7 +818,9 @@
			obj.update({
			HDotCheckItemID: OptionData[0].HItemID,
			HDotCheckCode: OptionData[0].ç¹æ£é¡¹ç®ä»£ç ,
			HDotCheckItem: OptionData[0].ç¹æ£é¡¹ç®åç§°
			HDotCheckItem: OptionData[0].ç¹æ£é¡¹ç®åç§°,
			HDotCheckItemClassID: OptionData[0].HDotCheckItemClassID,
			HDotCheckItemClassName: OptionData[0].ç¹æ£é¡¹ç®åç±»åç§°,
			});
			OptionData = [];
			}
			@@ -731,6 +872,73 @@
			}
			});
			}
			if (obj.event === 'HDotCheckItemClassName') //ç¹æ£é¡¹ç®åç±»
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ç¹æ£é¡¹ç®åç±»åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true
			, content: ['../åºç¡èµæ/åºç¡èµæ/Gy_DotCheckItemClassList.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('è¯·éæ©æ°æ®');
			}
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HDotCheckItemClassID: checkStatus.data[0].HItemID,
			HDotCheckItemClassName: checkStatus.data[0].ç¹æ£é¡¹ç®åç±»åç§°
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			}
			});
			}
			if (obj.event === 'HDotCheckItemMethodName') //ç¹æ£æ¹æ³
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ç¹æ£æ¹æ³åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true
			, content: ['../åºç¡èµæ/åºç¡èµæ/Gy_DotCheckItemMethodList.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('è¯·éæ©æ°æ®');
			}
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HDotCheckItemMethodID: checkStatus.data[0].HItemID,
			HDotCheckItemMethodName: checkStatus.data[0].ç¹æ£æ¹æ³åç§°
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			}
			});
			}

			obj.event = "";
			return false;

			@@ -761,7 +969,7 @@
			function set_AddFNew() {
			//è·åæå¤§åæ®å·
			get_MAXNum();
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
			table.render(option);
			}

			@@ -769,7 +977,7 @@
			function set_EditFromGrid(linterid) {
			set_EditForm(linterid); //ç¼è¾è·åè¡¨å¤´
			set_EditGrid(linterid); //ç¼è¾è·åè¡¨ä½
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
			table.render(option);
			}
			//ç¼è¾è·åè¡¨å¤´
			@@ -797,7 +1005,22 @@
			, "HRemark": data.è¡¨å¤´å¤æ³¨ //å¤æ³¨
			, "HEquipDotCheckRuleInterID": data.è®¾å¤ç¹æ£è§ç¨ID // è®¾å¤ç¹æ£è§ç¨ID
			, "HEquipDotCheckRuleInterNo": data.è®¾å¤ç¹æ£è§ç¨ // è®¾å¤ç¹æ£è§ç¨
			, "HErrNote": data.å¼å¸¸æåµè®°å½ //å¼å¸¸æåµè®°å½
			, "HBigSafeNote": data.éå¤§å®å¨éæ£è®°å½ //éå¤§å®å¨éæ£è®°å½
			, "HDotCheckNote": data.ç¹æ£æ°æ® //ç¹æ£æ°æ®
			, "HShiftsID": data.HShiftsID //
			, "HShiftsName": data.çæ¬¡åç§° //çæ¬¡åç§°
			//, "HLastResult": data.æç»ç»è®º == "åæ ¼" ? "OK" : "NG" //æç»ç»è®º
			});

			if (data.æç»ç»è®º == "ä¸åæ ¼") {
			document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			} else {
			document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			}
			form.render('radio');

			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			@@ -815,12 +1038,21 @@
			url: GetWEBURL() + 'Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListProjectDetai',
			type: "GET",
			data: { "sqlWhere": "and hmainid=" + linterid },
			success: function (result) {
			console.log(result);
			success: function (result) {
			if (result.count == 1) {
			option.data = result.data;
			table.render(option);
			var data = result.data;
			var subarr = [];

			for (var i = 0; i < data.length; i++) {
			subarr.push({ "HDotCheckItemID": data[i].ç¹æ£é¡¹ç®ID, "HDotCheckCode": data[i].ç¹æ£é¡¹ç®ä»£ç , "HDotCheckItem": data[i].ç¹æ£é¡¹ç®, "HDotCheckPart": data[i].ç¹æ£é¨ä½, "HClaim": data[i].å·ä½è¦æ±, "HManagerID": data[i].è´è´£äººID, "HManagerCode": data[i].è´è´£äººç¼ç , "HManagerName": data[i].è´è´£äºº, "HRemark": data[i].è¡¨ä½å¤æ³¨, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].ç¹æ£é¡¹ç®åç±»åç§°, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].ç¹æ£æ¹æ³åç§°, "HDotCheckResult": data[i].ç¹æ£ç»æ == "åæ ¼" ? 'Y' : 'X' });
			}

			option.data = subarr;
			table.render(option);
			for (let j = 0; j < data.length; j++) {
			$("#HDotCheckResult" + (j + 1)).val(data[j].ç¹æ£ç»æ == "åæ ¼" ? 'Y' : 'X')
			}
			form.render('select');
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			@@ -883,6 +1115,11 @@
			return true;
			}
			}
			//éè¯¯ä¿¡æ¯
			function f_alert(sMsg) {
			layer.alert(sMsg, { icon: 5 });

			}
			//#endregion

			});