From 3b7f9801f3c6b4bc40ea2570003b90e8fc9716e9 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 03 十二月 2025 10:27:53 +0800
Subject: [PATCH] 仪器校验单修复

---
 WebTM/views/模治具管理/模治具管理/Sb_Add_Gy_QCVerificationBillList.html |  270 ++++++++++++++++++++++++++++++++---------------------
 WebTM/views/模治具管理/模治具管理/Gy_QCVerificationBillMain.html        |    8 
 2 files changed, 167 insertions(+), 111 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_QCVerificationBillMain.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_QCVerificationBillMain.html"
index 2f9781b..9d1e18f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_QCVerificationBillMain.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_QCVerificationBillMain.html"
@@ -34,7 +34,7 @@
                                         <span>鏇村</span>
                                     </div>
                                 </div>
-                                <div class="layui-inline">
+                                <!--<div class="layui-inline">
                                     <label class="layui-form-label">鐘舵��</label>
                                     <div class="layui-input-block">
                                         <select name="Status" lay-filter="Status" id="Status"
@@ -45,7 +45,7 @@
                                             <option value="2">宸插叧闂�</option>
                                         </select>
                                     </div>
-                                </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鏃ユ湡闂撮殧</label>
                                     <div class="layui-input-block">
@@ -56,7 +56,7 @@
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">
-                                        鐢熸晥鏃ユ湡
+                                        寮�濮嬫棩鏈�
                                     </label>
                                     <div class="layui-input-block">
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
@@ -64,7 +64,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">澶辨晥鏃ユ湡</label>
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
                                     <div class="layui-input-block">
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
                                             style="width:190px;">
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_Gy_QCVerificationBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_Gy_QCVerificationBillList.html"
index 3850f2c..57f4217 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_Gy_QCVerificationBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_Gy_QCVerificationBillList.html"
@@ -27,11 +27,17 @@
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
                                 <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius"
-                                    lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                        lay-submit="" lay-filter="Saver">
+                                    淇濆瓨
+                                </button>
                                 <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
-                                    lay-submit="" lay-filter="Checker">瀹℃牳</button>
+                                        lay-submit="" lay-filter="Checker">
+                                    瀹℃牳
+                                </button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
-                                    lay-filter="Exit">閫�鍑�</button>
+                                        lay-filter="Exit">
+                                    閫�鍑�
+                                </button>
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -48,7 +54,7 @@
                                                 <label class="layui-form-label">鍗曟嵁鍙�</label>
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
-                                                        id="HBillNo" readonly="readonly" autocomplete="off">
+                                                           id="HBillNo" readonly="readonly" autocomplete="off">
                                                     <input id="HInterID" name="HInterID" type="hidden" />
                                                 </div>
                                             </div>
@@ -56,15 +62,15 @@
                                                 <label class="layui-form-label">鏃ユ湡</label>
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HDate" id="HDate"
-                                                        autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
-                                                        placeholder="yyyy-MM-dd">
+                                                           autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+                                                           placeholder="yyyy-MM-dd">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HInnerBillNo" id="HInnerBillNo"
-                                                        class="layui-input">
+                                                           class="layui-input">
                                                 </div>
                                             </div>
 
@@ -72,17 +78,20 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">閮ㄩ棬<label style="color:red"> *
-                                                    </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;">
+                                                           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;">
+                                                           value="" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn"
-                                                        lay-filter="Department" style="width:40px;">
+                                                            lay-filter="Department" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"
-                                                            style="margin-left:-9px;"></i>
+                                                           style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
                                             </div>
@@ -95,21 +104,21 @@
                                                 </label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEmpName" id="HEmpName" class="layui-input"
-                                                        value="" style="float:left;width:150px;">
+                                                           value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input"
-                                                        value="" style="float:left;width:150px;">
+                                                           value="" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn"
-                                                        lay-filter="HEmpList" style="width:40px;">
+                                                            lay-filter="HEmpList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"
-                                                            style="margin-left:-9px;"></i>
+                                                           style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
                                             </div>
                                         </div>
-       
+
 
                                         <div class="layui-form-item">
-                                            <div class="layui-inline">
+                                            <!--<div class="layui-inline">
                                                 <label class="layui-form-label">婧愬崟绫诲瀷</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HMainSourceBillType" lay-filter="HMainSourceBillType"
@@ -119,8 +128,8 @@
                                                         <option value="3843">缁翠慨娲惧伐鍗�</option>
                                                     </select>
                                                 </div>
-                                            </div>
-                                            <div class="layui-inline">
+                                            </div>-->
+                                            <!--<div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo"
@@ -137,13 +146,13 @@
                                                             style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
-                                            </div>
+                                            </div>-->
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
                                                 <div class="layui-input-block"
-                                                    style="margin-left: 120px; width: 185px;">
+                                                     style="margin-left: 120px; width: 185px;">
                                                     <select name="HOrgID" id="HOrgID" lay-verify="HOrgID"
-                                                        class="ForFilteringSchemes" disabled>
+                                                            class="ForFilteringSchemes" disabled>
                                                         <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                     </select>
                                                 </div>
@@ -157,28 +166,28 @@
                                                 <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HMaker" id="HMaker"
-                                                        style="background-color:#efefef4d;" readonly>
+                                                           style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HChecker" id="HChecker"
-                                                        style="background-color:#efefef4d;" readonly>
+                                                           style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HCloseMan"
-                                                        id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                                           id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
-                                                        style="background-color:#efefef4d;" readonly>
+                                                           style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
 
@@ -188,28 +197,28 @@
                                                 <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HMakeDate"
-                                                        id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                                           id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HCheckDate"
-                                                        id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                                           id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HCloseDate"
-                                                        id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                                           id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HUpDateDate"
-                                                        id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                                           id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                         </div>
@@ -218,14 +227,14 @@
                                                 <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HDeleteMan"
-                                                        id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                                           id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
                                                 <div class="layui-input-block" style="margin-left: 120px;">
                                                     <input type="text" class="layui-input" name="HDeleteDate"
-                                                        id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                                           id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
                                         </div>
@@ -255,7 +264,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
-                       
+
                         <script type="text/html" id="xuhao">
                             {{d.LAY_TABLE_INDEX+1}}
                         </script>
@@ -269,11 +278,11 @@
     </div>
     <script type="text/html" id="barDemo">
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
     <script type="text/html" id="barDemo1">
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
     </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -284,6 +293,13 @@
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/common.js"></script>
     <script src="../../../layuiadmin/SetColumn.js"></script>
+    <!--琛屼笅鎷夐�夋嫨(鐘舵��)-->
+    <script type="text/html" id="HStatus">
+        <select name="HStatus" lay-filter="HStatus" id="HStatus{{d.LAY_TABLE_INDEX+1}}">
+            <option value="0">涓嶅悎鏍�</option>
+            <option value="1" selected>鍚堟牸</option>
+        </select>
+    </script>
     <script>
         //鑾峰彇鍙傛暟
         var params = get_UrlVars();
@@ -316,7 +332,23 @@
             var HModName = "Sb_Add_Gy_QCVerificationBillList"
             //var TabRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " };
             //#endregion
+            // 鍒濆鍖栨棩鏈熼�夋嫨鍣�
+            var initDatePicker = function () {
+                // 鐩戝惉琛ㄦ牸鐨勬棩鏈熷崟鍏冩牸缂栬緫
+                table.on('edit(mainTable)', function (obj) {
+                    var field = obj.field; // 褰撳墠缂栬緫鐨勫瓧娈�
+                    var value = obj.value; // 寰楀埌淇敼鍚庣殑鍊�
+                    var oldValue = obj.data[field]; // 寰楀埌淇敼鍓嶇殑鍊�
 
+                    // 濡傛灉鏄棩鏈熷瓧娈碉紝閲嶆柊娓叉煋涓�涓�
+                    if (field === 'HBeginDate' || field === 'HEndDate') {
+                        // 鏇存柊鏁版嵁
+                        obj.update({
+                            [field]: value
+                        });
+                    }
+                });
+            };
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -331,7 +363,10 @@
 
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
-
+            // 鍦ㄨ〃鏍兼覆鏌撳悗鍒濆鍖栨棩鏈熼�夋嫨鍣�
+            setTimeout(function () {
+                initDatePicker();
+            }, 300);
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗�
                 set_AddFNew();
@@ -368,13 +403,24 @@
                         break;
                 }
             });
-
+            //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+            form.on('select(HStatus)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " };
+
+                var NewRow = { "HInspectInstruMentID": 0, "HInspectInstruMentNumber": "", "HInspectInstruMentName": "  ", "HBeginDate": "", "HEndDate": "", "HHCalibrationStatus": "鍚堟牸" };
                 switch (obj.event) {
                     //澧炲姞涓�琛�
                     case 'btn-AddLine': set_AddLine(NewRow);
@@ -880,15 +926,6 @@
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
-                var ce = $("#HMainSourceInterID").val();
-                var centry = $("#HMainSourceEntryID").val();
-                var cBillNo = $("#HMainSourceBillNo").val();
-                if (ce == "" || ce == null || ce == undefined)
-                    $("#HMainSourceInterID").val("1")
-                if (centry == "" || centry == null || centry == undefined)
-                    $("#HMainSourceEntryID").val("1")
-                if (cBillNo == "" || cBillNo == null || cBillNo == undefined)
-                    $("#HMainSourceBillNo").val("1")
                 let unEditableColStyle = 'background-color: #eeeeee;'
                 //琛ㄥご
                 columns = [
@@ -897,9 +934,20 @@
                     , { field: 'HInspectInstruMentID', title: '妫�楠屼华鍣↖D', edit: 'text', hide: true }
                     , { field: 'HInspectInstruMentNumber', title: '妫�楠屼华鍣ㄤ唬鐮�', edit: 'text', event: "HRepairCode" }
                     , { field: 'HInspectInstruMentName', title: '妫�楠屼华鍣ㄥ悕绉�', style: unEditableColStyle }
-                    , { field: 'HBeginDate', title: '鐢熸晥鏃ユ湡', edit: 'text' }
-                    , { field: 'HEndDate', title: '澶辨晥鏃ユ湡', edit: 'text'}
-                    , { field: 'HHCalibrationStatus', title: '鏍″噯鐘舵��', edit: 'text'}
+                    , {
+                        field: 'HBeginDate', title: '鐢熸晥鏃ユ湡', edit: 'date', templet: function (d) {
+                            return d.HBeginDate ? d.HBeginDate : '';
+                        } }
+                    , {
+                        field: 'HEndDate',
+                        title: '澶辨晥鏃ユ湡',
+                        edit: 'date',
+                        templet: function (d) {
+                            // 鏍煎紡鍖栨棩鏈熸樉绀�
+                            return d.HEndDate ? d.HEndDate : '';
+                        }
+                    }
+                    , { field: 'HHCalibrationStatus', title: '鏍″噯鐘舵��', templet: '#HStatus' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
                 ];
                 option = {
@@ -912,7 +960,8 @@
                     , height: 500
                     , cols: [columns]
                     , done: function (res, curr, count) {
-
+                  
+                        //initDatePicker();
                     }
                 };
             }
@@ -922,7 +971,11 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HInspectInstruMentID": 0, "HInspectInstruMentNumber": "", "HInspectInstruMentName": "  ", "HBeginDate": "   ", "HEndDate": "" }];
+                var currentDate = new Date();
+                var formattedDate = currentDate.getFullYear() + '-' +
+                    ('0' + (currentDate.getMonth() + 1)).slice(-2) + '-' +
+                    ('0' + currentDate.getDate()).slice(-2);
+                option.data = [{ "HInspectInstruMentID": 0, "HInspectInstruMentNumber": "", "HInspectInstruMentName": "  ", "HBeginDate": formattedDate, "HEndDate": formattedDate, "HHCalibrationStatus": "鍚堟牸" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -978,10 +1031,10 @@
 
 
 
-                                , "HMainSourceBillType": data.HMainSourceBillType
-                                , "HMainSourceBillNo": data.HMainSourceBillNo
-                                , "HMainSourceInterID": data.HMainSourceInterID
-                                , "HMainSourceEntryID": data.HMainSourceEntryID
+                                //, "HMainSourceBillType": data.HMainSourceBillType
+                                //, "HMainSourceBillNo": data.HMainSourceBillNo
+                                //, "HMainSourceInterID": data.HMainSourceInterID
+                                //, "HMainSourceEntryID": data.HMainSourceEntryID
 
                                 , "HMaker": data.鍒跺崟浜�
                                 , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
@@ -1093,7 +1146,7 @@
                             layer.open({
                                 type: 2,
                                 skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '缁翠慨椤圭洰鍒楄〃',
+                                title: '妫�楠屼华鍣ㄥ垪琛�',
                                 closeBtn: 1,
                                 shift: 2,
                                 area: ['80%', '80%'],
@@ -1124,6 +1177,7 @@
                                             debugger
                                             if (isEmpty(curr.HInspectInstruMentID, true, true) === false) {
                                                 tempArr.push(curr)
+                                                console.log(tempArr)
                                             }
                                         }
 
@@ -1160,53 +1214,53 @@
                             });
                         }
 
-                        if (obj.event === 'HManagerCode')  //璐熻矗浜轰俊鎭�
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '璐熻矗浜轰俊鎭垪琛�',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
-                                btn: ['纭畾', '鍙栨秷']
-                                , btn1: function (index, layero) {
+                        //if (obj.event === 'HManagerCode')  //璐熻矗浜轰俊鎭�
+                        //{
+                        //    //椤甸潰灞�-鑷畾涔�
+                        //    layer.open({
+                        //        type: 2,
+                        //        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        //        title: '璐熻矗浜轰俊鎭垪琛�',
+                        //        closeBtn: 1,
+                        //        shift: 2,
+                        //        area: ['80%', '80%'],
+                        //        maxmin: true,
+                        //        content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
+                        //        btn: ['纭畾', '鍙栨秷']
+                        //        , btn1: function (index, layero) {
 
-                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                                    if (checkStatus.data.length === 0) {
-                                        return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }
+                        //            //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        //            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        //            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        //            if (checkStatus.data.length === 0) {
+                        //                return layer.msg('璇烽�夋嫨鏁版嵁');
+                        //            }
 
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HManagerID: checkStatus.data[0].HItemID,
-                                        HManagerCode: checkStatus.data[0].鑱屽憳浠g爜,
-                                        HManagerName: checkStatus.data[0].鑱屽憳鍚嶇О
-                                    });
+                        //            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        //            obj.update({
+                        //                HManagerID: checkStatus.data[0].HItemID,
+                        //                HManagerCode: checkStatus.data[0].鑱屽憳浠g爜,
+                        //                HManagerName: checkStatus.data[0].鑱屽憳鍚嶇О
+                        //            });
 
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-                                    if (isEmpty(optionData) === false) {
-                                        obj.update({
-                                            HManagerID: optionData[0].HItemID,
-                                            HManagerCode: optionData[0].鑱屽憳浠g爜,
-                                            HManagerName: optionData[0].鑱屽憳鍚嶇О
-                                        })
-                                        optionData = []
-                                    }
-                                }
-                            });
-                        }
+                        //            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        //        }
+                        //        , btn2: function (index, layero) {
+                        //            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        //        },
+                        //        end: function () {
+                        //            if (isEmpty(optionData) === false) {
+                        //                obj.update({
+                        //                    HManagerID: optionData[0].HItemID,
+                        //                    HManagerCode: optionData[0].鑱屽憳浠g爜,
+                        //                    HManagerName: optionData[0].鑱屽憳鍚嶇О
+                        //                })
+                        //                optionData = []
+                        //            }
+                        //        }
+                        //    });
+                        //}
 
                         //娓呯┖缂撳瓨
                         obj.event = "";
@@ -1551,13 +1605,13 @@
         function AllowLoadData(sSubStr) {
 
 
-            
-           
+
+
             if ($("#HDeptName").val() == '') {
                 layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-           
+
             if ($("#HEmpName").val() == '') {
                 layer.msg("璐ㄦ鍛樻病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
@@ -1566,7 +1620,7 @@
                 layer.msg("婧愬崟绫诲瀷闈炴墜宸ワ紝璇烽�夋嫨閫夊崟鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-           
+
             if ($("#HBillNo").val() == '') {
                 layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
@@ -1575,6 +1629,8 @@
                 layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
+            else
+                return true
         }
         //#endregion
 

--
Gitblit v1.9.1