From a2a4050db360fa0437ea71adcb9d85f06409e21f Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 16 八月 2022 16:23:52 +0800
Subject: [PATCH] 设备履历+器具履历

---
 WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 6651301..3bf26e7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -272,15 +272,16 @@
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                                 table.render(option);
-
+                                $("#HEquipDotCheckRuleInterID").val(BYData.data[0].HInterID);
+                                $("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo)
                                 if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
                                 {
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.data.length; i++) {
                                         var checkrow = {
                                             "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
-                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
-                                            "HManagerName": BYData.data[i].HManagerName,  "HRemark": rowdate1[i].HRemark
+                                            "HDotCheckPart": BYData.data[i].HDotCheckPart,  "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
+                                            "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -353,8 +354,8 @@
                                     for (var i = 0; i < BYData.data.length; i++) {
                                         var checkrow = {
                                             "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
-                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
-                                            "HManagerName": BYData.data[i].HManagerName, "HRemark": rowdate1[i].HRemark
+                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
+                                            "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -384,7 +385,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html', 'yes'],
+                    content: ['../璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
                         //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -395,8 +396,7 @@
                         }
                         $("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HPlanNo").val(checkStatus.data[0].hmainid);
-                        get_MaintainItem();
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        layer.close(layer.index);  //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
                         //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -415,7 +415,7 @@
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
                         {
@@ -747,6 +747,16 @@
                     layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
+                //鐐规璁″垝娌℃湁閫夋嫨
+                if ($("#HPlanNo").val() == '') {
+                    layer.msg("鐐规璁″垝娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                //鐐规瑙勭▼娌℃湁閫夋嫨
+                if ($("#HEquipDotCheckRuleInterID").val() == '') {
+                    layer.msg("鐐规瑙勭▼娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
                 //鍒ゆ柇鐗╂枡鏄庣粏椤�
                 if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                     layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });

--
Gitblit v1.9.1