MES-WEB-LayUI.git

			@@ -202,8 +202,8 @@
			<th>ç¹æ£è®¡å</th>
			<td class="bz_td">
			<input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
			<input type="hidden" name="HPlanInterID" class="layui-input LineHeight" id="HPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
			<input type="hidden" name="HPlanEntryID" class="layui-input LineHeight" id="HPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
			<input type="hidden" name="HPlanInterID" class="layui-input LineHeight" id="HPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
			<input type="hidden" name="HPlanEntryID" class="layui-input LineHeight" id="HPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
			</td>
			</tr>
			</tbody>
			@@ -214,8 +214,8 @@
			<label class="layui-form-label" style="width:100px;">è®¾å¤ç¹æ£è§ç¨</label>
			<div class="layui-input-inline">
			<input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;display:none;">
			<input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:180px;" readonly="readonly">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -315,8 +315,8 @@
			<!--è¡ä¸æéæ©(ç¹æ£ç»æ)-->
			<!--<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="">è¯·éæ©</option>-->
			<!--<option value="Y" selected>Y</option>
			<option value="X">X</option>
			</select>
			</script>-->
			@@ -395,7 +395,7 @@
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			var NewRow = { "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""};
			var NewRow = { "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };

			switch (obj.event) {
			//æ°å¢ä¸è¡
			@@ -466,7 +466,7 @@
			//éåº-å³éé¡µé¢æ¹æ³
			$('#Cancel').on('click', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			parent.location.href = "../../views/index_Mobile.html";
			});
			})

			@@ -498,7 +498,7 @@
			}
			},
			error: function (err) {
			layer.close(index);
			$('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//ä¿åæé®å¯ç¨
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			@@ -508,40 +508,44 @@

			//æ°å¢
			form.on('submit(Add)', function (data) {
			$('#Saver').addClass("buttom_box_little");
			$('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
			$("#HBarCode").removeAttr("readonly");//æ¡å½¢ç æ¸é¤åªè¯»
			$("#HBarCode").removeAttr("background-color");//æ¡å½¢ç æ¸é¤èæ¯è²
			layer.confirm('æ°å¢åé¡µé¢æ°æ®å°æ¶å¤±ï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			$('#Saver').addClass("buttom_box_little");
			$('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
			$("#HBarCode").removeAttr("readonly");//æ¡å½¢ç æ¸é¤åªè¯»
			$("#HBarCode").removeAttr("background-color");//æ¡å½¢ç æ¸é¤èæ¯è²

			// æ¸ç©ºè¡¨å ï¼âformDataâæ¯è¡¨åçidï¼
			$("#formData")[0].reset();
			layui.form.render();
			option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
			table.render(option);
			// æ¸ç©ºè¡¨å ï¼âformDataâæ¯è¡¨åçidï¼
			$("#formData")[0].reset();
			layui.form.render();
			option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
			table.render(option);

			$("#HBarCode").focus();
			//è·åæå¤§åæ®å·
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '3903' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val("0");
			$("#HBillNo").val(d.data[0].HBillNo);
			}
			$("#HBarCode").focus();
			//è·åæå¤§åæ®å·
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '3903' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val("0");
			$("#HBillNo").val(d.data[0].HBillNo);
			}
			});
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //ç¹æ£å¼å§æ¶é´
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //ç¹æ£ç»ææ¶é´
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åæ®æ¥æ
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åå»ºæ¥æ
			$("#HMaker").val(sessionStorage["HUserName"]); //åå»ºäºº

			layer.close(index);
			});
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //ç¹æ£å¼å§æ¶é´
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //ç¹æ£ç»ææ¶é´
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åæ®æ¥æ
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åå»ºæ¥æ
			$("#HMaker").val(sessionStorage["HUserName"]); //åå»ºäºº
			})

			//#region éåºæé®
			form.on('submit(Cancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			parent.location.href = "../../views/index_Mobile.html";
			});
			})
			//#endregion
			@@ -582,7 +586,7 @@
			}
			});
			});


			//è¡¨å¤´ä¿¡æ¯çäº§çæ¬¡å¼¹çª
			form.on('submit(btnShifts)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -620,6 +624,10 @@

			//è¡¨å¤´ä¿¡æ¯è®¾å¤ä¿å»è§ç¨
			form.on('submit(HEquipDotCheckRuleInterist)', function () {
			if ($("#HEquipID").val() == 0 \|\| $("#HEquipID").val() == null \|\| $("#HEquipID").val() == "") {
			layer.alert("è¯·åæ«æè®¾å¤äºç»´ç å¸¦åºè®¾å¤ä¿¡æ¯");
			return;
			}
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -629,7 +637,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList_PDA.html', 'yes'],
			content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList_PDA.html?HEquipID=' + $("#HEquipID").val(), 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -661,21 +669,19 @@
			success: function (result) {
			if (result != null) {
			if (result.count == 1) {
			var BYData = result;//
			var rowdate1 = layui.table.cache["mainTable"];
			var data = result.data;
			option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
			option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
			table.render(option);

			if (BYData.data.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			if (data.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			{
			buttonArr = [];//æ¸ç©ºæ°ç»

			for (var i = 0; i < BYData.data.length; i++) {
			for (var i = 0; i < data.length; i++) {
			var checkrow = {
			"HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
			"HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
			"HManagerName": data[i].HManagerName, "HSourceInterID": data[i].ç¹æ£è®¡åID, "HSourceEntryID": data[i].ç¹æ£è®¡ååID, "HSourceBillNo": data[i].ç¹æ£è®¡åå, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": false
			"HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].ç¹æ£é¡¹ç®ä»£ç , "HDotCheckItem": data[i].ç¹æ£é¡¹ç®,
			"HDotCheckPart": data[i].ç¹æ£é¨ä½, "HClaim": data[i].å·ä½è¦æ±, "HManagerID": data[i].è´è´£äººID, "HManagerCode": data[i].è´è´£äººä»£ç ,
			"HManagerName": data[i].è´è´£äººåç§°, "HSourceInterID": data[i].ç¹æ£è®¡åID == null ? 0 : data[i].ç¹æ£è®¡åID, "HSourceEntryID": data[i].ç¹æ£è®¡ååID == null ? 0 : data[i].ç¹æ£è®¡ååID, "HSourceBillNo": data[i].ç¹æ£è®¡åå, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": data[i].é»è®¤ç»è®º == 1 ? true : false
			};
			buttonArr.push(checkrow); //å°ä¹åçæ°æ®åå¨
			}
			@@ -685,7 +691,7 @@
			}
			}
			else {
			option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
			option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
			table.render(option);
			layer.alert("è¯¥è®¾å¤ææ é»è®¤ç¹æ£è®°å½", { icon: 5 });
			}
			@@ -701,7 +707,7 @@
			columns = [
			//{ type: 'checkbox' }
			{ templet: '#xuhao', title: 'åºå·', event: "qwe", width: 45 }
			, { field: 'HDotCheckResult', title: 'ç»æ', templet: '#HDotCheckResult', width: 55 }
			, { field: 'HDotCheckResult', title: 'ç»æ', templet: '#HDotCheckResult', width: 55, unresize: false }
			, { field: 'HDotCheckItemID', title: 'ç¹æ£é¡¹ç®ID', edit: 'text', hide: true }
			, { field: 'HDotCheckCode', title: 'ç¹æ£é¡¹ç®ä»£ç ', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
			, { field: 'HDotCheckItem', title: 'ç¹æ£é¡¹ç®', edit: 'text', event: "" }
			@@ -731,11 +737,23 @@
			, height: 'full-205'
			, cols: [columns]
			, done: function (res, curr, count) {

			option.data = res.data;
			//å»æä¸ææ¡å¤±ç¦äºä»¶å¦åå¨ä¸ææ¡éè¾å¥å¼
			$('.layui-form-select').find('input').unbind("blur");
			//è¡¨æ ¼éè½½åæ¾ä¸ææ¡éçæ°æ®
			$('tr').each(function (e) {
			var $cr = $(this);
			var dataIndex = $cr.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TNDEX == dataIndex) {
			//$cr.find('input').val(value.HResult);
			}
			});
			});
			}
			};

			option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
			option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
			table.render(option);
			}
			//å¢å ä¸è¡
			@@ -821,16 +839,16 @@
			}
			var index = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown",
			url: GetWEBURL() + "/Gy_EquipFileBill/txtHBarCode_KeyDown",
			type: "GET",
			data: { "HBarCode": HBarCode },
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.data.length == 1) {
			var data = result.data[0];
			$("#HEquipID").val(data.HInterID);
			$("#HBarName").val(data.HName);
			$("#HBarSpec").val(data.HModel);
			$("#HBarModel").val(data.HModel2);
			$("#HBarName").val(data.è®¾å¤åç§°);
			$("#HBarSpec").val(data.è®¾å¤è§æ ¼);
			$("#HBarModel").val(data.è®¾å¤åå·);
			$("#HQty").val(1);
			$("#HBarCode").attr("readonly", "readonly");//æ¡å½¢ç åªè¯»
			$("#HBarCode").css("background-color", "#efefef4d");
			@@ -839,13 +857,15 @@
			layer.close(index);
			}
			else {
			$("#HBarCode").val("");
			layer.close(index);
			layer.msg("æªæ¥æ¾å°æ°æ®", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			$("#HBarCode").val("");
			layer.close(index);
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			@@ -860,13 +880,13 @@
			$("#HEquipDotCheckRuleInterID").val(data[0].ç¹æ£è§ç¨ID);
			$("#HEquipDotCheckRuleInterNo").val(data[0].ç¹æ£è§ç¨åå·);
			$("#HPlanNo").val(data[0].ç¹æ£è®¡åå);
			$("#HPlanInterID").val(data[0].ç¹æ£è®¡åID);
			$("#HPlanEntryID").val(data[0].ç¹æ£è®¡ååID);
			$("#HPlanInterID").val((data[0].ç¹æ£è®¡åID == null ? 0 : data[0].ç¹æ£è®¡åID) == "" ? 0 : data[0].ç¹æ£è®¡åID);
			$("#HPlanEntryID").val((data[0].ç¹æ£è®¡ååID == null ? 0 : data[0].ç¹æ£è®¡ååID) == "" ? 0 : data[0].ç¹æ£è®¡ååID);
			var rowdata = [];
			for (let i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HDotCheckResult": data[i].é»è®¤ç»è®º, "HDotCheckItemID": data[i].ç¹æ£é¡¹ç®ID, "HDotCheckCode": data[i].ç¹æ£é¡¹ç®ä»£ç , "HDotCheckItem": data[i].ç¹æ£é¡¹ç®åç§°,
			"HDotCheckResult": data[i].é»è®¤ç»è®º == 1 ? true : false, "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].è´è´£äººåç§°, "HSourceInterID": data[i].ç¹æ£è®¡åID, "HSourceEntryID": data[i].ç¹æ£è®¡ååID, "HSourceBillNo": data[i].ç¹æ£è®¡åå, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
			}
			@@ -882,7 +902,7 @@
			//è¡¨æ ¼è¡åäºä»¶å¿«æ·é®çé
			function set_GridCellCheck(obj) {
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			if (event.key == "F7") {
			if (obj.event === 'HDotCheckItemClassName') //ç¹æ£é¡¹ç®åç±»
			{
			//é¡µé¢å±-èªå®ä¹