From ad1d44769a784eb582e2da5702deb0de8a282e3d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 29 十一月 2024 16:28:57 +0800
Subject: [PATCH] 直接调拨单、分步式调入单,分步式调出单、采购订单,收料通知单,采购入库单、销售订单,发货通知单,销售出库单:双击物料打开弹窗后,没有将obj.event归为空,导致其它文本框输入时会触发相关事件 问题解决

---
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html |  517 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 414 insertions(+), 103 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 2e89225..c239e94 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -46,6 +46,7 @@
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
                             <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
                             <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                         </div>
@@ -54,7 +55,8 @@
                         <h1 style="text-align: center; padding: 10px 0;"><b>閲囪喘璁㈠崟</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
-                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--鍩烘湰淇℃伅-->
@@ -64,7 +66,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                 <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                 <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
                                             </div>
@@ -76,40 +78,17 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">杈呭姪瀛楁</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline" >
                                             <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline" style="width:440px">
-                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:400px;">
-                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:400px;">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width:50px">甯佸埆<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="margin-left: 238px">姹囩巼<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;"readonlys>
-                                            </div>
-                                        </div>
                                         
+
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
@@ -142,7 +121,7 @@
                                                 </button>
                                             </div>
                                         </div>
-                                      
+
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
@@ -156,44 +135,21 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">浜よ揣鍦扮偣</label>
+                                            <label class="layui-form-label">鑱旂郴浜�</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+                                                <input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off">
                                             </div>
                                         </div>
+
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+                                            <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
+                                                <input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
                                             </div>
                                         </div>
                                     </div>
-                                    <!--<div class="layui-row">
-        <div class="layui-col-xs4 layui-inline">
-            <label class="layui-form-label">鑱旂郴浜�</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off">
-            </div>
-        </div>
-
-        <div class="layui-col-xs4 layui-inline">
-            <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
-            </div>
-        </div>
-    </div>-->
                                     <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">缁撶畻鏃ユ湡</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
-                                            </div>
-                                        </div>
+                                        
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">椤圭洰缂栫爜</label>
                                             <div class="layui-input-inline">
@@ -231,6 +187,64 @@
                                             </div>
                                         </div>
                                     </div>
+                                </div>
+                            </div>
+
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">杈呭姪瀛楁</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width:50px">甯佸埆<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="margin-left: 238px">姹囩巼<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;" readonlys>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    
+                                    <div class="layui-row">
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜よ揣鍦扮偣</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">缁撶畻鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" style="float:left;width:150px;">
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div class="layui-row" style="margin-top:10px;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
@@ -243,8 +257,6 @@
                                     </div>
                                 </div>
                             </div>
-
-
                             <!--鍒跺崟淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item">
@@ -270,25 +282,11 @@
                                     </div>
                                     <div class="layui-row">
                                         <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>
-                                            </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="HDeleteMan " 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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -301,18 +299,32 @@
                                                 <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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>
+                                            </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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <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>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <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>
-                                                </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>
                                             </div>
                                         </div>
                                     </div>
@@ -344,6 +356,12 @@
     </script>
 
     <script>
+        //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+        var childPage = null;                       //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+        var currRowIndex = 0;                       //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+        var childData = null;                       //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+        //#endregion
+
         //#region 鎶樺彔娉ㄩ噴
         //#endregion
         layui.config({
@@ -421,7 +439,10 @@
                 })
             }
             //#endregion
-
+            //鍒ゆ柇椤甸潰鎵撳紑鏂瑰紡
+            if (OperationType == null || OperationType == "" || typeof (params[params[0]]) == "undefined") {
+                OperationType = 1;//鎿嶄綔绫诲瀷鍒濆鍖�
+            }
 
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {    //鍒ゆ柇 linterid 鍙橀噺鏄惁涓虹┖鎴栬�呯瓑浜�0
@@ -532,6 +553,12 @@
             });
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function (data) {
+                set_CheckBill(0);
+            });
+            //#endregion
 
             //閫�鍑烘寜閽�
             form.on('submit(Exit)', function () {
@@ -934,6 +961,27 @@
             }
             //#endregion
 
+            //#region  鍏蜂綋鏃堕棿杞崲
+            function formatSpecificDate(date) {
+                var d = new Date(date),      //瀹氫箟涓�涓皢date鍊艰浆鎹负鏃堕棿绫诲瀷璧嬪�肩粰d     鍒涘缓涓�涓柊鐨凞ate瀵硅薄d锛屼娇鐢ㄤ紶鍏ョ殑date鍙傛暟锛堝瓧绗︿覆鎴栨椂闂存埑锛変綔涓烘瀯閫犲嚱鏁扮殑鍙傛暟
+                    month = '' + (d.getMonth() + 1),  //浠巇瀵硅薄涓幏鍙栨湀浠�,灏嗚繖涓湀浠芥暟瀛楄浆鎹㈡垚瀛楃涓�
+                    day = '' + d.getDate(),             //浠巇瀵硅薄涓幏鍙�,灏嗚繖涓棩瀛楄浆鎹㈡垚瀛楃涓�
+                    year = d.getFullYear(),
+                    hour = '' + d.getHours(),
+                    minutes = '' + d.getMinutes(),
+                    secondes = '' + d.getSeconds(); // 浠巇瀵硅薄涓幏鍙栧畬鏁寸殑骞翠唤
+
+                if (month.length < 2) month = '0' + month;  //鍒ゆ柇鏈堜唤鐨勯暱搴︽槸鍚﹀皬浜�2浣嶆暟  灏忎簬杩欏湪鍓嶅姞涓�0
+                if (day.length < 2) day = '0' + day;        //鍒ゆ柇澶╂暟闀垮害鏄惁灏忎簬2浣嶆暟  灏忎簬杩欏湪鍓嶅姞涓�0
+                if (hour.length < 2) hour = '0' + hour;
+                if (minutes.length < 2) minutes = '0' + minutes;
+                if (secondes.length < 2) secondes = '0' + secondes;
+                var specific = hour + ':' + minutes + ':' + secondes;
+                var time = [year, month, day].join('-');
+                return [time, specific].join(' '); //灏嗗勾浠姐�佹湀浠藉拰鏃ュ瓧绗︿覆鏀惧叆涓�涓暟缁勪腑锛屽苟浣跨敤join鏂规硶灏嗗畠浠繛鎺ユ垚涓�涓瓧绗︿覆
+            }
+            //#endregion
+
             //#region 鎵撳嵃
             function get_PrintReport() {
                 if (linterid == null || linterid == "") {
@@ -1027,7 +1075,7 @@
                                 , "HSSID": data[0].HSSID
                                 , "HSSName": data[0].缁撶畻鏂瑰紡       // 璁剧疆鈥滅粨绠楁柟寮忊�濆悕绉板瓧娈电殑鍊笺��
                                 , "HLinkMan": data[0].鑱旂郴浜�       // 璁剧疆鈥滆仈绯讳汉鈥濆悕绉板瓧娈电殑鍊笺��
-                                , "HLinkPhone": data[0].鑱旂郴鐢佃瘽       // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
+                                , "HLinkPhone": data[0].鑱旂郴浜虹數璇�       // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
                                 , "HInnerBillNo": data[0].杈呭姪瀛楁       // 璁剧疆鈥滆緟鍔╁瓧娈碘�濆悕绉板瓧娈电殑鍊笺��
                                 , "HProjectID": data[0].HProjectID
                                 , "HProjectNumber": data[0].椤圭洰浠g爜       // 璁剧疆鈥滈」鐩唬鐮佲�濆悕绉板瓧娈电殑鍊笺��
@@ -1039,11 +1087,11 @@
                                 , "HMaker": data[0].鍒跺崟浜�       // 璁剧疆鈥滃埗鍗曚汉鈥濆悕绉板瓧娈电殑鍊笺��
                                 , "HChecker": data[0].瀹℃牳浜�       // 璁剧疆鈥滃鏍镐汉鈥濆悕绉板瓧娈电殑鍊笺��
                                 , "HCloseMan": data[0].鍏抽棴浜�       // 璁剧疆鈥滃叧闂汉鈥濆悕绉板瓧娈电殑鍊笺��
-                                , "HMakeDate": data[0].鍒跺崟鏃ユ湡       // 璁剧疆鈥滃埗鍗曟棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
-                                , "HCheckDate": data[0].瀹℃牳鏃ユ湡       // 璁剧疆鈥滃鏍告棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
-                                , "HCloseDate": data[0].鍏抽棴鏃ユ湡       // 璁剧疆鈥滃叧闂棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
-                                , "HUpDateDate": data[0].淇敼鏃ユ湡       // 璁剧疆鈥滀慨鏀规棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
-                                , "HDeleteDate": data[0].浣滃簾鏃ユ湡       // 璁剧疆鈥滀綔搴熸棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+                                , "HMakeDate": data[0].鍒跺崟鏃ユ湡 == null ? "" : Pub_Format(data[0].鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCheckDate": data[0].瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data[0].瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCloseDate": data[0].鍏抽棴鏃ユ湡 == null ? "" : Pub_Format(data[0].鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HUpDateDate": data[0].淇敼鏃ユ湡 == null ? "" : Pub_Format(data[0].淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HDeleteDate": data[0].浣滃簾鏃ユ湡 == null ? "" : Pub_Format(data[0].浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
                             });
 
                            //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
@@ -1099,18 +1147,22 @@
                 //    layer.msg("璇烽�夋嫨閲囪喘鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 //    return;
                 //}
-                if ($("#HDeptID").val() == 0) {
-                     //鎻愮ず璇烽�夋嫨閲囪喘閮ㄩ棬锛岃绀烘爣蹇椾负5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉�  锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮�  鏍囬涓衡�欐俯棣ㄦ彁绀衡��
-                    layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if ($("#HDeptID").val() == 0) {
+                //     //鎻愮ず璇烽�夋嫨閲囪喘閮ㄩ棬锛岃绀烘爣蹇椾负5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉�  锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮�  鏍囬涓衡�欐俯棣ㄦ彁绀衡��
+                //    layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 if ($("#HSupID").val() == 0) {
                      //鎻愮ず璇烽�夋嫨渚涘簲鍟嗭紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉�  锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮�  鏍囬涓衡�欐俯棣ㄦ彁绀衡��
                     layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+                //澶勭悊閲囪喘鏂瑰紡鍜岀粨绠楁柟寮忓�奸槻姝㈠悗绔痠nt杞瑂ting鎶ラ敊
                 if ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
                     $("#HPSStyleID").val(0)
+                }
+                if ($("#HSSID").val() == "" || $("#HSSID").val() == null) {
+                    $("#HSSID").val(0)
                 }
                 //if ($("#HPSStyleID").val() == 0) {
                 //     //鎻愮ず璇烽�夋嫨閲囪喘鏂瑰紡锛岃绀烘爣蹇椾负5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉�  锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮�  鏍囬涓衡�欐俯棣ㄦ彁绀衡��
@@ -1131,7 +1183,7 @@
                     }
                     var rowData = option.data[i];   //option.data[i]鍏冪礌鏄竴涓湁鏁堢殑瀵硅薄灏嗗叾璧嬪�肩粰rowData鍙橀噺
                     for (var col of Object.keys(rowData)) {  //閬嶅巻rowData瀵硅薄鐨勬墍鏈夐敭  Object.keys(rowData)杩斿洖涓�涓寘鍚玶owData鎵�鏈夎嚜韬睘鎬ч敭鐨勬暟缁�
-                        if (rowData[col] == "0" && (col == "HQty" || col =="HMaterID")) {  //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
+                        if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col=="HUnitID")) {  //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
                             layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�"); //鎻愮ず绗嚑琛屼笉鑳戒负0                          濡傛灉鎵惧埌鍊间负"0"鐨勫睘鎬э紝骞朵笖璇ュ睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"锛屽垯閫氳繃layer.msg鏄剧ず涓�涓鍛婃秷鎭紝鎸囧嚭鍝釜琛屽拰鍝釜鍒楃殑鍊间笉鑳戒负0
                             return; 
                         }
@@ -1200,7 +1252,7 @@
                                     //鍏抽棴褰撳墠frame
                                     layer.close(index);
                                 });
-
+                                $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
                             } else {
                                 layer.alert(result.code + result.Message, { icon: 5 });
                             }
@@ -1265,6 +1317,233 @@
             function set_GridCellCheck(obj) {       //瀹氫箟浜嗕竴涓悕涓簊et_GridCellCheck鐨勫嚱鏁帮紝瀹冩帴鍙椾竴涓弬鏁皁bj    
                 //浣跨敤$(document).off('keydown', ".layui-table-edit")鏉ョЩ闄わ紙濡傛灉瀛樺湪鐨勮瘽锛変箣鍓嶇粦瀹氬埌鏂囨。涓墍鏈�.layui-table-edit绫诲厓绱犱笂鐨刱eydown浜嬩欢鐩戝惉鍣�
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {  
+                    //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
+                    if (event.key != "F7") {
+                        var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                        //鏍规嵁瀛愯〃璁剧疆鐨別vent锛岃Е鍙戠浉搴斿脊绐�=================================================================================================
+                        if (obj.event == "HMaterID") {                           //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+                        //==========================================================================================================
+                            if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                                if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                                    var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                                    var innerHeight = window.innerHeight;
+                                    var top = offset.top + 0.05 * innerHeight;
+                                    var left = offset.left;
+                                    if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                                        top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                                    }
+                                    layer.open({
+                                        type: 2                                                                                     //寮圭獥绫诲瀷
+                                        , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                                        , area: ['25%', '30%']                                                                      //澶у皬
+                                        , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                                        , offset: [top, left]
+                                        , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                                        //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                                        , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                                        , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                                        , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                                        , success: function (layero, index) {
+                                            setTimeout(function () {
+                                                //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�=========================================================================================================
+                                                var value = $(e.currentTarget).val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                                currRowIndex = 0;
+                                                var tableView = "h_v_Gy_MaterialList";
+                                                var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                                                childPage.getData(childSWhere, tableView);
+                                                //====================================================================================================================================
+                                            }, 200);
+                                        }
+                                        , end: function () {
+                                            obj.event = "";
+                                            childPage = null;
+                                            currRowIndex = 0;
+                                            //===========================================================================================================================
+                                            if (childData != null) {
+                                                OptionData = childData;                             //鎶婇�変腑鏁版嵁璧嬪�肩粰OptionData鍙橀噺
+                                                //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+                                                var HSupID = $("#HSupID").val();
+                                                if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
+                                                    var Dec = getDecByMaterID(OptionData.HItemID) //鑾峰彇绮惧害
+                                                    var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                                    var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                                    var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                                                    $.ajax({
+                                                        url: GetWEBURL() + "/Gy_Supplier/xg",
+                                                        //url: "http://localhost:12761/Gy_Supplier/xg",
+                                                        type: "GET",
+                                                        data: {
+                                                            "HInterID": HSupID
+                                                        },
+                                                        success: function (d) {
+                                                            var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+                                                            var HExRate = $("#HExRate").val();                      //姹囩巼
+                                                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                                            var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                                            var HPrice = obj.data.HPrice * 1;                       //鍗曚环
+                                                            var HMoney = HQty * HPrice;                             //閲戦=鏁伴噺*鍗曚环
+                                                            var HTaxMoney = Number((HMoney * HTaxRate));            //绋庨=閲戦*绋庣巼
+                                                            var HlineTotal = HMoney + HTaxMoney;                    //浠风◣鍚堣=閲戦+绋庨
+                                                            var HTaxPrice = Number((HPrice * (1 + HTaxRate)));      //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                                            var HDiscountRate = obj.data.HDiscountRate * 1;         //鎶樻墸鐜�
+                                                            var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+                                                            var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));  //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+                                                            //鏁板瓧绮惧害
+                                                            HQty = Number(HQty.toFixed(HQtyDec));
+                                                            HPrice = Number(HPrice.toFixed(HPriceDec));
+                                                            HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                                            HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                                            HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                                                            HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                                                            HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+                                                            HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+                                                            obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                                "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                                , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                                , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                                , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                                , "HUnitID": OptionData.HUnitID
+                                                                , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                                                , "HTaxRate": HTaxRate * 100
+                                                                , "HQty": HQty                               //鏇存柊HQty瀛楁锛孒Qty
+                                                                , "HPrice": HPrice                         //鏇存柊HPrice瀛楁锛孒Price
+                                                                , "HMoney": HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                                                                , "HTaxMoney": HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                                                                , "HlineTotal": HlineTotal             //鏇存柊HlineTotal瀛楁锛孒lineTotal
+                                                                , "HTaxPrice": HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                                                                , "HRelTaxPrice": HRelTaxPrice            //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+                                                                , "HlineTotalBB": HlineTotalBB              //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+                                                            })
+                                                        }
+                                                    });
+                                                } else {
+                                                    obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                        "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                        , "HUnitID": OptionData.HUnitID
+                                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                                    })
+                                                }
+
+                                                OptionData = {};
+                                                childData = null;
+                                            }
+                                            //============================================================================================================================
+                                        }
+                                    });
+                                } else {
+                                    setTimeout(function () {
+                                        //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�=========================================================================================================
+                                        var value = $(e.currentTarget).val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                        currRowIndex = 0;
+                                        var tableView = "h_v_Gy_MaterialList";
+                                        var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%')  order by 鐗╂枡浠g爜 desc";
+                                        childPage.getData(childSWhere, tableView);
+                                        //=============================================================================================================================================
+                                    }, 200);
+                                }
+                            } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                                if (event.key == "ArrowUp") {
+                                    currRowIndex--;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "ArrowDown") {
+                                    currRowIndex++;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "Enter") {
+                                    //鎵嬪姩澶辩劍
+                                    var element = document.getElementById("HBillNo");
+                                    element.focus();
+
+                                    childPage.getSelectedData(currRowIndex);
+
+                                    //=============================================================================================================
+                                    if (childData != null) {
+                                        OptionData = childData;                             //鎶婇�変腑鏁版嵁璧嬪�肩粰OptionData鍙橀噺
+                                        //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+                                        var HSupID = $("#HSupID").val();
+                                        if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
+                                            var Dec = getDecByMaterID(OptionData.HItemID) //鑾峰彇绮惧害
+                                            var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                            var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                            var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                                            $.ajax({
+                                                url: GetWEBURL() + "/Gy_Supplier/xg",
+                                                //url: "http://localhost:12761/Gy_Supplier/xg",
+                                                type: "GET",
+                                                data: {
+                                                    "HInterID": HSupID
+                                                },
+                                                success: function (d) {
+                                                    var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+                                                    var HExRate = $("#HExRate").val();                      //姹囩巼
+                                                    //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                                    var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                                    var HPrice = obj.data.HPrice * 1;                       //鍗曚环
+                                                    var HMoney = HQty * HPrice;                             //閲戦=鏁伴噺*鍗曚环
+                                                    var HTaxMoney = Number((HMoney * HTaxRate));            //绋庨=閲戦*绋庣巼
+                                                    var HlineTotal = HMoney + HTaxMoney;                    //浠风◣鍚堣=閲戦+绋庨
+                                                    var HTaxPrice = Number((HPrice * (1 + HTaxRate)));      //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                                    var HDiscountRate = obj.data.HDiscountRate * 1;         //鎶樻墸鐜�
+                                                    var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+                                                    var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));  //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+                                                    //鏁板瓧绮惧害
+                                                    HQty = Number(HQty.toFixed(HQtyDec));
+                                                    HPrice = Number(HPrice.toFixed(HPriceDec));
+                                                    HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                                    HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                                    HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                                                    HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                                                    HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+                                                    HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+                                                    obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                        "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                        , "HUnitID": OptionData.HUnitID
+                                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                                        , "HTaxRate": HTaxRate * 100
+                                                        , "HQty": HQty                               //鏇存柊HQty瀛楁锛孒Qty
+                                                        , "HPrice": HPrice                         //鏇存柊HPrice瀛楁锛孒Price
+                                                        , "HMoney": HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                                                        , "HTaxMoney": HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                                                        , "HlineTotal": HlineTotal             //鏇存柊HlineTotal瀛楁锛孒lineTotal
+                                                        , "HTaxPrice": HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                                                        , "HRelTaxPrice": HRelTaxPrice            //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+                                                        , "HlineTotalBB": HlineTotalBB              //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+                                                    })
+                                                }
+                                            });
+                                        } else {
+                                            obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                , "HUnitID": OptionData.HUnitID
+                                                , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                            })
+                                        }
+
+                                        OptionData = {};
+                                        childData = null;
+                                    }
+                                    //=========================================================================================================================================
+
+                                    childPage = null;
+                                    currRowIndex = 0;
+                                    childData = null;
+                                    obj.event = "";
+                                }
+                            }
+                        }
+
+                    }
+                    //#endregion
+
+
                     if (event.key == "F7") {//妫�鏌ヨЕ鍙戜簨浠剁殑閿洏鎸夐敭鏄惁鏄疐7閿�
                         //鐗╂枡
                         if (obj.event == "HMaterID") {//鍒ゆ柇浼犲叆鐨刼bj瀵硅薄鐨別vent灞炴�ф槸鍚︾瓑浜庡瓧绗︿覆"HMaterID"
@@ -1337,7 +1616,7 @@
                                                 "HInterID": HSupID
                                             },
                                             success: function (d) {
-                                                var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�)*0.01;
+                                                var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
                                                 var HExRate = $("#HExRate").val();                      //姹囩巼
                                                 //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
                                                 var HQty = obj.data.HQty * 1;                           //鏁伴噺
@@ -1365,7 +1644,7 @@
                                                     , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
                                                     , "HUnitID": OptionData.HUnitID
                                                     , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                                    , "HTaxRate": HTaxRate*100
+                                                    , "HTaxRate": HTaxRate * 100
                                                     , HQty: HQty                               //鏇存柊HQty瀛楁锛孒Qty
                                                     , HPrice: HPrice                         //鏇存柊HPrice瀛楁锛孒Price
                                                     , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
@@ -1387,8 +1666,8 @@
                                             , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
                                         })
                                     }
-                                    }
-                                });
+                                }
+                            });
                         }
                         //璁¢噺鍗曚綅
                         if (obj.event == "HUnitID") {  //鍒ゆ柇  obj.event浜嬩欢 鏄惁绛変簬瀛楃涓� 'HUnitID'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
@@ -1471,6 +1750,10 @@
                 })
                 //鍙屽嚮
                 $('.layui-table-box tbody td[data-field="鐗╂枡浠g爜"]').off('dblclick').on('dblclick', function () {
+                    //鎵嬪姩澶辩劍
+                    var element = document.getElementById("HBillNo");
+                    element.focus();
+
                     var HOrgID = $("#HOrgID").val();  //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
                     layer.open({  //鎵撳紑灞�
                         type: 2         // //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe       绫诲瀷涓�2
@@ -1592,6 +1875,8 @@
                             }
                         }
                     });
+
+                    obj.event = "";
                 });
 
         }
@@ -1654,17 +1939,23 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
+                        
                         $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
                         $("#HSupID").val(checkStatus.data[0].HItemID);
-                        $("#HCurID").val(checkStatus.data[0].HCurID);
+                        $("#HCurID").val(checkStatus.data[0].HCurID == null ? 0 : checkStatus.data[0].HCurID);
                         $("#HCurName").val(checkStatus.data[0].璐у竵);
                         $("#HExRate").val(checkStatus.data[0].姹囩巼);
-                        $("#HSSID").val(checkStatus.data[0].HSSID);
+                        $("#HSSID").val(checkStatus.data[0].HSSID == null ? 0 : checkStatus.data[0].HSSID);
                         $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡);
                         $("#HAddress").val(checkStatus.data[0].鍦板尯);
                         $("#HPSStyleName").val(checkStatus.data[0].閲囪喘鏂瑰紡);
                         $("#HPSStyleID").val((checkStatus.data[0].HPSStyleID == null) ? 0 : checkStatus.data[0].HPSStyleID);
-                       
+                        //璁剧疆榛樿璐у竵
+                        if (checkStatus.data[0].HCurID==0) {
+                            $("#HCurID").val(1);
+                            $("#HCurName").val("浜烘皯甯�");
+                            $("#HExRate").val(1);
+                        }
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -1713,7 +2004,7 @@
                        }
                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HManagerID").val(checkStatus.data[0].HEmpID);
+                        $("#HManagerID").val(checkStatus.data[0].HEmpID == null ? 0 : checkStatus.data[0].HEmpID);
                         $("#HManagerName").val(checkStatus.data[0].璐熻矗浜�);
                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                    }
@@ -1812,6 +2103,8 @@
                         $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
                         $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);
                         $("#HProjectID").val(checkStatus.data[0].HInterID);
+                        $("#HLinkMan").val(checkStatus.data[0].鑱旂郴浜�);
+                        $("#HLinkPhone").val(checkStatus.data[0].鑱旂郴浜虹數璇�);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -2004,6 +2297,10 @@
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                     option.cols[0][i + 1]["hide"] = false;
                                 }
+                                //缁熻鍒�
+                                if (dataCols[6] == 1) {
+                                    option.cols[0][i + 1]["totalRow"] = true;
+                                }
                                 //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
                                 switch (dataCols[2]) {
                                     case "L":
@@ -2095,7 +2392,19 @@
            $("#HPSStyleID").val(obj[0].HPSStyleID == "" ? 0 : obj[0].HPSStyleID);
         } 
 
-        
+        //鏃堕棿鏍煎紡
+        function formatDateTime(date) {
+            const year = date.getFullYear();
+            const month = date.getMonth() + 1;
+            const day = date.getDate();
+            const hour = date.getHours();
+            const minute = date.getMinutes();
+            const second = date.getSeconds();
+            return `${year}-${pad(month)}-${pad(day)} ${pad(hour)}:${pad(minute)}:${pad(
+                second
+            )}`;
+        }
+
         function GetSettleStyleValue(obj)  //杩斿洖缁撶畻鏂瑰紡
         {
             $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
@@ -2119,6 +2428,8 @@
             $("#HProjectName").val(data[0].椤圭洰鍚嶇О);
             $("#HProjectNumber").val(data[0].椤圭洰浠g爜);
             $("#HProjectID").val(data[0].HInterID);
+            $("#HLinkMan").val(data[0].鑱旂郴浜�);
+            $("#HLinkPhone").val(data[0].鑱旂郴浜虹數璇�);
         }
         //鍙屽嚮杩斿洖浠撳簱
         function GetHWHValue(data) {

--
Gitblit v1.9.1