From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单   超出 关联数量  关闭源单 2.应收单 增加  反写源单 销售出库单 和 销售订单  超出关联数量  关闭源单 3.动态获取源单增加参数 Num 0蓝单   1红单  2全部 4.销售流程的测试并完善功能; 销售订单-》发货通知单-》销售出库单-》应收单 (注意: 源单类型的下拉框 需要 根据数据库 表动态加载, 关联数量 要准确 , 审核 且 未关闭 未行关闭的行 才能下推 ,关联数量超额后,要 反写 关闭 源单 )

---
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 1419 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 1,291 insertions(+), 128 deletions(-)

diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 4769e64..d82c1c8 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -89,21 +89,21 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">閿�鍞儴闂�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" 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">閿�鍞憳</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                 <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" 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">閿�鍞儴闂�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
@@ -134,6 +134,24 @@
                                             <label class="layui-form-label">姹囩巼<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;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">瀹氶噾姣斾緥%</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HEarnestRate" id="HEarnestRate" lay-filter="HEarnestRate" style="width: 180px; ">
+                                                    <option style="color:blue;" selected="selected" value="50">50%</option>
+                                                    <option style="color:blue;" value="100">100%</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閿�鍞鍗曠被鍨�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HBillSubType" id="HBillSubType" lay-filter="HBillSubType" style="width: 180px; ">
+                                                    <option style="color:blue;" selected="selected" value="0">鏅�氬崟鎹�</option>
+                                                    <option style="color:blue;" value="1">杩斾慨鍗曟嵁</option>
+                                                </select>
                                             </div>
                                         </div>
                                     </div>
@@ -203,6 +221,34 @@
                                             <label class="layui-form-label">闇�姹傞噾棰�<i class="layui-icon layui-icon-tips" id="tips-HBillMoney"></i></label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HBillMoney" id="HBillMoney" autocomplete="off" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">椤圭洰浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HProjectNumber" name="HProjectNumber" id="HProjectNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
+                                                <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" 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">椤圭洰鍚嶇О</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HProjectName" name="HProjectName" id="HProjectName" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浠撳簱</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
                                             </div>
                                         </div>
                                     </div>
@@ -361,10 +407,12 @@
                     <script type="text/html" id="toolbarDemo">
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLines"><i class="layui-icon layui-icon-form"></i>澧炲姞澶氳</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-batchDelete"><i class="layui-icon layui-icon-form"></i>鎵归噺鍒犻櫎</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                         </div>
                     </script>
@@ -388,6 +436,7 @@
     </script>
     <script>
         //#region 鎶樺彔娉ㄩ噴
+        var HDataEmp = {};
         //#endregion
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -405,7 +454,7 @@
                 , element = layui.element;
 
             //瀛愯〃娓叉煋鍙傛暟
-            var option = {};
+            window.option = {};
 
             //璁板綍缁勭粐鐨勫��
             var HOrgIDBar = 0;
@@ -413,11 +462,16 @@
             //妯″潡鍚�
             var HModName = "Xs_SeOrderBill";
             var HBillType = "1401";
+            var HEarnestRateTemp = "50";
 
             //鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            //闇�瑕佹壒閲忓垹闄ょ殑鍒楄〃
+            var btnBatchDeleteList = [];
+
             //#endregion
 
 
@@ -427,10 +481,10 @@
             get_LoginIs();
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            var HModuleType = "1401";
-            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
-            $("h1").html('<b>' + HPageTitle + '</b>');
+            //var HModuleType = "1401";
+            ////閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            //var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            //$("h1").html('<b>' + HPageTitle + '</b>');
             //#endregion
             //#endregion
 
@@ -444,6 +498,14 @@
                 set_InitGrid();
                 //鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
                 RoadBillMain(linterid);
+                //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+                setHisStockGoodsByHBillSubType_For_RoadBillMain();
+
+                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                setHEarnestRateByHisStockGoods();
+
+                //璁剧疆琛ㄥご鎵�闇�閲戦
+                set_HBillMoney($("#HEarnestRate").val() * 1);
 
                 //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
                 createBillNo();
@@ -461,6 +523,14 @@
                 set_InitGrid();
                 //鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
                 RoadBillMain(linterid);
+                //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+                setHisStockGoodsByHBillSubType_For_RoadBillMain();
+
+                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                setHEarnestRateByHisStockGoods();
+
+                //璁剧疆琛ㄥご鎵�闇�閲戦
+                set_HBillMoney($("#HEarnestRate").val() * 1);
             }
             //#endregion
 
@@ -526,6 +596,17 @@
                 get_checkPayCus();
             });
             //#endregion
+            //#region 閫夋嫨椤圭洰浠g爜鎸夐挳
+            form.on('submit(btnSearchHProNumber)', function () {
+                get_checkSearchHProNumber();
+            });
+            //#endregion
+
+            //#region 閫夋嫨浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
+             //#endregion
             //#endregion
 
             //#region 琛ㄥご鎸夐挳瑙﹀彂浜嬩欢
@@ -543,7 +624,7 @@
             });
             //#endregion
 
-            //#region 瀹℃牳鎸夐挳
+            //#region 鍙嶅鏍告寜閽�
             form.on('submit(set_AbandonCheck)', function (data) {
                 set_CheckBill(1);
             });
@@ -577,12 +658,14 @@
                     "HMaterID": "0",
                     "鐗╂枡浠g爜": "",
                     "鐗╂枡鍚嶇О": "",
-                    "HItemID": "0",
+                    "HOrderLevID": "0",
                     "璁㈠崟绛夌骇浠g爜": "",
                     "璁㈠崟绛夌骇鍚嶇О": "",
                     "瑙勬牸鍨嬪彿": "",
                     "HUnitID": "0",
                     "璁¢噺鍗曚綅": "",
+                    "HWHID": "",
+                    "浠撳簱":"",
                     "HQty": "0",
                     "HPrice": "0",
                     "HTaxPrice": "0",
@@ -600,11 +683,20 @@
                     "HRemark": "",
                     "HCusMaterNumber": "",
                     "HCusModel": "",
-                    "HCusMaterName": ""
+                    "HCusMaterName": "",
+                    "HRelationQty": "0",
+                    "HRelationQty_SellOutCheck": "0",
+                    "HRelationMoney_SellOutCheck": "0",
+                    "HRelationQty_ICMO": "0",
+                    "HRelationQty_SellBack": "0",
+                    "HRelationQty_SellBackCheck": "0"
                 };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    //鏂板涓�琛�
+                    case 'btn-AddLines': btnAddLines(NewRow);
                         break;
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
@@ -618,6 +710,9 @@
                     //涓嬬Щ
                     case 'btn-Under': btn_under();
                         break;
+                    //鎵归噺鍒犻櫎
+                    case 'btn-batchDelete': btn_batchDelete();
+                        break;
                     //鍒楄缃�
                     case 'set_HideColumn':
                         get_HideColumn();
@@ -630,6 +725,7 @@
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
                 //璁剧疆 鍙戣揣鏃堕棿
                 if (obj.event == 'HDate') {
                     var data = obj.data;
@@ -709,31 +805,60 @@
                             , HMoney: HMoney
                             , HlineTotal: HlineTotal
                         });
-                        table.render(option);
+                        //table.render(option);
 
                         //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                         setSelectHisStockGoodsByTableRender();
 
                         //璁剧疆琛ㄥご鎵�闇�閲戦
-                        set_HBillMoney();
+                        set_HBillMoney($("#HEarnestRate").val()*1);
                         break;
                     case "HPrice":                                                       //鍗曚环
                         //鏁版嵁鏍煎紡鏍¢獙
                         temp = value + "";
-                        if (!ref.test(temp) || temp == 0) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HPrice: oldText
-                            });
-                            table.render(option);
+                        if ($("#HBillSubType").val() == "0") {
+                            if (!ref.test(temp) || temp == 0) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                obj.update({
+                                    HPrice: oldText
+                                });
+                                table.render(option);
 
-                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
-                            setSelectHisStockGoodsByTableRender();
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
 
-                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
-                            return;
+                                layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                                return;
+                            }
+                        } else if ($("#HBillSubType").val() == "1") {
+                            if (!ref.test(temp)) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                obj.update({
+                                    HPrice: oldText
+                                });
+                                table.render(option);
+
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
+
+                                layer.msg("鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                return;
+                            }
+                        } else {
+                            if (!ref.test(temp)) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                obj.update({
+                                    HPrice: oldText
+                                });
+                                table.render(option);
+
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
+
+                                layer.msg("鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                return;
+                            }
                         }
-
 
                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
                         var HQty = obj.data.HQty * 1;                   //鏁伴噺
@@ -764,13 +889,13 @@
                             , HMoney: HMoney
                             , HlineTotal: HlineTotal
                         });
-                        table.render(option);
+                        //table.render(option);
 
                         //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                         setSelectHisStockGoodsByTableRender();
 
                         //璁剧疆琛ㄥご鎵�闇�閲戦
-                        set_HBillMoney();
+                        set_HBillMoney($("#HEarnestRate").val() * 1);
                         break;
                     case "HTaxRate":                                                       //鏁伴噺
                         //鏁版嵁鏍煎紡鏍¢獙
@@ -819,29 +944,59 @@
                             , HMoney: HMoney
                             , HlineTotal: HlineTotal
                         });
-                        table.render(option);
+                        //table.render(option);
 
                         //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                         setSelectHisStockGoodsByTableRender();
 
                         //璁剧疆琛ㄥご鎵�闇�閲戦
-                        set_HBillMoney();
+                        set_HBillMoney($("#HEarnestRate").val() * 1);
                         break;
                     case "HTaxPrice":                                                       //鏁伴噺
                         //鏁版嵁鏍煎紡鏍¢獙
                         temp = value + "";
-                        if (!ref.test(temp)) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HTaxPrice: oldText
-                            });
-                            table.render(option);
+                        if ($("#HBillSubType").val() == "0") {
+                            if (!ref.test(temp) || temp == "0") {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                obj.update({
+                                    HTaxPrice: oldText
+                                });
+                                table.render(option);
 
-                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
-                            setSelectHisStockGoodsByTableRender();
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
 
-                            layer.msg("鍚◣鍗曟嵁璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
-                            return;
+                                layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                return;
+                            }
+                        } else if ($("#HBillSubType").val() == "1") {
+                            if (!ref.test(temp)) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                obj.update({
+                                    HTaxPrice: oldText
+                                });
+                                table.render(option);
+
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
+
+                                layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                return;
+                            }
+                        } else {
+                            if (!ref.test(temp)) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                obj.update({
+                                    HTaxPrice: oldText
+                                });
+                                table.render(option);
+
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
+
+                                layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                return;
+                            }
                         }
                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
                         var HQty = obj.data.HQty * 1;                   //鏁伴噺
@@ -874,16 +1029,42 @@
                             , HMoney: HMoney
                             , HlineTotal: HlineTotal
                         });
-                        table.render(option);
+                        //table.render(option);
 
                         //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                         setSelectHisStockGoodsByTableRender();
 
                         //璁剧疆琛ㄥご鎵�闇�閲戦
-                        set_HBillMoney();
+                        set_HBillMoney($("#HEarnestRate").val() * 1);
                         break;
                     default:
                 }
+            });
+            //#endregion
+
+            //#region 鐩戝惉澶嶉�夋閫変腑浜嬩欢
+            table.on('checkbox(mainTable)', function (obj) {
+                //鑾峰彇閫変腑琛岀殑绱㈠紩鍒楄〃
+                var rowIndex = $(obj.tr).attr("data-index");
+
+                if (typeof (rowIndex) == "undefined") {
+                    if (btnBatchDeleteList.length == option.data.length) {
+                        btnBatchDeleteList = [];
+                    } else {
+                        btnBatchDeleteList = [];
+                        for (var i = 0; i < option.data.length; i++) {
+                            btnBatchDeleteList.push(i + "");
+                        }
+                    }
+                } else {
+                    if ($.inArray(rowIndex, btnBatchDeleteList) > -1) {
+                        var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
+                        btnBatchDeleteList = btnBatchDeleteList_New;
+                    } else {
+                        btnBatchDeleteList.push(rowIndex);
+                    }
+                }
+                console.log(btnBatchDeleteList);
             });
             //#endregion
             //#endregion
@@ -899,17 +1080,42 @@
 
                 //#region 鍙敤浣欓鎻愮ず淇℃伅
                 $("#tips-HAvailableBalance").on('click', function (data) {
-                    var tips_Message = "鍙敤棰濆害 = 瀹㈡埛浣欓 + 淇$敤棰濆害 - 锛堟湰鏈熼攢鍞鍗曟�婚噾棰� * 0.5锛�";
+                    var tips_Message = "鍙敤棰濆害 = 瀹㈡埛浣欓 + 淇$敤棰濆害 - 锛堟湰鏈熼攢鍞鍗曟�婚噾棰� * 瀹氶噾姣斾緥%锛�";
                     layer.alert(tips_Message, { icon: 0, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                 });
                 //#endregion
 
                 //#region 闇�姹傞噾棰�
                 $("#tips-HBillMoney").on('click', function (data) {
-                    var tips_Message = "闇�姹傞噾棰� = 浠风◣鍚堣 * 0.5";
+                    var tips_Message = "闇�姹傞噾棰� = 浠风◣鍚堣 * 瀹氶噾姣斾緥%";
                     layer.alert(tips_Message, { icon: 0, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                 });
                 //#endregion
+            });
+            //#endregion
+
+            //#region 璧犻�佹瘮渚嬩笅鎷夊垪琛ㄧ洃鍚�
+            form.on('select(HEarnestRate)', function (data) {
+                //杈撳叆鐨勯噾棰濆悎娉曪紝閲嶇畻鎶樻墸鍚庨噾棰�
+                var HEarnestRate = $("#HEarnestRate").val() * 1;    //瀹氶噾姣斾緥%
+                set_HBillMoney(HEarnestRate);
+
+                if (HEarnestRate != 0) {
+                    HEarnestRateTemp = HEarnestRate;
+                }
+            });
+            //#endregion
+
+            //#region 閿�鍞鍗曠被鍨嬩笅鎷夊垪琛ㄧ洃鍚�
+            form.on('select(HBillSubType)', function (data) {
+                //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+                setHisStockGoodsByHBillSubType();
+
+                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                setHEarnestRateByHisStockGoods();
+
+                //璁剧疆琛ㄥご鎵�闇�閲戦
+                set_HBillMoney($("#HEarnestRate").val() * 1);
             });
             //#endregion
             //#endregion
@@ -1036,24 +1242,32 @@
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
                         , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
-                        , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text' }
-                        , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
-                        , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
-                        , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text' }
+                        , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
+                        , { field: '浠撳簱', title: '浠撳簱', width: 100, style: 'background-color:#efefef4d;' ,edit: 'text' ,event: "HWHID" }//f7
+                        , { field: 'HisStockGoods', title: '鏄惁鍙栧簱瀛�', width: 120, templet: '#HisStockGoods' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text', event: "HQty" }
+                        , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
+                        , { field: 'HTaxRate', title: '绋庣巼%', width: 100, edit: 'text', event: "HTaxRate" }
+                        , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
                         , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
                         , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+                        , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
                         , { field: 'HCusMaterNumber', title: '瀹㈡埛鐗╂枡缂栫爜', width: 100, edit: 'text' }
                         , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', width: 100, edit: 'text' }
-                        , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
                         , { field: 'HDate', title: '浜よ揣鏃ユ湡', event: "HDate", width: 120 }
-                        , { field: 'HisStockGoods', title: '鏄惁鍙栧簱瀛�', width: 120, templet: '#HisStockGoods' }
-                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text', event: "HRemark" }
                         , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text', hide: true }
                         , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, hide: true }
                         , { field: 'HTaxMoney', title: '绋庨', width: 100, hide: true }
                         , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 120, hide: true }
                         , { field: 'HOutStockQty', title: '鍑哄簱鏁伴噺', width: 100, edit: 'text', hide: true }
                         , { field: 'HInvoiceQty', title: '寮�绁ㄦ暟閲�', width: 100, edit: 'text', hide: true }
+                        , { field: 'HRelationQty', title: '閿�鍞嚭搴撴暟閲�', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
+                        , { field: 'HRelationQty_SellOutCheck', title: '閿�鍞嚭搴撳鏍告暟閲�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+                        , { field: 'HRelationMoney_SellOutCheck', title: '閿�鍞嚭搴撳鏍搁噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+                        , { field: 'HRelationQty_ICMO', title: '鐢熶骇鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
+                        , { field: 'HRelationQty_SellBack', title: '閿�鍞��搴撴暟閲�', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
+                        , { field: 'HRelationQty_SellBackCheck', title: '閿�鍞��搴撳鏍告暟閲�', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
                     ]]
                     , done: function (res, curr, count) {
@@ -1083,6 +1297,8 @@
                     "瑙勬牸鍨嬪彿": "",
                     "HUnitID": "0",
                     "璁¢噺鍗曚綅": "",
+                    "HWHID": "",
+                    "浠撳簱":"",
                     "HQty": "0",
                     "HPrice": "0",
                     "HTaxPrice": "0",
@@ -1100,7 +1316,13 @@
                     "HRemark": "",
                     "HCusMaterNumber": "",
                     "HCusModel": "",
-                    "HCusMaterName": ""
+                    "HCusMaterName": "",
+                    "HRelationQty": "0",
+                    "HRelationQty_SellOutCheck": "0",
+                    "HRelationMoney_SellOutCheck": "0",
+                    "HRelationQty_ICMO": "0",
+                    "HRelationQty_SellBack": "0",
+                    "HRelationQty_SellBackCheck": "0"
                 }];
 
                 option.data = rowdata;
@@ -1110,7 +1332,7 @@
                 setSelectHisStockGoodsByTableRender();
 
                 //璁剧疆琛ㄥご鎵�闇�閲戦
-                set_HBillMoney();
+                set_HBillMoney($("#HEarnestRate").val() * 1);
             }
             //#endregion
 
@@ -1134,6 +1356,9 @@
                 //鍒濆鍖栧苟鍒楄缃細瀛愯〃1
                 set_InitGrid();
                 DisPlay_HideColumn();
+
+                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                setHEarnestRateByHisStockGoods();
             }
             //#endregion
 
@@ -1166,6 +1391,8 @@
                                 , "HCurID": data.HCurID
                                 , "HCurName": data.甯佸埆
                                 , "HExRate": data.姹囩巼
+                                , "HEarnestRate": data.瀹氶噾姣斾緥
+                                , "HBillSubType": data.HBillSubType
                                 , "HManagerID": data.HManagerID
                                 , "HManagerName": data.涓荤
                                 , "HSellSID": data.HSellSID
@@ -1178,6 +1405,11 @@
                                 , "HLinkMan": data.鑱旂郴浜�
                                 , "HExplanation": data.鎽樿
                                 , "HLinkPhone": data.鑱旂郴鐢佃瘽
+                                , "HProjectID": data.HProjectID
+                                , "HProjectNumber": data.椤圭洰缂栫爜
+                                , "HProjectName": data.椤圭洰鍚嶇О
+                                , "HWHID": data.涓讳粨搴搃d
+                                , "HWHName": data.涓讳粨搴�
                                 , "HCreditRating_Now": data.HCreditRating_Now
                                 , "HRemark": data.琛ㄥご澶囨敞
                                 , "HMaker": data.鍒跺崟浜�
@@ -1213,6 +1445,8 @@
                                         "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
                                         "HUnitID": result.data[i]["HUnitID"],
                                         "璁¢噺鍗曚綅": result.data[i]["璁¢噺鍗曚綅"],
+                                        "HWHID": result.data[i]["HWhID"],
+                                        "浠撳簱": result.data[i]["瀛愪粨搴�"],
                                         "HQty": dealDoubleToFixed(result.data[i]["鏁伴噺"], 1),
                                         "HPrice": dealDoubleToFixed(result.data[i]["鍗曚环"], 3),
                                         "HTaxPrice": dealDoubleToFixed(result.data[i]["鍚◣鍗曚环"], 3),
@@ -1223,30 +1457,42 @@
                                         "HTaxMoney": result.data[i]["绋庨"],
                                         "HlineTotal": dealDoubleToFixed(result.data[i]["浠风◣鍚堣"], 2),
                                         "HlineTotalBB": result.data[i]["鏈綅甯佷环绋庡悎璁�"],
-                                        "HisStockGoods": result.data[i]["鏄惁鍙栧簱瀛�"]=="Y"?true:false,
+                                        "HisStockGoods": result.data[i]["鏄惁鍙栧簱瀛�"]=="Y"?"true":"false",
                                         "HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
                                         "HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
                                         "HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
                                         "HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
                                         "HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
                                         "HCusModel": result.data[i]["瀹㈡埛瑙勬牸鍨嬪彿"],
-                                        "HCusMaterName": result.data[i]["瀹㈡埛鐗╂枡鍚嶇О"]
+                                        "HCusMaterName": result.data[i]["瀹㈡埛鐗╂枡鍚嶇О"],
+                                        "HRelationQty": OperationType == 2 ? "0" : result.data[i]["鍏宠仈鏁伴噺"],
+                                        "HRelationQty_SellOutCheck": OperationType == 2 ? "0" : result.data[i]["閿�鍞嚭搴撳鏍告暟閲�"],
+                                        "HRelationMoney_SellOutCheck": OperationType == 2 ? "0" : result.data[i]["閿�鍞嚭搴撳鏍搁噾棰�"],
+                                        "HRelationQty_ICMO": OperationType == 2 ? "0" : result.data[i]["鐢熶骇鍏宠仈鏁伴噺"],
+                                        "HRelationQty_SellBack": OperationType == 2 ? "0" : result.data[i]["閿�鍞��搴撴暟閲�"],
+                                        "HRelationQty_SellBackCheck": OperationType == 2 ? "0" : result.data[i]["閿�鍞��搴撳鏍告暟閲�"],
                                     }
                                 );
                             }
                             option.data = rowdata;
 
                             //鍑哄簱鏁伴噺銆佸紑绁ㄦ暟閲忎笉鍙紪杈�
-                            option.cols[0][22].edit = null;
-                            option.cols[0][23].edit = null;
+                            //option.cols[0][22].edit = null;
+                            //option.cols[0][23].edit = null;
 
                             table.render(option);
+
+                            //鑾峰彇涓存椂瀹氶噾姣斾緥
+                            HEarnestRateTemp = data.瀹氶噾姣斾緥 + "" == "0" ? "50" : data.瀹氶噾姣斾緥 + "";
 
                             //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                             setSelectHisStockGoodsByTableRender();
 
+                            //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                            setHEarnestRateByHisStockGoods();
+
                             //璁剧疆琛ㄥご鎵�闇�閲戦
-                            set_HBillMoney();
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
@@ -1269,7 +1515,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閿�鍞憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1277,17 +1523,26 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
+
+                        getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
-                    , btn2: function (index, layero) { }
+                    , btn2: function (index, layero) {
+                        $("#HEmpName").val("");
+                        $("#HEmpID").val("0");
+
+                        $("#HDeptID").val("0");
+                        $("#HDeptName").val("");
+                    }
                 })
             }
             //#endregion
 
             //#region 瀹㈡埛閫夋嫨椤甸潰
             function get_checkCus() {
+                var HEmpID = $("#HEmpID").val();
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -1372,7 +1627,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1380,7 +1635,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1422,7 +1677,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閿�鍞柟寮忓垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1430,7 +1685,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSellSName").val(checkStatus.data[0].HName);
+                        $("#HSellSName").val(checkStatus.data[0].閿�鍞柟寮忓悕绉�);
                         $("#HSellSID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1447,7 +1702,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1455,7 +1710,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSSName").val(checkStatus.data[0].HName);
+                        $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
                         $("#HSSID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1463,6 +1718,83 @@
                 })
             }
             //#endregion
+
+
+            //#region 椤圭洰浠g爜閫夋嫨椤甸潰
+            function get_checkSearchHProNumber() {
+                var HOrgID = $("#HOrgID").val();
+                //鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                    , title: "宸ョ▼椤圭洰鍒楄〃"                             //鏍囬
+                    , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                    , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+
+                        //鍒ゆ柇椤圭洰鏄惁鍏抽棴
+                        if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+                            $("#HProjectID").val(checkStatus.data[0].HInterID);
+                            $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+                            $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+                        } else {
+                            layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+                        }
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 浠撳簱
+            function get_checkWH() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '浠撳簱鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+
+                        if (option.data.length > 0) {
+                            for (var i = 0; i < option.data.length; i++) {
+                                if (option.data[i]["HWHID"] == 0) {
+                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
+                                    option.data[i]["浠撳簱"] = checkStatus.data[0].浠撳簱鍚嶇О;
+                                }
+                            }
+                        }
+                        table.render(option);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //#endregion
+
             //#endregion
 
             //#region 淇濆瓨鏂规硶
@@ -1472,10 +1804,12 @@
                 if (OperationType == 1 || OperationType == 2) {
                     refSav = "Add";
                     data.field.HChangeDate = new Date();
+                    data.field.HSTOCKORGID = data.field.HOrgID;
                 }
                 if (OperationType == 3) {
                     refSav = "Update";
                     data.field.HChangeDate = new Date();
+                    data.field.HSTOCKORGID = data.field.HOrgID;
                 }
 
                 //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
@@ -1568,6 +1902,11 @@
                     return false;
                 }
 
+                if ($("#HBillSubType").val() != "0" && $("#HBillSubType").val()!="1") {
+                    layer.msg("璇烽�夋嫨閿�鍞鍗曠被鍨�!");
+                    return false;
+                }
+
                 //if ($("#HSellSID").val() == "0") {
                 //    layer.msg("閿�鍞柟寮忔湭閫夋嫨!");
                 //    return false;
@@ -1594,11 +1933,12 @@
                 //#endregion
 
                 //#region 瀛愯〃 鏁版嵁妫�楠�
+                var RowCount = 0;
                 for (var i = 0; i < option.data.length; i++) {
                     if (option.data[i]["HMaterID"] == "0") {
-                        layer.msg("绗�" + i + "琛岋細鐗╂枡鏈�夋嫨锛�");
-                        return false;
+                        continue;
                     }
+                    RowCount++;
 
                     if (option.data[i]["HUnitID"] == "0") {
                         layer.msg("绗�" + i + "琛岋細璁¢噺鍗曚綅鏈�夋嫨锛�");
@@ -1617,13 +1957,21 @@
 
                     //鍗曚环鏍煎紡鏍¢獙
                     temp = option.data[i]["HPrice"] + "";
-                    if (temp == "0") {
-                        layer.msg("绗�" + i + "琛岋細鍗曚环涓嶈兘涓�0锛�");
-                        return false;
-                    } else if (!ref.test(temp)) {
-                        layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
-                        return false;
+                    if ($("#HBillSubType").val() == "0") {
+                        if (temp == "0") {
+                            layer.msg("绗�" + i + "琛岋細鍗曚环涓嶈兘涓�0锛�");
+                            return false;
+                        } else if (!ref.test(temp)) {
+                            layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                            return false;
+                        }
+                    } else if ($("#HBillSubType").val() == "1"){
+                        if (!ref.test(temp)) {
+                            layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                            return false;
+                        }
                     }
+                    
 
                     //绋庣巼鏍煎紡鏍¢獙
                     temp = option.data[i]["HTaxRate"] + "";
@@ -1634,32 +1982,54 @@
 
                     //鍚◣鍗曚环鏍煎紡鏍¢獙
                     temp = option.data[i]["HTaxPrice"] + "";
-                    if (temp == "0") {
-                        layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
-                        return false;
-                    } else if (!ref.test(temp)) {
-                        layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
-                        return false;
+                    if ($("#HBillSubType").val() == "0") {
+                        if (temp == "0") {
+                            layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
+                            return false;
+                        } else if (!ref.test(temp)) {
+                            layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                            return false;
+                        }
+                    } else if ($("#HBillSubType").val() == "1"){
+                        if (!ref.test(temp)) {
+                            layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                            return false;
+                        }
                     }
+                    
 
                     //閲戦鏍煎紡鏍¢獙
                     temp = option.data[i]["HMoney"] + "";
-                    if (temp == "0") {
-                        layer.msg("绗�" + i + "琛岋細閲戦涓嶈兘涓�0锛�");
-                        return false;
-                    } else if (!ref.test(temp)) {
-                        layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
-                        return false;
+                    if ($("#HBillSubType").val() == "0") {
+                        if (temp == "0") {
+                            layer.msg("绗�" + i + "琛岋細閲戦涓嶈兘涓�0锛�");
+                            return false;
+                        } else if (!ref.test(temp)) {
+                            layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                            return false;
+                        }
+                    } else if ($("#HBillSubType").val() == "1") {
+                        if (!ref.test(temp)) {
+                            layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                            return false;
+                        }
                     }
 
                     //浠风◣鍚堣鏍煎紡鏍¢獙
                     temp = option.data[i]["HlineTotal"] + "";
-                    if (temp == "0") {
-                        layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
-                        return false;
-                    } else if (!ref.test(temp)) {
-                        layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
-                        return false;
+                    if ($("#HBillSubType").val() == "0") {
+                        if (temp == "0") {
+                            layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
+                            return false;
+                        } else if (!ref.test(temp)) {
+                            layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                            return false;
+                        }
+                    } else if ($("#HBillSubType").val() == "1") {
+                        if (!ref.test(temp)) {
+                            layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                            return false;
+                        }
                     }
 
                     if (option.data[i]["HDate"] == "") {
@@ -1731,18 +2101,22 @@
                     //    return false;
                     //}
                 }
+                if (RowCount == 0) {
+                    layer.msg("淇濆瓨澶辫触锛屽瓙琛ㄨ嚦灏戦渶瑕佸瓨鍦ㄤ竴琛岃褰曢�夋嫨浜嗙墿鏂欙紒");
+                    return false;
+                }
                 //#endregion
 
                 //#region 瀛愯〃 鍏抽敭瀛楅噸澶嶆牎楠�
-                var num = [];
-                for (var i = 0; i < option.data.length; i++) {
-                    if ($.inArray(option.data[i]["HMaterID"], num) == -1) {
-                        num.push(option.data[i]["HMaterID"]);
-                    } else {
-                        layer.msg("绗�" + (i + 1) + "琛�,鐗╂枡:" + option.data[i]["HMaterID"] + "閲嶅!");
-                        return false;
-                    }
-                }
+                //var num = [];
+                //for (var i = 0; i < option.data.length; i++) {
+                //    if ($.inArray(option.data[i]["HMaterID"], num) == -1) {
+                //        num.push(option.data[i]["HMaterID"]);
+                //    } else {
+                //        layer.msg("绗�" + (i + 1) + "琛�,鐗╂枡:" + option.data[i]["HMaterID"] + "閲嶅!");
+                //        return false;
+                //    }
+                //}
                 //#endregion
                 return true;
             }
@@ -1750,6 +2124,13 @@
 
             //#region 鍦ㄦ湯灏惧鍔犱竴琛�
             function btnAddLine(NewRow) {
+                if (option.data.length > 0) {
+                    NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
+                } else {
+                    NewRow.HisStockGoods = "false";
+                }
+
+
                 table.cache["mainTable"].push(NewRow);
                 option.data = table.cache["mainTable"];
                 table.render(option);
@@ -1757,15 +2138,163 @@
                 //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                 setSelectHisStockGoodsByTableRender();
 
+                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                //setHEarnestRateByHisStockGoods();
+
                 //璁剧疆琛ㄥご鎵�闇�閲戦
-                set_HBillMoney();
+                set_HBillMoney($("#HEarnestRate").val() * 1);
                 //rows++;
                 layer.msg('澧炲姞涓�琛屾寜閽紒')
             }
             //#endregion
 
+            //#region 鍦ㄦ湯灏惧鍔犳寚瀹氭暟閲忕殑琛�
+            function btnAddLines(Row) {
+                layer.prompt({ formType: 2, title: "璇疯緭鍏ラ渶瑕佹柊澧炵殑琛屾暟", value: '1' },
+                    function (value, index) {
+                        //鏁板�兼牸寮忔牎楠屽伐鍏�
+                        var ref = /^[1-9]\d*$/;          //姝f暣鏁版鍒欒〃杈惧紡
+                        var temp = "";
+
+                        //鏁版嵁鏍¢獙
+                        temp = value;
+                        if (!ref.test(temp) || temp == "0") {
+                            layer.msg("璇疯緭鍏ュぇ浜�0鐨勬暣鏁�");
+                            return false;
+                        } else if (temp * 1 > 50) {
+                            layer.confirm("鏂板琛屾暟瓒呰繃50琛岋紝鏄惁纭畾鏂板?", function (index1) {
+                                var RowsCount = value * 1;
+                                for (var i = 0; i < RowsCount; i++) {
+                                    var NewRow = {
+                                        "HMaterID": "0",
+                                        "鐗╂枡浠g爜": "",
+                                        "鐗╂枡鍚嶇О": "",
+                                        "HOrderLevID": "0",
+                                        "璁㈠崟绛夌骇浠g爜": "",
+                                        "璁㈠崟绛夌骇鍚嶇О": "",
+                                        "瑙勬牸鍨嬪彿": "",
+                                        "HUnitID": "0",
+                                        "璁¢噺鍗曚綅": "",
+                                        "HWHID": "",
+                                        "浠撳簱": "",
+                                        "HQty": "0",
+                                        "HPrice": "0",
+                                        "HTaxPrice": "0",
+                                        "HMoney": "0",
+                                        "HDiscountRate": "0",
+                                        "HRelTaxPrice": "0",
+                                        "HTaxRate": "0",
+                                        "HTaxMoney": "0",
+                                        "HlineTotal": "0",
+                                        "HlineTotalBB": "0",
+                                        "HDate": Format(new Date(), 'yyyy-MM-dd'),
+                                        "HisStockGoods": "false",
+                                        "HOutStockQty": "0",
+                                        "HInvoiceQty": "0",
+                                        "HRemark": "",
+                                        "HCusMaterNumber": "",
+                                        "HCusModel": "",
+                                        "HCusMaterName": "",
+                                        "HRelationQty": "0",
+                                        "HRelationQty_SellOutCheck": "0",
+                                        "HRelationMoney_SellOutCheck": "0",
+                                        "HRelationQty_ICMO": "0",
+                                        "HRelationQty_SellBack": "0",
+                                        "HRelationQty_SellBackCheck": "0"
+                                    };
+                                    if (option.data.length > 0) {
+                                        NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
+                                    } else {
+                                        NewRow.HisStockGoods = "false";
+                                    }
+                                    table.cache["mainTable"].push(NewRow);
+                                }
+                                option.data = table.cache["mainTable"];
+                                table.render(option);
+
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
+
+                                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                                //setHEarnestRateByHisStockGoods();
+
+                                //璁剧疆琛ㄥご鎵�闇�閲戦
+                                set_HBillMoney($("#HEarnestRate").val() * 1);
+                                layer.close(index1);
+                                layer.close(index);
+                            })
+                        } else {
+                            var RowsCount = value * 1;
+                            for (var i = 0; i < RowsCount; i++) {
+                                var NewRow = {
+                                    "HMaterID": "0",
+                                    "鐗╂枡浠g爜": "",
+                                    "鐗╂枡鍚嶇О": "",
+                                    "HOrderLevID": "0",
+                                    "璁㈠崟绛夌骇浠g爜": "",
+                                    "璁㈠崟绛夌骇鍚嶇О": "",
+                                    "瑙勬牸鍨嬪彿": "",
+                                    "HUnitID": "0",
+                                    "璁¢噺鍗曚綅": "",
+                                    "HWHID": "",
+                                    "浠撳簱": "",
+                                    "HQty": "0",
+                                    "HPrice": "0",
+                                    "HTaxPrice": "0",
+                                    "HMoney": "0",
+                                    "HDiscountRate": "0",
+                                    "HRelTaxPrice": "0",
+                                    "HTaxRate": "0",
+                                    "HTaxMoney": "0",
+                                    "HlineTotal": "0",
+                                    "HlineTotalBB": "0",
+                                    "HDate": Format(new Date(), 'yyyy-MM-dd'),
+                                    "HisStockGoods": "false",
+                                    "HOutStockQty": "0",
+                                    "HInvoiceQty": "0",
+                                    "HRemark": "",
+                                    "HCusMaterNumber": "",
+                                    "HCusModel": "",
+                                    "HCusMaterName": "",
+                                    "HRelationQty": "0",
+                                    "HRelationQty_SellOutCheck": "0",
+                                    "HRelationMoney_SellOutCheck": "0",
+                                    "HRelationQty_ICMO": "0",
+                                    "HRelationQty_SellBack": "0",
+                                    "HRelationQty_SellBackCheck": "0"
+                                };
+                                if (option.data.length > 0) {
+                                    NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
+                                } else {
+                                    NewRow.HisStockGoods = "false";
+                                }
+                                table.cache["mainTable"].push(NewRow);
+                            }
+                            option.data = table.cache["mainTable"];
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                            //setHEarnestRateByHisStockGoods();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                            layer.close(index);
+                        }
+                    });
+            }
+            //#endregion
+
             //#region 鍦ㄦ寚瀹氳涓嬫彃鍏ヤ竴琛�
             function btnInsertLine(NewRow) {
+                if (option.data.length > 0) {
+                    NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
+                } else {
+                    NewRow.HisStockGoods = "false";
+                }
+
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
@@ -1784,8 +2313,11 @@
                     //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                     setSelectHisStockGoodsByTableRender();
 
+                    //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                    //setHEarnestRateByHisStockGoods();
+
                     //璁剧疆琛ㄥご鎵�闇�閲戦
-                    set_HBillMoney();
+                    set_HBillMoney($("#HEarnestRate").val() * 1);
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
@@ -1814,8 +2346,11 @@
                     //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                     setSelectHisStockGoodsByTableRender();
 
+                    //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                    //setHEarnestRateByHisStockGoods();
+
                     //璁剧疆琛ㄥご鎵�闇�閲戦
-                    set_HBillMoney();
+                    set_HBillMoney($("#HEarnestRate").val() * 1);
                 }
             }
             //#endregion
@@ -1844,8 +2379,11 @@
                             //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                             setSelectHisStockGoodsByTableRender();
 
+                            //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                            //setHEarnestRateByHisStockGoods();
+
                             //璁剧疆琛ㄥご鎵�闇�閲戦
-                            set_HBillMoney();
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
                             break;
                         }
                     }
@@ -1881,14 +2419,41 @@
                             //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                             setSelectHisStockGoodsByTableRender();
 
+                            //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                            //setHEarnestRateByHisStockGoods();
+
                             //璁剧疆琛ㄥご鎵�闇�閲戦
-                            set_HBillMoney();
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
                             break;
                         }
                     }
                 } else {
                     layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
                 }
+            }
+            //#endregion
+
+            //#region 鎵归噺鍒犻櫎
+            function btn_batchDelete() {
+                var data = [];
+                for (var i = 0; i < option.data.length; i++) {
+                    if ($.inArray(i+"", btnBatchDeleteList) == -1) {
+                        data.push(option.data[i]);
+                    }
+                }
+                option.data = data;
+                table.render(option);
+
+                btnBatchDeleteList = [];
+
+                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                setSelectHisStockGoodsByTableRender();
+
+                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                //setHEarnestRateByHisStockGoods();
+
+                //璁剧疆琛ㄥご鎵�闇�閲戦
+                set_HBillMoney($("#HEarnestRate").val() * 1);
             }
             //#endregion
 
@@ -1909,11 +2474,23 @@
                             option.data = oldData;
                             table.render(option);
 
+                            //鏇存柊鎵归噺鍒犻櫎绱㈠紩鍒楄〃
+                            var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
+                            btnBatchDeleteList = btnBatchDeleteList_New;
+                            for (var i = 0; i < btnBatchDeleteList.length; i++) {
+                                if (btnBatchDeleteList[i] * 1 > rowIndex * 1) {
+                                    btnBatchDeleteList[i] = (btnBatchDeleteList[i] * 1 - 1) + "";
+                                }
+                            }
+
                             //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                             setSelectHisStockGoodsByTableRender();
 
+                            //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                            setHEarnestRateByHisStockGoods();
+
                             //璁剧疆琛ㄥご鎵�闇�閲戦
-                            set_HBillMoney();
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
                             layer.close(index);
                         }
                     });
@@ -1927,9 +2504,15 @@
                 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.HisStockGoods = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
-                    }
+                    value.HisStockGoods = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                    setSelectHisStockGoodsByTableRender();
+
+                    //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+                    setHEarnestRateByHisStockGoods();
+
+                    //璁剧疆琛ㄥご鎵�闇�閲戦
+                    set_HBillMoney($("#HEarnestRate").val() * 1);
                 });
             });
             //#endregion
@@ -2025,9 +2608,23 @@
                                     setSelectHisStockGoodsByTableRender();
 
                                     //璁剧疆琛ㄥご鎵�闇�閲戦
-                                    set_HBillMoney();
+                                    set_HBillMoney($("#HEarnestRate").val() * 1);
 
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HMaterID": HDataEmp.HItemID
+                                            , "鐗╂枡浠g爜": HDataEmp.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": HDataEmp.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": HDataEmp.瑙勬牸鍨嬪彿
+                                            , "HUnitID": HDataEmp.HUnitID
+                                            , "璁¢噺鍗曚綅": HDataEmp.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        HDataEmp = {};
+                                    }
                                 }
                             })
                         }
@@ -2041,7 +2638,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -2053,13 +2650,61 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "璁¢噺鍗曚綅": checkStatus.data[0].HName
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                         , "HUnitID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
+                                , end: function () {
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HUnitID": HDataEmp.HItemID
+                                            , "璁¢噺鍗曚綅": HDataEmp.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        HDataEmp = {};
+                                    }
+                                }
                             })
                         }
+                        //浠撳簱
+                        if (obj.event == "HWHID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "浠撳簱鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HWHID": checkStatus.data[0].HItemID,
+                                        "浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HWHID": OptionData.HItemID
+                                        , "浠撳簱": OptionData.浠撳簱鍚嶇О
+                                    })
+                                }
+                            })
+
+                        }
+
                         //璁㈠崟绛夌骇
                         if (obj.event == "HOrderLevID") {
                             layer.open({
@@ -2087,13 +2732,345 @@
                                         , "HOrderLevID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }, end: function () {
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "璁㈠崟绛夌骇鍚嶇О": HDataEmp.璁㈠崟绛夌骇
+                                            , "璁㈠崟绛夌骇浠g爜": HDataEmp.璁㈠崟绛夌骇浠g爜
+                                            , "HOrderLevID": HDataEmp.HItemID
+                                        })
+                                        HDataEmp = {};
+                                    }
                                 }
                             })
+                        }
+                        //obj.event = "";
+                        return false;
+                    }
+
+
+                    //#region 鎵归噺濉厖
+                    //鏁板�兼牸寮忔牎楠屽伐鍏�
+                    var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                    var temp = "";
+                    //鎿嶄綔琛岀储寮�
+                    var rowIndex = $(obj.tr).attr("data-index");
+
+                    if (event.key == "F6") {
+                        //鏁伴噺
+                        if (obj.event == "HQty") {
+                            var oldText = table.cache["mainTable"][rowIndex].HQty;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍煎紡鏍¢獙
+                            temp = value + "";
+                            if (!ref.test(temp) || temp == 0) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                option.data[rowIndex].HQty = oldText;
+                                table.render(option);
+
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
+
+                                layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                                return;
+                            }
+
+
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                var HQty = value * 1;                           //鏁伴噺
+                                var HPrice = option.data[i].HPrice * 1;               //鍗曚环
+                                var HTaxRate = option.data[i].HTaxRate * 0.01;           //绋庣巼
+                                /*var HDiscountRate = option.data[i].HDiscountRate * 1; //鎶樻墸鐜�*/
+                                var HTaxPrice = HPrice * (1 + HTaxRate);        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+                                //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+                                var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                var HTaxMoney = HMoney * HTaxRate;              //绋庨=閲戦*绋庣巼
+                                var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+
+                                //璁剧疆鏁版嵁灏忔暟浣嶆暟
+                                HQty = dealDoubleToFixed(HQty, 1);
+                                HPrice = dealDoubleToFixed(HPrice, 3);
+                                HTaxRate = HTaxRate;
+                                HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+                                HMoney = dealDoubleToFixed(HMoney, 2);
+                                HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
+                                //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                option.data[i].HQty = HQty;
+                                option.data[i].HPrice = HPrice;
+                                option.data[i].HTaxRate = HTaxRate * 100;
+                                option.data[i].HTaxPrice = HTaxPrice;
+                                option.data[i].HMoney = HMoney;
+                                option.data[i].HlineTotal = HlineTotal;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                        }
+
+                        //鍗曚环
+                        if (obj.event == "HPrice") {
+                            var oldText = table.cache["mainTable"][rowIndex].HPrice;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍煎紡鏍¢獙
+                            temp = value + "";
+                            if ($("#HBillSubType").val() == "0") {
+                                if (!ref.test(temp) || temp == 0) {
+                                    //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                    option.data[rowIndex].HPrice = oldText;
+                                    table.render(option);
+
+                                    //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                    setSelectHisStockGoodsByTableRender();
+
+                                    layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                                    return;
+                                }
+                            } else if ($("#HBillSubType").val() == "1") {
+                                if (!ref.test(temp)) {
+                                    //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                    option.data[rowIndex].HPrice = oldText;
+                                    table.render(option);
+
+                                    //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                    setSelectHisStockGoodsByTableRender();
+
+                                    layer.msg("鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                    return;
+                                }
+                            } else {
+                                if (!ref.test(temp)) {
+                                    //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                    option.data[rowIndex].HPrice = oldText;
+                                    table.render(option);
+
+                                    //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                    setSelectHisStockGoodsByTableRender();
+
+                                    layer.msg("鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                    return;
+                                }
+                            }
+
+                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                var HQty = option.data[i].HQty * 1;                           //鏁伴噺
+                                var HPrice = value * 1;               //鍗曚环
+                                var HTaxRate = option.data[i].HTaxRate * 0.01;           //绋庣巼
+                                /*var HDiscountRate = option.data[i].HDiscountRate * 1; //鎶樻墸鐜�*/
+                                var HTaxPrice = HPrice * (1 + HTaxRate);        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+                                //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+                                var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                var HTaxMoney = HMoney * HTaxRate;              //绋庨=閲戦*绋庣巼
+                                var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+
+                                //璁剧疆鏁版嵁灏忔暟浣嶆暟
+                                HQty = dealDoubleToFixed(HQty, 1);
+                                HPrice = dealDoubleToFixed(HPrice, 3);
+                                HTaxRate = HTaxRate;
+                                HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+                                HMoney = dealDoubleToFixed(HMoney, 2);
+                                HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
+                                //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                option.data[i].HQty = HQty;
+                                option.data[i].HPrice = HPrice;
+                                option.data[i].HTaxRate = HTaxRate * 100;
+                                option.data[i].HTaxPrice = HTaxPrice;
+                                option.data[i].HMoney = HMoney;
+                                option.data[i].HlineTotal = HlineTotal;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                        }
+
+                        //绋庣巼
+                        if (obj.event == "HTaxRate") {
+                            var oldText = table.cache["mainTable"][rowIndex].HTaxRate;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍煎紡鏍¢獙
+                            temp = value + "";
+                            if (!ref.test(temp)) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                option.data[rowIndex].HTaxRate = oldText;
+                                table.render(option);
+
+                                //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                setSelectHisStockGoodsByTableRender();
+
+                                layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                return;
+                            }
+
+
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                var HQty = option.data[i].HQty * 1;                           //鏁伴噺
+                                var HPrice = option.data[i].HPrice * 1;               //鍗曚环
+                                var HTaxRate = value * 1 * 0.01;           //绋庣巼
+                                /*var HDiscountRate = option.data[i].HDiscountRate * 1; //鎶樻墸鐜�*/
+                                var HTaxPrice = HPrice * (1 + HTaxRate);        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+                                //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+                                var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                var HTaxMoney = HMoney * HTaxRate;              //绋庨=閲戦*绋庣巼
+                                var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+
+                                //璁剧疆鏁版嵁灏忔暟浣嶆暟
+                                HQty = dealDoubleToFixed(HQty, 1);
+                                HPrice = dealDoubleToFixed(HPrice, 3);
+                                HTaxRate = HTaxRate;
+                                HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+                                HMoney = dealDoubleToFixed(HMoney, 2);
+                                HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
+                                //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                option.data[i].HQty = HQty;
+                                option.data[i].HPrice = HPrice;
+                                option.data[i].HTaxRate = HTaxRate * 100;
+                                option.data[i].HTaxPrice = HTaxPrice;
+                                option.data[i].HMoney = HMoney;
+                                option.data[i].HlineTotal = HlineTotal;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                        }
+
+                        //鍚◣鍗曚环
+                        if (obj.event == "HTaxPrice") {
+                            var oldText = table.cache["mainTable"][rowIndex].HTaxPrice;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍煎紡鏍¢獙
+                            temp = value + "";
+                            if ($("#HBillSubType").val() == "0") {
+                                if (!ref.test(temp) || temp == 0) {
+                                    //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                    option.data[rowIndex].HTaxPrice = oldText;
+                                    table.render(option);
+
+                                    //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                    setSelectHisStockGoodsByTableRender();
+
+                                    layer.msg("鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                                    return;
+                                }
+                            } else if ($("#HBillSubType").val() == "1") {
+                                if (!ref.test(temp)) {
+                                    //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                    option.data[rowIndex].HTaxPrice = oldText;
+                                    table.render(option);
+
+                                    //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                    setSelectHisStockGoodsByTableRender();
+
+                                    layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                    return;
+                                }
+                            } else {
+                                if (!ref.test(temp)) {
+                                    //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                    option.data[rowIndex].HTaxPrice = oldText;
+                                    table.render(option);
+
+                                    //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                                    setSelectHisStockGoodsByTableRender();
+
+                                    layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                                    return;
+                                }
+                            }
+
+                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                var HQty = option.data[i].HQty * 1;                           //鏁伴噺
+                                var HTaxRate = option.data[i].HTaxRate * 0.01;           //绋庣巼
+                                /*var HDiscountRate = option.data[i].HDiscountRate * 1; //鎶樻墸鐜�*/
+                                var HTaxPrice = value * 1;;        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                var HPrice = HTaxPrice / (1 + HTaxRate);        //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
+
+                                /*var HRelTaxPrice = HTaxPrice * HDiscountRate;   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+                                //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+                                var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                var HTaxMoney = HMoney * HTaxRate;              //绋庨=閲戦*绋庣巼
+                                var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+
+                                //璁剧疆鏁版嵁灏忔暟浣嶆暟
+                                HQty = dealDoubleToFixed(HQty, 1);
+                                HPrice = dealDoubleToFixed(HPrice, 3);
+                                HTaxRate = HTaxRate;
+                                HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+                                HMoney = dealDoubleToFixed(HMoney, 2);
+                                HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
+                                //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                option.data[i].HQty = HQty;
+                                option.data[i].HPrice = HPrice;
+                                option.data[i].HTaxRate = HTaxRate * 100;
+                                option.data[i].HTaxPrice = HTaxPrice;
+                                option.data[i].HMoney = HMoney;
+                                option.data[i].HlineTotal = HlineTotal;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                        }
+
+                        //澶囨敞
+                        if (obj.event == "HRemark") {
+                            var oldText = table.cache["mainTable"][rowIndex].HRemark;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                option.data[i].HRemark = value;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
                         }
 
                         obj.event = "";
                         return false;
                     }
+
+                    //#endregion
                 })
             }
             //#endregion
@@ -2143,7 +3120,7 @@
                     success: function (data1) {
                         if (data1.data.length != 0) {
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID","璁㈠崟绛夌骇浠g爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID","璁㈠崟绛夌骇浠g爜","閿�鍞嚭搴撴暟閲�","閿�鍞嚭搴撳鏍告暟閲�","閿�鍞嚭搴撳鏍搁噾棰�","鐢熶骇鏁伴噺","閿�鍞��搴撴暟閲�","閿�鍞��搴撳鏍告暟閲�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
                             //titleData = [];
 
                             dataCol = data1.data[0].HGridString.split(',');
@@ -2308,12 +3285,117 @@
             //#endregion
 
             //#region 璁剧疆琛ㄥご鎵�闇�閲戦
-            function set_HBillMoney() {
+            function set_HBillMoney(HEarnestRate) {
                 var HBillMoney = 0;
                 for (var i = 0; i < option.data.length; i++) {
                     HBillMoney += option.data[i]["HlineTotal"] * 1;
                 }
-                $("#HBillMoney").val(HBillMoney * 0.5);
+
+
+                HEarnestRate = HEarnestRate * 0.01;
+                $("#HBillMoney").val(dealDoubleToFixed(HBillMoney * HEarnestRate, 2));
+            }
+            //#endregion
+
+            //#region 鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+            function setHEarnestRateByHisStockGoods() {
+                if (option.data.length > 0 && option.data[0]["HisStockGoods"] == "true") {
+                    var HEarnestRateList = '<option  value="0" selected="selected" >0%</option>';
+                    HEarnestRateList += '<option  value="100" >100%</option>';
+
+                    $("#HEarnestRate").empty();
+                    $("#HEarnestRate").append(HEarnestRateList);
+
+                    //var HEarnestRateListArray = ["0", "100"];
+                    //if ($.inArray(HEarnestRateTemp+"", HEarnestRateListArray) > -1) {
+                    //    $("#HEarnestRate").val(HEarnestRateTemp);
+                    //}
+                    form.render('select');
+                } else if (option.data.length > 0 && option.data[0]["HisStockGoods"] == "false") {
+                    var HEarnestRateList = '<option  value="50" selected="selected" >50%</option>';
+                    HEarnestRateList += '<option  value="100" >100%</option>';
+
+                    $("#HEarnestRate").empty();
+                    $("#HEarnestRate").append(HEarnestRateList);
+                    /*form.render('select');*/
+                    //$("#HEarnestRate").val(HEarnestRateTemp);
+                    form.render('select');
+                } else {
+                    var HEarnestRateList = '<option  value="50" selected="selected" >50%</option>';
+                    HEarnestRateList += '<option  value="100" >100%</option>';
+
+                    $("#HEarnestRate").empty();
+                    $("#HEarnestRate").append(HEarnestRateList);
+                    //form.render('select');
+                  /*  $("#HEarnestRate").val(HEarnestRateTemp);*/
+                    form.render('select');
+                }
+            }
+            //#endregion
+
+            //#region 鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+            function setHisStockGoodsByHBillSubType() {
+                if ($("#HBillSubType").val() == "0") {
+                    //璁剧疆瀛愯〃鏄惁鍙栧簱瀛樺瓧娈靛��
+                    for (var i = 1; i <= option.data.length; i++) {
+                        option.data[i - 1].HisStockGoods = "false";
+                    }
+                    //閲嶆柊娓叉煋瀛愯〃鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄥ苟璧嬪��
+                    var HisStockGoodsList = '<option value="false">鍚�</option>';
+                    HisStockGoodsList += '<option value="true">鏄�</option>';
+                    for (var i = 1; i <= option.data.length; i++) {
+                        $('#HisStockGoods' + i + '').empty();
+                        $('#HisStockGoods' + i + '').append(HisStockGoodsList);
+                        $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+                    }
+                    form.render('select');
+                } else if ($("#HBillSubType").val() == "1") {
+                    //璁剧疆瀛愯〃鏄惁鍙栧簱瀛樺瓧娈靛��
+                    for (var i = 1; i <= option.data.length; i++) {
+                        option.data[i - 1].HisStockGoods = "true";
+                    }
+                    //閲嶆柊娓叉煋瀛愯〃鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄥ苟璧嬪��
+                    var HisStockGoodsList = '<option value="true">鏄�</option>';
+                    for (var i = 1; i <= option.data.length; i++) {
+                        $('#HisStockGoods' + i + '').empty();
+                        $('#HisStockGoods' + i + '').append(HisStockGoodsList);
+                        $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+                    }
+                    form.render('select');
+                }
+            }
+            //#endregion
+
+            //#region 鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」鈥斺�旂紪杈戙�佸鍒跺垵濮嬪寲璁剧疆瀛愯〃鏄惁鍙栧簱瀛�
+            function setHisStockGoodsByHBillSubType_For_RoadBillMain() {
+                if ($("#HBillSubType").val() == "0") {
+                    //璁剧疆瀛愯〃鏄惁鍙栧簱瀛樺瓧娈靛��
+                    //for (var i = 1; i <= option.data.length; i++) {
+                    //    option.data[i - 1].HisStockGoods = "false";
+                    //}
+                    //閲嶆柊娓叉煋瀛愯〃鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄥ苟璧嬪��
+                    var HisStockGoodsList = '<option value="false">鍚�</option>';
+                    HisStockGoodsList += '<option value="true">鏄�</option>';
+                    for (var i = 1; i <= option.data.length; i++) {
+                        $('#HisStockGoods' + i + '').empty();
+                        $('#HisStockGoods' + i + '').append(HisStockGoodsList);
+                        $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+                    }
+                    form.render('select');
+                } else if ($("#HBillSubType").val() == "1") {
+                    //璁剧疆瀛愯〃鏄惁鍙栧簱瀛樺瓧娈靛��
+                    for (var i = 1; i <= option.data.length; i++) {
+                        option.data[i - 1].HisStockGoods = "true";
+                    }
+                    //閲嶆柊娓叉煋瀛愯〃鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄥ苟璧嬪��
+                    var HisStockGoodsList = '<option value="true">鏄�</option>';
+                    for (var i = 1; i <= option.data.length; i++) {
+                        $('#HisStockGoods' + i + '').empty();
+                        $('#HisStockGoods' + i + '').append(HisStockGoodsList);
+                        $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+                    }
+                    form.render('select');
+                }
             }
             //#endregion
 
@@ -2343,7 +3425,7 @@
             //#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
             function setSelectHisStockGoodsByTableRender() {
                 for (var i = 1; i <= option.data.length; i++) {
-                    $('#HisStockGoods' + i + '').find("option[value='" + option.data[i - 1].HisStockGoods + "']").attr("selected", true);
+                    $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
                 }
                 form.render('select');
             }
@@ -2359,8 +3441,10 @@
         // 鍩虹璧勬枡杩斿洖鏁版嵁
         function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
         {
-            $("#HEmpName").val(obj[0].HName);
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HEmpID").val(obj[0].HItemID);
+
+            getEmpInfoByHEmpID(obj[0].HItemID)
         }
 
         function GetHSupValue(obj)  //杩斿洖瀹㈡埛
@@ -2381,20 +3465,35 @@
 
         function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
         {
-            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
             $("#HDeptID").val(obj[0].HItemID);
         }
 
         function GetSettleStyleValue(obj)           //杩斿洖缁撶畻鏂瑰紡
         {
-            $("#HSSName").val(obj[0].HName);
+            $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
             $("#HSSID").val(obj[0].HItemID);
         }
 
         function GetSellStyleValue(obj)           //杩斿洖閿�鍞柟寮�
         {
-            $("#HSellSName").val(obj[0].HName);
+            $("#HSellSName").val(obj[0].閿�鍞柟寮忓悕绉�);
             $("#HSellSID").val(obj[0].HItemID);
+        }
+
+        function GetMaterValue(obj)           //鐗╂枡鍚嶇О
+        {
+            HDataEmp = obj[0];
+        }
+
+        function GetUnitValue(obj)           //璁¢噺鍗曚綅
+        {
+            HDataEmp = obj[0];
+        }
+
+        function GetOrderLevValue(obj)           //璁㈠崟绛夌骇鍒楄〃
+        {
+            HDataEmp = obj[0];
         }
 
         //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
@@ -2465,6 +3564,7 @@
                 type: "GET",
                 data: {
                     "HCusID": HCusID
+                    , "CurUserName": sessionStorage["HUserName"]
                 },
                 success: function (result) {
                     if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -2474,7 +3574,38 @@
                         $("#HCreditRating_Now").val(data.HCreditRating_Now == null ? 0 : data.HCreditRating_Now);
                         $("#HAvailableBalance").val(data.HAvailableBalance == null ? 0 : data.HAvailableBalance);
                     } else {
-                        layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        $("#HCusBalance").val("");
+                        $("#HCreditRating_Now").val("");
+                        $("#HAvailableBalance").val("");
+                        //layer.alert(result.Message, { icon: 5});
+                    }
+                }, error: function () {
+                    layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    $("#HCusBalance").val("");
+                    $("#HCreditRating_Now").val("");
+                    $("#HAvailableBalance").val("");
+                }
+            });
+        }
+        //#endregion
+
+        //#region 鏍规嵁鑱屽憳鑾峰彇閮ㄩ棬
+        function getEmpInfoByHEmpID(HEmpID) {
+            $.ajax({
+                url: GetWEBURL() + "/Xs_SeOrderBill/getEmpInfoByHEmpID",
+                async: false,
+                type: "GET",
+                data: {
+                    "HEmpID": HEmpID
+                },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data[0];
+
+                        $("#HDeptID").val(data.HDeptID);
+                        $("#HDeptName").val(data.HDeptName);
+                    } else {
+                        layer.alert(result.Message, { icon: 5 });
                     }
                 }, error: function () {
                     layer.alert("鍙戠敓閿欒!", { icon: 5 });
@@ -2483,6 +3614,38 @@
         }
         //#endregion
 
+        //椤圭洰浠g爜
+        function GetProjectBillValue(obj) {
+            if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
+                $("#HProjectID").val(obj[0].HInterID);
+                $("#HProjectNumber").val(obj[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+                $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+
+            } else {
+                layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+            }
+        }
+
+        //鍙屽嚮杩斿洖浠撳簱
+        function GetHWHSubValue(data) {
+            OptionData = data[0]
+        }
+
+        function GetHWHValue(obj)  //杩斿洖浠撳簱
+        {
+            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HWHID").val(obj[0].HItemID);
+            if (option.data.length > 0) {
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
+                        option.data[i]["HWHID"] = obj[0].HItemID;
+                        option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+                    }
+                }
+            }
+            layui.table.render(option);
+        }
+
         //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
         function dealDoubleToFixed(data, num) {
             //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟

--
Gitblit v1.9.1