From de7931bdf73d57ca79eeb0cd48ea3a0ea5453e0e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 26 八月 2024 09:45:21 +0800
Subject: [PATCH] 新增制程陷阱测试趋势图、PPM绩效趋势图报表模块

---
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html |  716 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 638 insertions(+), 78 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 c26c348..15c042c 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"
@@ -91,7 +91,7 @@
                                         <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="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>
@@ -145,6 +145,8 @@
                                                 </select>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">閿�鍞鍗曠被鍨�</label>
                                             <div class="layui-input-inline">
@@ -154,8 +156,6 @@
                                                 </select>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
@@ -166,7 +166,7 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">閿�鍞柟寮�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -221,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" style="display:none;">
+                                        <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>
@@ -385,6 +413,8 @@
                             <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="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><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>
@@ -426,7 +456,7 @@
                 , element = layui.element;
 
             //瀛愯〃娓叉煋鍙傛暟
-            var option = {};
+            window.option = {};
 
             //璁板綍缁勭粐鐨勫��
             var HOrgIDBar = 0;
@@ -470,14 +500,7 @@
                 set_InitGrid();
                 //鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
                 RoadBillMain(linterid);
-                //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
-                setHisStockGoodsByHBillSubType_For_RoadBillMain();
-
-                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
-                setHEarnestRateByHisStockGoods();
-
-                //璁剧疆琛ㄥご鎵�闇�閲戦
-                set_HBillMoney($("#HEarnestRate").val() * 1);
+                
 
                 //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
                 createBillNo();
@@ -495,14 +518,6 @@
                 set_InitGrid();
                 //鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
                 RoadBillMain(linterid);
-                //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
-                setHisStockGoodsByHBillSubType_For_RoadBillMain();
-
-                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
-                setHEarnestRateByHisStockGoods();
-
-                //璁剧疆琛ㄥご鎵�闇�閲戦
-                set_HBillMoney($("#HEarnestRate").val() * 1);
             }
             //#endregion
 
@@ -515,7 +530,7 @@
             //#endregion
 
             //#region 鍒楄缃細瀛愯〃1
-            //DisPlay_HideColumn();
+            DisPlay_HideColumn();
             //#endregion
             //#endregion
 
@@ -568,6 +583,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 琛ㄥご鎸夐挳瑙﹀彂浜嬩欢
@@ -625,6 +651,8 @@
                     "瑙勬牸鍨嬪彿": "",
                     "HUnitID": "0",
                     "璁¢噺鍗曚綅": "",
+                    "HWHID": "0",
+                    "浠撳簱":"",
                     "HQty": "0",
                     "HPrice": "0",
                     "HTaxPrice": "0",
@@ -639,6 +667,8 @@
                     "HisStockGoods": "false",
                     "HOutStockQty": "0",
                     "HInvoiceQty": "0",
+                    "HRemark_TL": "",
+                    "HRemark_SJG": "",
                     "HRemark": "",
                     "HCusMaterNumber": "",
                     "HCusModel": "",
@@ -676,6 +706,12 @@
                     case 'set_HideColumn':
                         get_HideColumn();
                         break;
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                 }
             });
             //#endregion
@@ -708,7 +744,10 @@
                 //鏁板�兼牸寮忔牎楠屽伐鍏�
                 var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
                 var temp = "";
-
+                var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
                 // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
                 var oldText = $(this).prev().text();
                 var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -747,13 +786,12 @@
                         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);
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HPrice.toFixed(HPriceDec));
 
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         obj.update({
@@ -764,7 +802,7 @@
                             , HMoney: HMoney
                             , HlineTotal: HlineTotal
                         });
-                        //table.render(option);
+                        table.render(option);
 
                         //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                         setSelectHisStockGoodsByTableRender();
@@ -831,13 +869,12 @@
                         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);
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HPrice.toFixed(HPriceDec));
 
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         obj.update({
@@ -848,7 +885,7 @@
                             , HMoney: HMoney
                             , HlineTotal: HlineTotal
                         });
-                        //table.render(option);
+                        table.render(option);
 
                         //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                         setSelectHisStockGoodsByTableRender();
@@ -886,13 +923,12 @@
                         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);
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HPrice.toFixed(HPriceDec));
 
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         obj.update({
@@ -903,7 +939,7 @@
                             , HMoney: HMoney
                             , HlineTotal: HlineTotal
                         });
-                        //table.render(option);
+                        table.render(option);
 
                         //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                         setSelectHisStockGoodsByTableRender();
@@ -971,13 +1007,12 @@
                         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);
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HPrice.toFixed(HPriceDec));
 
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         obj.update({
@@ -988,7 +1023,7 @@
                             , HMoney: HMoney
                             , HlineTotal: HlineTotal
                         });
-                        //table.render(option);
+                        table.render(option);
 
                         //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
                         setSelectHisStockGoodsByTableRender();
@@ -1200,7 +1235,11 @@
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
                         , { 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: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;', edit: 'text', event:"HUnitID" }//f7
+                        , { field: 'HRemark_TL', title: '鎶曟枡', width: 100, edit: 'text', event: "HRemark_TL" }
+                        , { field: 'HRemark_SJG', title: '娣卞姞宸�', width: 100, edit: 'text', event: "HRemark_SJG" }
+                        , { 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" }
@@ -1254,6 +1293,8 @@
                     "瑙勬牸鍨嬪彿": "",
                     "HUnitID": "0",
                     "璁¢噺鍗曚綅": "",
+                    "HWHID": "0",
+                    "浠撳簱":"",
                     "HQty": "0",
                     "HPrice": "0",
                     "HTaxPrice": "0",
@@ -1268,6 +1309,8 @@
                     "HisStockGoods": "false",
                     "HOutStockQty": "0",
                     "HInvoiceQty": "0",
+                    "HRemark_TL": "",
+                    "HRemark_SJG": "",
                     "HRemark": "",
                     "HCusMaterNumber": "",
                     "HCusModel": "",
@@ -1360,6 +1403,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.鍒跺崟浜�
@@ -1395,9 +1443,11 @@
                                         "瑙勬牸鍨嬪彿": 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),
+                                        "HTaxPrice": dealDoubleToFixed(result.data[i]["HTaxPrice"], 3),
                                         "HMoney": dealDoubleToFixed(result.data[i]["閲戦"],2),
                                         "HDiscountRate": result.data[i]["鎶樻墸鐜�"],
                                         "HRelTaxPrice": result.data[i]["瀹為檯鍚◣鍗曚环"],
@@ -1409,6 +1459,8 @@
                                         "HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
                                         "HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
                                         "HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
+                                        "HRemark_TL": result.data[i]["鎶曟枡"],
+                                        "HRemark_SJG": result.data[i]["娣卞姞宸�"],
                                         "HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
                                         "HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
                                         "HCusModel": result.data[i]["瀹㈡埛瑙勬牸鍨嬪彿"],
@@ -1424,20 +1476,18 @@
                             }
                             option.data = rowdata;
 
-                            //鍑哄簱鏁伴噺銆佸紑绁ㄦ暟閲忎笉鍙紪杈�
-                            //option.cols[0][22].edit = null;
-                            //option.cols[0][23].edit = null;
-
                             table.render(option);
 
                             //鑾峰彇涓存椂瀹氶噾姣斾緥
-                            HEarnestRateTemp = data.瀹氶噾姣斾緥 + "" == "0" ? "50" : data.瀹氶噾姣斾緥 + "";
+                            HEarnestRateTemp = data.瀹氶噾姣斾緥;
 
-                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
-                            setSelectHisStockGoodsByTableRender();
+                            //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+                            setHisStockGoodsByHBillSubType_For_RoadBillMain();
 
                             //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
                             setHEarnestRateByHisStockGoods();
+
+                            $("#HEarnestRate").val(data.瀹氶噾姣斾緥);
 
                             //璁剧疆琛ㄥご鎵�闇�閲戦
                             set_HBillMoney($("#HEarnestRate").val() * 1);
@@ -1489,6 +1539,7 @@
             //#endregion
 
             //#region 瀹㈡埛閫夋嫨椤甸潰
+            //#region 瀹㈡埛閫夋嫨椤甸潰
             function get_checkCus() {
                 var HEmpID = $("#HEmpID").val();
                 layer.open({
@@ -1514,6 +1565,35 @@
                     , btn2: function (index, layero) { }
                 })
             }
+            //#endregion
+
+            //#region 瀹㈡埛閫夋嫨椤甸潰-鍩虹璧勬枡
+            //function get_checkCus() {
+            //    var HEmpID = $("#HEmpID").val();
+            //    layer.open({
+            //        type: 2//寮圭獥绫诲瀷
+            //        , skin: 'layui-layer-rim' //鍔犱笂杈规
+            //        , area: ['90%', '90%']//澶у皬
+            //        , title: '瀹㈡埛鍒楄〃'//鏍囬
+            //        , shift: 2//寮瑰嚭鍔ㄧ敾
+            //        , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', '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('璇烽�夋嫨鏁版嵁');
+            //            }
+            //            getCustomerByCusID(checkStatus.data[0].HItemID);
+            //            //鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+            //            getCustomerBalance(checkStatus.data[0].HItemID);
+
+            //            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) { }
+            //    })
+            //}
+            //#endregion
             //#endregion
 
             //#region 缁撶畻鏂归�夋嫨椤甸潰
@@ -1666,6 +1746,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 淇濆瓨鏂规硶
@@ -1806,6 +1963,7 @@
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 var RowCount = 0;
                 for (var i = 0; i < option.data.length; i++) {
+
                     if (option.data[i]["HMaterID"] == "0") {
                         continue;
                     }
@@ -2046,6 +2204,8 @@
                                         "瑙勬牸鍨嬪彿": "",
                                         "HUnitID": "0",
                                         "璁¢噺鍗曚綅": "",
+                                        "HWHID": "0",
+                                        "浠撳簱": "",
                                         "HQty": "0",
                                         "HPrice": "0",
                                         "HTaxPrice": "0",
@@ -2060,6 +2220,8 @@
                                         "HisStockGoods": "false",
                                         "HOutStockQty": "0",
                                         "HInvoiceQty": "0",
+                                        "HRemark_TL": "",
+                                        "HRemark_SJG": "",
                                         "HRemark": "",
                                         "HCusMaterNumber": "",
                                         "HCusModel": "",
@@ -2105,6 +2267,8 @@
                                     "瑙勬牸鍨嬪彿": "",
                                     "HUnitID": "0",
                                     "璁¢噺鍗曚綅": "",
+                                    "HWHID": "0",
+                                    "浠撳簱": "",
                                     "HQty": "0",
                                     "HPrice": "0",
                                     "HTaxPrice": "0",
@@ -2119,6 +2283,8 @@
                                     "HisStockGoods": "false",
                                     "HOutStockQty": "0",
                                     "HInvoiceQty": "0",
+                                    "HRemark_TL": "",
+                                    "HRemark_SJG": "",
                                     "HRemark": "",
                                     "HCusMaterNumber": "",
                                     "HCusModel": "",
@@ -2407,18 +2573,18 @@
                                     var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
                                     var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
-                                    //if (checkStatus.data.length != 1) {
-                                    //    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    //}
-
                                     var rowIndex = $(obj.tr).attr("data-index") * 1;
+                                    var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                                    var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                    var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                    var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
                                     for (var i = 0; i < checkStatus.data.length; i++) {
                                         if (rowIndex + i >= option.data.length) {
                                             var NewRow = {
                                                 "HMaterID": "0", "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": "0", "璁¢噺鍗曚綅": "", "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'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": "", "HCusMaterNumber": "",
-                                                "HCusModel": "","HCusMaterName": ""
+                                                "HCusModel": "", "HCusMaterName": ""
                                             }
                                             btnAddLine(NewRow);
                                         }
@@ -2441,8 +2607,8 @@
                                         }
 
                                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                                        var HQty = option.data[rowIndex + i].HQty;                  //鏁伴噺
-                                        var HPrice = option.data[rowIndex + i].HPrice;              //鍗曚环
+                                        var HQty = option.data[rowIndex + i].HQty * 1;                  //鏁伴噺
+                                        var HPrice = option.data[rowIndex + i].HPrice * 1;              //鍗曚环
                                         var HTaxRate = value * 0.01;                                //绋庣巼
                                         /*var HDiscountRate = obj.data.HDiscountRate * 1;           //鎶樻墸鐜�*/
                                         var HTaxPrice = HPrice * (1 + HTaxRate);                    //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
@@ -2451,7 +2617,13 @@
                                         var HMoney = HQty * HPrice;                                 //閲戦=鏁伴噺*鍗曚环
                                         var HTaxMoney = HMoney * HTaxRate;                          //绋庨=閲戦*绋庣巼
                                         var HlineTotal = HMoney + HTaxMoney;                        //浠风◣鍚堣=閲戦+绋庨
-
+                                        //鏁板瓧绮惧害
+                                        HQty = Number(HQty.toFixed(HQtyDec));
+                                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
 
                                         option.data[rowIndex + i].HMaterID = resultData.HItemID;
                                         option.data[rowIndex + i].鐗╂枡浠g爜 = resultData.鐗╂枡浠g爜;
@@ -2481,6 +2653,42 @@
                                 }
                                 , end: function () {
                                     if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        var value = subHTaxRate;
+                                        //鏁板�兼牸寮忔牎楠屽伐鍏�
+                                        var ref = /^\d+(\.\d+)?$/;
+                                        //绋庣巼鏁版嵁鏍煎紡鏍¢獙锛岃嫢鏍规嵁瀹㈡埛鑾峰彇鐨勭◣鐜囦笉鍚堟硶锛屽垯浣跨敤璁板綍涓師鏈夌殑绋庣巼锛屽苟鎻愮ず
+                                        temp = value + "";
+                                        if (ref.test(temp)) {
+                                            var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                                            var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                            var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                            var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                            var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                            var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                                            var HTaxRate = value * 0.01;           //绋庣巼
+                                            var HTaxPrice = HPrice * (1 + HTaxRate);        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                            var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                            var HTaxMoney = HMoney * HTaxRate;              //绋庨=閲戦*绋庣巼
+                                            var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+
+                                            //鏁板瓧绮惧害
+                                            HQty = Number(HQty.toFixed(HQtyDec));
+                                            HPrice = Number(HPrice.toFixed(HPriceDec));
+                                            HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                            HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                                            HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+
+                                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                            obj.update({
+                                                HQty: HQty
+                                                , HPrice: HPrice
+                                                , HTaxRate: HTaxRate * 100
+                                                , HTaxPrice: HTaxPrice
+                                                , HMoney: HMoney
+                                                , HlineTotal: HlineTotal
+                                            });
+                                        }
                                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                         obj.update({
                                             "HMaterID": HDataEmp.HItemID
@@ -2505,7 +2713,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -2534,6 +2742,48 @@
                                 }
                             })
                         }
+                        //浠撳簱
+                        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 () {
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HWHID": HDataEmp.HItemID
+                                            , "浠撳簱": HDataEmp.浠撳簱鍚嶇О
+                                        })
+                                        HDataEmp = {};
+                                    }
+                                }
+                            })
+
+                        }
+
                         //璁㈠崟绛夌骇
                         if (obj.event == "HOrderLevID") {
                             layer.open({
@@ -2895,14 +3145,254 @@
                             set_HBillMoney($("#HEarnestRate").val() * 1);
                         }
 
+                        //鎶曟枡
+                        if (obj.event == "HRemark_TL") {
+                            var oldText = table.cache["mainTable"][rowIndex].HRemark_TL;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                option.data[i].HRemark_TL = value;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                        }
+
+                        //娣卞姞宸�
+                        if (obj.event == "HRemark_SJG") {
+                            var oldText = table.cache["mainTable"][rowIndex].HRemark_SJG;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                option.data[i].HRemark_SJG = value;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                        }
+
+
                         obj.event = "";
                         return false;
                     }
 
                     //#endregion
                 })
+
+                //鍙屽嚮
+                $('.layui-table-box tbody td[data-field="鐗╂枡浠g爜"]').off('dblclick').on('dblclick', function () {
+                    var HOrgID = $("#HOrgID").val();
+
+                    layer.open({
+                        type: 2
+                        , skin: "layui-layer-rim" //鍔犱笂杈规
+                        , title: "鐗╂枡鍒楄〃"  //鏍囬
+                        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                        , shift: 2 //寮瑰嚭鍔ㄧ敾
+                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                        , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.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");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                            var rowIndex = $(obj.tr).attr("data-index") * 1;
+                            var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                            var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                            var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                            var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                            for (var i = 0; i < checkStatus.data.length; i++) {
+                                if (rowIndex + i >= option.data.length) {
+                                    var NewRow = {
+                                        "HMaterID": "0", "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": "0", "璁¢噺鍗曚綅": "", "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'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": "", "HCusMaterNumber": "",
+                                        "HCusModel": "", "HCusMaterName": ""
+                                    }
+                                    btnAddLine(NewRow);
+                                }
+
+                                //鑾峰彇閫変腑鐨勭墿鏂欎俊鎭�
+                                var resultData = checkStatus.data[i];
+
+                                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                                var ref = /^\d+(\.\d+)?$/;                                  //闈炶礋鏁版鍒欒〃杈惧紡
+                                var temp = "";
+                                //鑾峰彇閫夋嫨鐗╂枡鍓嶅悗鐨勭◣鐜�
+                                var value = subHTaxRate;                                    //閫夋嫨鐗╂枡鍚庢牴鎹鎴峰緱鍒扮殑绋庣巼
+                                var oldText = option.data[rowIndex + i].HTaxRate;           //璇ヨ褰曚腑鍘熸湁鐨勭◣鐜�
+
+                                //绋庣巼鏁版嵁鏍煎紡鏍¢獙锛岃嫢鏍规嵁瀹㈡埛鑾峰彇鐨勭◣鐜囦笉鍚堟硶锛屽垯浣跨敤璁板綍涓師鏈夌殑绋庣巼锛屽苟鎻愮ず
+                                temp = value + "";
+                                if (!ref.test(temp)) {
+                                    value = oldText;
+                                    layer.msg("鑾峰彇鍒扮殑绋庣巼涓嶅悎娉曪紝宸茶嚜鍔ㄥ彉鏇翠负鍘熸湁绋庣巼!");
+                                }
+
+                                //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                var HQty = option.data[rowIndex + i].HQty * 1;                  //鏁伴噺
+                                var HPrice = option.data[rowIndex + i].HPrice * 1;              //鍗曚环
+                                var HTaxRate = value * 0.01;                                //绋庣巼
+                                /*var HDiscountRate = obj.data.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 = Number(HQty.toFixed(HQtyDec));
+                                HPrice = Number(HPrice.toFixed(HPriceDec));
+                                HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                                HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+
+                                option.data[rowIndex + i].HMaterID = resultData.HItemID;
+                                option.data[rowIndex + i].鐗╂枡浠g爜 = resultData.鐗╂枡浠g爜;
+                                option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.鐗╂枡鍚嶇О;
+                                option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.瑙勬牸鍨嬪彿;
+                                option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+                                option.data[rowIndex + i].璁¢噺鍗曚綅 = resultData.璁¢噺鍗曚綅鍚嶇О;
+
+                                option.data[rowIndex + i].HQty = HQty;
+                                option.data[rowIndex + i].HPrice = HPrice;
+                                option.data[rowIndex + i].HTaxRate = HTaxRate * 100;
+                                option.data[rowIndex + i].HTaxPrice = HTaxPrice;
+                                option.data[rowIndex + i].HMoney = HMoney;
+                                option.data[rowIndex + i].HlineTotal = HlineTotal;
+
+
+                            }
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+
+                            layer.close(index);//鍏抽棴寮圭獥
+                        }
+                        , end: function () {
+                            if (typeof (HDataEmp.HItemID) != "undefined") {
+                                var value = subHTaxRate;
+                                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                                var ref = /^\d+(\.\d+)?$/;
+                                //绋庣巼鏁版嵁鏍煎紡鏍¢獙锛岃嫢鏍规嵁瀹㈡埛鑾峰彇鐨勭◣鐜囦笉鍚堟硶锛屽垯浣跨敤璁板綍涓師鏈夌殑绋庣巼锛屽苟鎻愮ず
+                                temp = value + "";
+                                if (ref.test(temp)) {
+                                    var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                                    var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                    var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                    var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                                    //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                    var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                    var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                                    var HTaxRate = value * 0.01;           //绋庣巼
+                                    var HTaxPrice = HPrice * (1 + HTaxRate);        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                    var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                    var HTaxMoney = HMoney * HTaxRate;              //绋庨=閲戦*绋庣巼
+                                    var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+
+                                    //鏁板瓧绮惧害
+                                    HQty = Number(HQty.toFixed(HQtyDec));
+                                    HPrice = Number(HPrice.toFixed(HPriceDec));
+                                    HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                    HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                                    HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HQty: HQty
+                                        , HPrice: HPrice
+                                        , HTaxRate: HTaxRate * 100
+                                        , HTaxPrice: HTaxPrice
+                                        , HMoney: HMoney
+                                        , HlineTotal: HlineTotal
+                                    });
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "HMaterID": HDataEmp.HItemID
+                                    , "鐗╂枡浠g爜": HDataEmp.鐗╂枡浠g爜
+                                    , "鐗╂枡鍚嶇О": HDataEmp.鐗╂枡鍚嶇О
+                                    , "瑙勬牸鍨嬪彿": HDataEmp.瑙勬牸鍨嬪彿
+                                    , "HUnitID": HDataEmp.HUnitID
+                                    , "璁¢噺鍗曚綅": HDataEmp.璁¢噺鍗曚綅鍚嶇О
+                                })
+                                HDataEmp = {};
+                            }
+                        }
+                    })
+                });
             }
             //#endregion
+
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+
 
             //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
             function get_HideColumn() {
@@ -3251,6 +3741,32 @@
             }
             //#endregion
 
+            //#region 鏍规嵁鐗╂枡ID鑾峰彇绮惧害
+            function getDecByMaterID(HMaterID) {
+                var resultData = {};
+                $.ajax({  // 寮傛璇锋眰
+                    url: GetWEBURL() + "Gy_Material/getDecByID",  //璇锋眰鍦板潃
+                    async: false,   //鏄惁寮�鍚紓姝�
+                    type: "GET",   //璇锋眰绫诲瀷
+                    data: {   //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
+                        "HMaterID": HMaterID     //  灏唄materid浣滀负璇锋眰鍙傛暟鍙戦��
+                    },
+                    success: function (result) {   // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
+                        if (result.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
+                            var data = result.data; //澹版槑data鍙橀噺锛屽苟灏嗗叾璧嬪�间负result瀵硅薄涓殑data灞炴��
+                            resultData = data[0];   //灏哾ata鏁扮粍锛堟垨绫绘暟缁勫璞★級鐨勭涓�涓厓绱犺祴鍊肩粰鍙橀噺resultData
+                        }
+                        //else {
+                        //    layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); //result.msg瀵硅薄锛屾彁绀哄脊绐� 绫诲瀷涓�5锛� 鎸夐挳锛屽拰鎸夐挳鐨勫悕绉颁负閫�鍑�  鏃堕棿 涓�100绉掞紝浠ュ強鍋忕Щ閲忥紙`offset: 't'
+                        //}
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });  //鎻愮ず寮圭獥 鍙戠敓閿欒 锛岃绀烘爣蹇椾负5鐨�
+                    }
+                });
+                return resultData;
+            }
+            //#endregion
+
             //#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
             function setSelectHisStockGoodsByTableRender() {
                 for (var i = 1; i <= option.data.length; i++) {
@@ -3276,6 +3792,16 @@
             getEmpInfoByHEmpID(obj[0].HItemID)
         }
 
+        function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
+        {
+            //$("#HCusName").val(obj[0].HName);
+            //$("#HCusID").val(obj[0].HItemID);
+            //鏍规嵁瀹㈡埛鑾峰彇鐩稿叧淇℃伅
+            getCustomerByCusID(obj[0].HItemID);
+            //鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+            getCustomerBalance(obj[0].HItemID);
+        }
+
         function GetHSupValue(obj)  //杩斿洖瀹㈡埛
         {
             //$("#HCusName").val(obj[0].HName);
@@ -3288,7 +3814,7 @@
 
         function GetHManagerValue(obj)  //杩斿洖涓荤
         {
-            $("#HManagerName").val(obj[0].HName);
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HManagerID").val(obj[0].HItemID);
         }
 
@@ -3310,12 +3836,12 @@
             $("#HSellSID").val(obj[0].HItemID);
         }
 
-        function GetMaterValue(obj)           //鐗╂枡鍚嶇О
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
         {
-            HDataEmp = obj[0];
+            HDataEmp = obj;
         }
 
-        function GetUnitValue(obj)           //璁¢噺鍗曚綅
+        function GetAuxiliaryUnitValue(obj)           //璁¢噺鍗曚綅
         {
             HDataEmp = obj[0];
         }
@@ -3324,6 +3850,39 @@
         {
             HDataEmp = obj[0];
         }
+
+        //椤圭洰浠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) {
+            HDataEmp = 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 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
         function getCustomerByCusID(HCusID) {
@@ -3376,7 +3935,7 @@
                         subHTaxRate = data.HTaxRate;
 
                     } else {
-                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                     }
                 }, error: function () {
                     layer.alert("鍙戠敓閿欒!", { icon: 5 });
@@ -3443,6 +4002,7 @@
         }
         //#endregion
 
+       
         //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
         function dealDoubleToFixed(data, num) {
             //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟

--
Gitblit v1.9.1