From 80c4a94255590c8799b9b152748d47e351dd0c8a Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 19 十一月 2021 16:21:05 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html |   62 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 25 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 4ad9059..f0d9bc8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
     <style type="text/css">
         .layui-form-label {
-            width: 85px;
+            width: 95px;
         }
     </style>
 </head>
@@ -62,7 +62,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">缁翠慨浜�</label>
+                                                <label class="layui-form-label">缁翠慨浜�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -75,13 +75,13 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">缁翠慨寮�濮�</label>
+                                                <label class="layui-form-label">缁翠慨寮�濮�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧</label>
+                                                <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -91,7 +91,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璐熻矗浜�</label>
+                                                <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -101,7 +101,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">缁翠慨缁撴潫</label>
+                                                <label class="layui-form-label">缁翠慨缁撴潫<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HRepairEndDate" id="HRepairEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
                                                 </div>
@@ -109,7 +109,7 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">缁翠慨椤圭洰</label>
+                                                <label class="layui-form-label">缁翠慨椤圭洰<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
@@ -119,7 +119,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">缁翠慨閮ㄩ棬</label>
+                                                <label class="layui-form-label">缁翠慨閮ㄩ棬<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -135,9 +135,9 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">瀹為檯缁翠慨宸ユ椂</label>
+                                                <label class="layui-form-label">瀹為檯缁翠慨宸ユ椂<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HTimes" id="HTimes" class="layui-input" value="">
+                                                    <input type="text" name="HTimes" id="HTimes" class="layui-input" value="" style="margin-left:5px">
                                                 </div>
                                             </div>
                                         </div>
@@ -226,14 +226,12 @@
 
             var option;
             var sBillType = "3910";
-            var TabRow = { "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
+            //var TabRow = { "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
-
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             //鍒ゆ柇鎿嶄綔绫诲瀷
@@ -254,7 +252,7 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
-                var NewRow = TabRow;
+                var NewRow = { "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
                 switch (obj.event) {
                     //澧炲姞涓�琛�
                     case 'btn-AddLine': set_AddLine(NewRow);
@@ -484,7 +482,7 @@
                                     layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                         $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                         var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
                                     });
                                 }
                                 else {
@@ -504,8 +502,14 @@
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
 
             //#endregion
@@ -561,7 +565,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [TabRow];
+                option.data = [{ "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                 table.render(option);
             }
 
@@ -589,7 +593,7 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [TabRow];
+                option.data = [{ "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                 table.render(option);
             }
 
@@ -787,11 +791,16 @@
 
             //澧炲姞涓�琛�
             function set_AddLine(NewRow) {
-                table.cache["mainTable"].push(NewRow);
-                option.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 set_CopyLine(data) {
                 var copydata = JSON.stringify(data);
@@ -833,7 +842,7 @@
                 if ($("#HRepairName").val() == '') {
                     layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
-                }
+                } 
                 //鏁板瓧姝e垯(鍖呭惈灏忔暟)
                 var reg = /^\d+(\.\d+)?$/;
                 if (reg.test($("#HPlanTimes").val()) == false || $("#HPlanTimes").val() == '') {
@@ -853,7 +862,7 @@
                     return false;
                 }
                 //鍒ゆ柇鐗╂枡鏄庣粏椤�
-                if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                     layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
@@ -873,6 +882,9 @@
                         }
                     }
                 }
+                else {
+                    return true;
+                }
             }
 
             //#endregion

--
Gitblit v1.9.1