From a2b840d4841922a50db076728f24fff76745187c Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 15 十月 2021 08:23:46 +0800
Subject: [PATCH] 设备保养计划、设备保养记录单表体新增行无效修改

---
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html |   77 +++++++++++++++++++-------------------
 1 files changed, 39 insertions(+), 38 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 4b515a6..0ea9897 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -253,10 +253,10 @@
                 var NewRow = TabRow1;
                 switch (obj.event) {
                     //鏂板涓�琛�
-                    case 'btn-AddLine': btnAddLine1(NewRow);
+                    case 'btn-AddLine1': btnAddLine1(NewRow);
                         break;
                     //澶嶅埗涓�琛�
-                    case 'btn-CopyLine': btnCopyLine1(data);
+                    case 'btn-CopyLine1': btnCopyLine1(data);
                         break;
                 }
             });
@@ -312,7 +312,10 @@
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
-                //if (AllowLoadData(sSubStr, sSubStr1)) {
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
                 $.ajax(
                     {
                         type: "POST",
@@ -341,7 +344,7 @@
                             console.log("Reason" + sMainStr);
                         }
                     });
-                //}
+                
             });
             //閫�鍑�
             form.on('submit(Exit)', function () {
@@ -561,7 +564,7 @@
             //澧炲姞涓�琛�
             function btnAddLine(NewRow) {
                 table.cache["mainTable"].push(NewRow);
-                option1.data = table.cache["mainTable"];
+                option.data = table.cache["mainTable"];
                 table.render(option);
             }
             //澧炲姞涓�琛�
@@ -854,65 +857,63 @@
                 })
             }
             //闈炵┖楠岃瘉
-            function AllowLoadData(sSubStr, sSubStr1) {
-                if ($("#HInnerBillNo").val() == '') {
-                    layer.msg("璇烽�夋嫨鍐呴儴鍗曟嵁鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
+            function AllowLoadData(sSubStr) {
+                var Result = true;
                 if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
                     layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
+                    return Result = false;
                 }
                 if ($("#HCheckCycle").val() == '' || $("#HCheckCycle").val() == '0') {
                     layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
+                    return Result = false;
                 }
                 if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                     layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
+                    return Result = false;
                 }
                 if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                     sSubStr = JSON.parse(sSubStr);
                     for (var i = 0; i < sSubStr.length; i++) {
                         if (sSubStr[i].HMaintainItemID == "") {
                             layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇椤圭洰淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
+                            return Result = false;
                         }
                         if (sSubStr[i].HMaintainItem == "") {
                             layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇閮ㄤ綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
+                            return Result = false;
                         }
                         if (sSubStr[i].HManagerNumber == "") {
                             layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
+                            return Result = false;
                         }
 
                     }
                 }
-                if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
-                    layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-                if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
-                    sSubStr1 = JSON.parse(sSubStr1);
-                    for (var i = 0; i < sSubStr1.length; i++) {
-                        if (sSubStr1[i].HMaterNumber == "") {
-                            layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠g爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
-                        }
-                        if (sSubStr1[i].HUnitNumber == "") {
-                            layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
-                        }
-                        if (sSubStr[i].HManagerNumber == "") {
-                            layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
-                        }
-                    }
-                }
+                //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
+                //    layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return false;
+                //}
+                //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
+                //    sSubStr1 = JSON.parse(sSubStr1);
+                //    for (var i = 0; i < sSubStr1.length; i++) {
+                //        if (sSubStr1[i].HMaterNumber == "") {
+                //            layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠g爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //            return false;
+                //        }
+                //        if (sSubStr1[i].HUnitNumber == "") {
+                //            layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //            return false;
+                //        }
+                //        if (sSubStr[i].HManagerNumber == "") {
+                //            layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //            return false;
+                //        }
+                //    }
+                //}
                 else {
-                    return true;
+                    return Result = true;
                 }
+                return Result;
             }
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });

--
Gitblit v1.9.1