From 1b94bfc5d690d33eb03cb9ac33e7744a04cf48a8 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 01 十一月 2021 16:24:26 +0800
Subject: [PATCH] 器具管理对应打印模板

---
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html |   99 ++++++++++++++++++++++++++++---------------------
 1 files changed, 56 insertions(+), 43 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 94b2cce..8d2a8a4 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"
@@ -255,10 +255,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;
                 }
             });
@@ -320,7 +320,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",
@@ -349,7 +352,7 @@
                             console.log("Reason" + sMainStr);
                         }
                     });
-                //}
+                
             });
             //棰勮Printing
             form.on("submit(view)", function (data) {
@@ -578,15 +581,27 @@
             }
             //澧炲姞涓�琛�
             function btnAddLine(NewRow) {
-                table.cache["mainTable"].push(NewRow);
-                option1.data = table.cache["mainTable"];
-                table.render(option);
+                var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                buttonArr = [];//娓呯┖鏁扮粍
+                for (var i = 0; i < tableBak.length; i++) {
+                    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                }
+                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                table.reload("mainTable", {
+                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                })
             }
             //澧炲姞涓�琛�
             function btnAddLine1(NewRow) {
-                table.cache["mainTable1"].push(NewRow);
-                option1.data = table.cache["mainTable1"];
-                table.render(option1);
+                var tableBak = table.cache["mainTable1"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                buttonArr = [];//娓呯┖鏁扮粍
+                for (var i = 0; i < tableBak.length; i++) {
+                    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                }
+                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                table.reload("mainTable1", {
+                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                })
             }
             //澶嶅埗涓�琛�
             function btnCopyLine(data) {
@@ -872,65 +887,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