From df3e719955cc93b4e762ac75fbb61737fbf3b7a8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 六月 2025 08:38:12 +0800
Subject: [PATCH] 1

---
 WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 1316 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 781 insertions(+), 535 deletions(-)

diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 927fd4b..f7b4108 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -47,6 +47,7 @@
                         <div class="layui-btn-group">
                             <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                         </div>
                     </div>
@@ -65,7 +66,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鍗曟嵁缂栧彿</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                 <input type="hidden" name="HInterID" id="HInterID" value="0">
                                             </div>
                                         </div>
@@ -82,9 +83,9 @@
                                                     <!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
                                                 </select>
                                                 <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
-                            <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
-                            <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
-                        </select>-->
+                    <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
+                    <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
+                </select>-->
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -101,7 +102,6 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-
                                         <div class="layui-inline">
                                             <label class="layui-form-label">閿�鍞儴闂�</label>
                                             <div class="layui-input-inline">
@@ -128,17 +128,27 @@
                                                 <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
-                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-            </button>-->
+                    <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">
                                                 <select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
-                                                    <option value="鎴愭湰浠�" selected="selected">鎴愭湰浠�</option>
-                                                    <option value="缁撶畻浠�">缁撶畻浠�</option>
+                                                    <option value="鍘荤◣浠�">鍘荤◣浠�</option>
+                                                    <option value="缁撶畻浠�" selected="selected">缁撶畻浠�</option>
+                                                    <option value="鍚◣浠�">鍚◣浠�</option>
                                                 </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">椤圭洰鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HProjectName" id="HProjectName" class="layui-input" lay-filter="HProjectName" value="" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float:left;width:150px;">
                                             </div>
                                         </div>
                                     </div>
@@ -150,7 +160,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    
+
 
                                     <!--闅愯棌瀛楁-->
                                     <div class="layui-row" style="display:none;">
@@ -176,7 +186,7 @@
                                 </div>
                             </div>
 
-                            <!--鍩烘湰淇℃伅-->
+                            <!--鍏跺畠淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                     
@@ -389,7 +399,7 @@
             window.OptionData = [];
             //璁板綍缁勭粐鐨勫��
             var HOrgIDBar = 0;
-
+            var topScroll = 0;//璁板綍婊氬姩鏉$殑浣嶇疆
 
         //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1426";
@@ -483,6 +493,12 @@
             });
             //#endregion
 
+            //#region 閫夋暣鍗�
+            form.on('submit(set_SelectMainBill)', function (data) {
+                set_SelectMainBill();
+            });
+            //#endregion
+
             //#region 淇濆瓨鎸夐挳
             form.on('submit(Saver)', function (data) {
                 //#region 鍒ゆ柇婧愬崟鐘舵��
@@ -536,9 +552,9 @@
                 }
                 //#endregion
 
-                //if (AllowLoadData(data)) {
+                if (AllowLoadData(data)) {
                     set_SaveBill(data);
-                //}
+                }
             });
             //#endregion
             //#endregion
@@ -600,6 +616,7 @@
                     var url;
                     //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
                     if (HSourceBillNo == "") {
+                        layer.close(ajaxLoad);
                         return;
                     }
                     if ($("#BillType").val() == "1401") {
@@ -638,114 +655,62 @@
                                         , "HSSName": dataArray[0].缁撶畻鏂瑰紡
                                         , "HSellSID": dataArray[0].HSellSID
                                         , "HSellSName": dataArray[0].閿�鍞柟寮�
+                                        , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+                                        , "HProjectName": (dataArray[0].椤圭洰鍚嶇О)
                                     });
-
-                                    if ($("#HPriceType").val() == "鎴愭湰浠�") {
-                                        //瀛愯〃鎴愭湰浠稥ntry  璧嬪��
-                                        var rowdataEntry = [];
-                                        for (var i = 0; i < dataArray.length; i++) {
-                                            var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;                           //鏁伴噺
-                                            var HPrice = dataArray[i].HNoTaxCost;               //鎴愭湰浠�
-                                            var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
-                                            var HTaxRate = dataArray[i].绋庣巼 * 0.01;           //绋庣巼
-                                            var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
-                                            var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
-                                            var HExRate = $("#HExRate").val();                      //姹囩巼
-                                            var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
-                                            var HMoneyBB = HMoney * HExRate;
-                                            rowdataEntry.push(
-                                                {
-                                                    "HMaterID": dataArray[i].HMaterID
-                                                    , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                                                    , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                                                    , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                                    , "HUnitID": dataArray[i].HUnitID
-                                                    , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                                    , "HQty": dealDoubleToFixed(HQty, 1)
-                                                    , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
-                                                    , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
-                                                    , 'HDiscountRate': "0"                                                     //
-                                                    , 'HRelTaxPrice': "0"
-                                                    , "HTaxRate": dataArray[i].绋庣巼
-                                                    , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2)                                                         //
-                                                    , "HMoney": dealDoubleToFixed(HMoney, 2)
-                                                    , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
-                                                    , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
-                                                    , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
-                                                    , "HRemark": ""
-
-                                                    , "HSourceInterID": dataArray[i].hmainid
-                                                    , "HSourceEntryID": dataArray[i].hsubid
-                                                    , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                                                    , "HSourceBillType": dataArray[i].HBillType
-                                                    , "HRelationQty": "0"
-                                                    , "HRelationMoney": "0"
-
-                                                    , 'HPOOrderInterID': "0"
-                                                    , 'HPOOrderEntryID': "0"
-                                                    , 'HPOOrderBillNo': ""
-
-                                                    , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                                    , "HSeOrderInterID": dataArray[i].hmainid
-                                                    , "HSeOrderEntryID": dataArray[i].hsubid
-                                                    , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
-                                                }
-                                            );
-                                        }
-                                    } else {
                                         //瀛愯〃Entry  璧嬪��
-                                        var rowdataEntry = [];
-                                        for (var i = 0; i < dataArray.length; i++) {
-                                            var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;                           //鏁伴噺
-                                            var HPrice = dataArray[i].鍗曚环;               //鍗曚环
-                                            var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
-                                            var HTaxRate = dataArray[i].绋庣巼 * 0.01;           //绋庣巼
-                                            var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
-                                            var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
-                                            var HExRate = $("#HExRate").val();                      //姹囩巼
-                                            var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
-                                            var HMoneyBB = HMoney * HExRate;
-                                            rowdataEntry.push(
-                                                {
-                                                    "HMaterID": dataArray[i].HMaterID
-                                                    , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                                                    , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                                                    , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                                    , "HUnitID": dataArray[i].HUnitID
-                                                    , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                                    , "HQty": dealDoubleToFixed(HQty, 1)
-                                                    , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
-                                                    , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                                    , 'HDiscountRate': "0"                                                     //
-                                                    , 'HRelTaxPrice': "0"
-                                                    , "HTaxRate": dataArray[i].绋庣巼
-                                                    , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2)                                                         //
-                                                    , "HMoney": dealDoubleToFixed(HMoney, 2)
-                                                    , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
-                                                    , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
-                                                    , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
-                                                    , "HRemark": ""
+                                    var rowdataEntry = [];
+                                    for (var i = 0; i < dataArray.length; i++) {
+                                        var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;                           //鏁伴噺
+                                        var HPrice = dataArray[i].鍗曚环;               //鍗曚环
+                                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                        var HTaxRate = dataArray[i].绋庣巼 * 0.01;           //绋庣巼
+                                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                                        var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+                                        var HExRate = $("#HExRate").val();                      //姹囩巼
+                                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+                                        var HMoneyBB = HMoney * HExRate;
+                                        rowdataEntry.push(
+                                            {
+                                                "HMaterID": dataArray[i].HMaterID
+                                                , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                                                , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                                                , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                                                , "HUnitID": dataArray[i].HUnitID
+                                                , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                                                , "HQty": dealDoubleToFixed(HQty, 1)
+                                                , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                                                , 'HDiscountRate': "1"                                                     //
+                                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                                                , "HTaxRate": dataArray[i].绋庣巼
+                                                , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2)                                                         //
+                                                , "HMoney": dealDoubleToFixed(HMoney, 2)
+                                                , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+                                                , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+                                                , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+                                                , "HRemark": ""
 
-                                                    , "HSourceInterID": dataArray[i].hmainid
-                                                    , "HSourceEntryID": dataArray[i].hsubid
-                                                    , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                                                    , "HSourceBillType": dataArray[i].HBillType
-                                                    , "HRelationQty": "0"
-                                                    , "HRelationMoney": "0"
+                                                , "HSourceInterID": dataArray[i].hmainid
+                                                , "HSourceEntryID": dataArray[i].hsubid
+                                                , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                                                , "HSourceBillType": dataArray[i].HBillType
+                                                , "HRelationQty": "0"
+                                                , "HRelationMoney": "0"
 
-                                                    , 'HPOOrderInterID': "0"
-                                                    , 'HPOOrderEntryID': "0"
-                                                    , 'HPOOrderBillNo': ""
+                                                , 'HPOOrderInterID': "0"
+                                                , 'HPOOrderEntryID': "0"
+                                                , 'HPOOrderBillNo': ""
 
-                                                    , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                                    , "HSeOrderInterID": dataArray[i].hmainid
-                                                    , "HSeOrderEntryID": dataArray[i].hsubid
-                                                    , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
-                                                }
-                                            );
-                                        }
+                                                , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                                                , "HSeOrderInterID": dataArray[i].hmainid
+                                                , "HSeOrderEntryID": dataArray[i].hsubid
+                                                , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+                                            }
+                                        );
                                     }
-                                    optionEntry.data = rowdataEntry;
+                                    
+                                    optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
                                     table.render(optionEntry);
                                     //瀛愯〃姹囨��
                                     for (var i = 0; i < rowdataEntry.length; i++) {
@@ -777,11 +742,11 @@
 
                                         , "HDeptID": dataArray[0].HDeptID
                                         , "HDeptName": dataArray[0].閮ㄩ棬
-                                        , "HMangerID": dataArray[0].hmanagerid
+                                        , "HMangerID": dataArray[0].HManagerID
                                         , "HMangerName": dataArray[0].涓荤
                                         , "HEmpID": dataArray[0].HEmpID
                                         , "HEmpName": dataArray[0].涓氬姟鍛�
-                                        , "HCusID": dataArray[0].hsupid
+                                        , "HCusID": dataArray[0].HSupID
                                         , "HCusName": dataArray[0].瀹㈡埛
                                         , "HCurID": dataArray[0].HCurID
                                         , "HCurName": dataArray[0].甯佸埆
@@ -790,100 +755,54 @@
                                         , "HSSName": ""
                                         , "HSellSID": dataArray[0].HSellSID
                                         , "HSellSName": dataArray[0].閿�鍞柟寮�
+                                        , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                                        , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
                                     });
-                                    if ($("#HPriceType").val() == "鎴愭湰浠�") {
-                                        //瀛愯〃  璧嬪��
-                                        var rowdataEntry = [];
-                                        for (var i = 0; i < dataArray.length; i++) {
-                                            var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;                           //鏁伴噺
-                                            
-                                            rowdataEntry.push(
-                                                {
-                                                    "HMaterID": dataArray[i].hmaterid
-                                                    , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                                                    , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                                                    , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                                    , "HUnitID": dataArray[i].hunitid
-                                                    , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                                    , "HQty": dealDoubleToFixed(HQty, 1)
-                                                    , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
-                                                    , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                                    , 'HDiscountRate': "0"                                                     //
-                                                    , 'HRelTaxPrice': "0"
-                                                    , "HTaxRate": dataArray[i].绋庣巼
-                                                    , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2)                                                         //
-                                                    , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
-                                                    , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
-                                                    , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
-                                                    , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
-                                                    , "HRemark": ""
+                                    //瀛愯〃  璧嬪��
+                                    var rowdataEntry = [];
+                                    for (var i = 0; i < dataArray.length; i++) {
+                                        var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;                           //鏁伴噺
+                                        rowdataEntry.push(
+                                            {
+                                                "HMaterID": dataArray[i].HMaterID
+                                                , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                                                , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                                                , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                                                , "HUnitID": dataArray[i].HUnitID
+                                                , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                                                , "HQty": dealDoubleToFixed(HQty, 1)
+                                                , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                                , 'HDiscountRate': "1"                                                     //
+                                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                                , "HTaxRate": dataArray[i].绋庣巼
+                                                , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2)                                                         //
+                                                , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+                                                , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+                                                , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+                                                , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+                                                , "HRemark": ""
 
-                                                    , "HSourceInterID": dataArray[i].hmainid
-                                                    , "HSourceEntryID": dataArray[i].hsubid
-                                                    , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                                                    , "HSourceBillType": dataArray[i].HBillType
-                                                    , "HRelationQty": "0"
-                                                    , "HRelationMoney": "0"
+                                                , "HSourceInterID": dataArray[i].hmainid
+                                                , "HSourceEntryID": dataArray[i].hsubid
+                                                , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                                                , "HSourceBillType": dataArray[i].HBillType
+                                                , "HRelationQty": "0"
+                                                , "HRelationMoney": "0"
 
-                                                    , 'HPOOrderInterID': "0"
-                                                    , 'HPOOrderEntryID': "0"
-                                                    , 'HPOOrderBillNo': ""
+                                                , 'HPOOrderInterID': "0"
+                                                , 'HPOOrderEntryID': "0"
+                                                , 'HPOOrderBillNo': ""
 
-                                                    , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                                    , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
-                                                    , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
-                                                    , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
-                                                }
-                                            );
-                                        }
+                                                , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                                , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+                                                , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+                                                , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+                                            }
+                                        );
                                     }
-                                    else {
-                                        //瀛愯〃  璧嬪��
-                                        var rowdataEntry = [];
-                                        for (var i = 0; i < dataArray.length; i++) {
-                                            var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;                           //鏁伴噺
-                                            rowdataEntry.push(
-                                                {
-                                                    "HMaterID": dataArray[i].hmaterid
-                                                    , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                                                    , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                                                    , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                                    , "HUnitID": dataArray[i].hunitid
-                                                    , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                                    , "HQty": dealDoubleToFixed(HQty, 1)
-                                                    , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
-                                                    , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                                    , 'HDiscountRate': "0"                                                     //
-                                                    , 'HRelTaxPrice': "0"
-                                                    , "HTaxRate": dataArray[i].绋庣巼
-                                                    , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2)                                                         //
-                                                    , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
-                                                    , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
-                                                    , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
-                                                    , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
-                                                    , "HRemark": ""
-
-                                                    , "HSourceInterID": dataArray[i].hmainid
-                                                    , "HSourceEntryID": dataArray[i].hsubid
-                                                    , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                                                    , "HSourceBillType": dataArray[i].HBillType
-                                                    , "HRelationQty": "0"
-                                                    , "HRelationMoney": "0"
-
-                                                    , 'HPOOrderInterID': "0"
-                                                    , 'HPOOrderEntryID': "0"
-                                                    , 'HPOOrderBillNo': ""
-
-                                                    , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                                    , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
-                                                    , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
-                                                    , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
-                                                }
-                                            );
-                                        }
-                                    }
-
-                                    optionEntry.data = rowdataEntry;
+                                    
+                                    optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
                                     table.render(optionEntry);
                                     //瀛愯〃姹囨��
                                     for (var i = 0; i < rowdataEntry.length; i++) {
@@ -908,6 +827,7 @@
 
                                 }
                                 table.render(option);
+                                changeHPrice();
                                 layer.close(ajaxLoad);
                                 layer.msg("鏌ヨ鎴愬姛", { time: 1 * 1000, icon: 1 });
                             } else {
@@ -946,7 +866,7 @@
                     , "HQty": "0"
                     , "HPrice": "0"
                     , "HTaxPrice": "0"
-                    , 'HDiscountRate': "0"
+                    , 'HDiscountRate': "1"
                     , 'HRelTaxPrice': "0"
                     , "HTaxRate": "0"
                     , 'HTaxMoney': "0"
@@ -1014,11 +934,13 @@
             table.on('edit(mainTable)', function (obj) {
                 //鏁板�兼牸寮忔牎楠屽伐鍏�
                 var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var ref1 = /^-?\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"];  //閲戦绮惧害
+                topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//鑾峰彇婊氬姩鏉′綅缃�
                 // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
                 var oldText = $(this).prev().text();
                 var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -1030,14 +952,23 @@
                     case "HQty":                                                       //鏁伴噺
                         //鏁版嵁鏍煎紡鏍¢獙
                         temp = value + "";
-                        if (!ref.test(temp) || temp == 0) {
+                        if (!ref1.test(temp)) {
                             //鎭㈠鏁版嵁鍒扮紪杈戝墠
                             obj.update({
                                 HQty: oldText
                             });
                             table.render(option);
 
-                            layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            layer.msg("鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛�!");
+                            return;
+                        } else if (temp * 1 == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HQty: oldText
+                            });
+                            table.render(option);
+
+                            layer.msg("鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛�!");
                             return;
                         }
 
@@ -1229,6 +1160,7 @@
                             , HDiscountRate: HDiscountRate                  //鏇存柊HDiscountRate瀛楁锛屽叾鍊兼潵鑷彉閲廐DiscountRate
                             , HRelTaxPrice: HRelTaxPrice                  //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
                         });
+                        table.render(option);
                         break;
                     case "HTaxPrice":                                                       //鍚◣鍗曚环
                         //鏁版嵁鏍煎紡鏍¢獙
@@ -1282,10 +1214,130 @@
                         });
                         table.render(option)
                         break;
+                    case "HMoney":                                                       //閲戦
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0 || obj.data.HQty == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HMoney: oldText
+                            });
+                            table.render(option);
+
+                            layer.msg("鏁伴噺鎴栭噾棰濊杈撳叆澶т簬0鐨勬暟瀛�!");
+                            return;
+                        }
+
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HMoney = value * 1;                     //閲戦=鏁伴噺*鍗曚环
+                        var HPrice = HMoney / HQty;                //鍗曚环
+                        var HTaxRate = obj.data.HTaxRate * 0.01;           //绋庣巼
+                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                        var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+                        var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                        var HDiscountRate = obj.data.HDiscountRate * 1;   //鎶樻墸鐜�
+                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+                        var HExRate = $("#HExRate").val();                      //姹囩巼
+                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+                        var HMoneyBB = HMoney * HExRate;
+
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
+                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty                          //鏇存柊HQty瀛楁锛孒Qty
+                            , HPrice: HPrice                     //鏇存柊HPrice瀛楁锛孒Price
+                            , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                            , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                            , HlineTotal: HlineTotal             //鏇存柊HlineTotal瀛楁锛孒lineTotal
+                            , HTaxPrice, HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                            , HRelTaxPrice: HRelTaxPrice            //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+                            , HlineTotalBB: HlineTotalBB              //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+                            , HMoneyBB: HMoneyBB
+                        });
+                        table.render(option);
+                        break;
                     default:
                 }
             });
             //#endregion
+
+            //#region 涓嬫媺妗嗕簨浠�
+            // 鐩戝惉涓嬫媺妗嗛�夋嫨  
+            form.on('select(HPriceType)', function (data) {
+                console.log(data.value); // 寰楀埌琚�変腑鐨勫��  
+                changeHPrice();
+            });
+            //鏍规嵁涓嬫媺妗嗙殑鍊艰缃墿鏂欏崟浠风瓑淇℃伅
+            function changeHPrice() {
+                //#region 瀛愯〃 鏁版嵁妫�楠�
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HMaterID"] == "0" || option.data[i]["HMaterID"] == "" || option.data[i]["HMaterID"] == undefined) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
+                        return false;
+                    } else {
+                        var HPrice = option.data[i]["HPrice"];
+                        var HMaterID = option.data[i]["HMaterID"];
+                        var HType = $("#HPriceType").val();
+                        //鑾峰彇鐗╂枡瀵瑰簲鍗曚环绫诲瀷鐨勫崟浠�
+                        $.ajax({
+                            url: GetWEBURL() + "/Xs_ReceivableBill/getPriceByType",
+                            type: "GET",
+                            async: false,
+                            data: { "HMaterID": HMaterID, HType: HType },
+                            success: function (d) {
+                                HPrice = Number(d.data);
+                            }, error: function () {
+                                layer.alert("鍙戠敓閿欒!" + d.Message, { icon: 5 });
+                            }
+                        });
+                        var Dec = getDecByMaterID(option.data[i]["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 HTaxRate = option.data[i]["HTaxRate"] * 0.01;
+                        var HExRate = $("#HExRate").val();                      //姹囩巼
+                        var HQty = option.data[i]["HQty"] * 1;                           //鏁伴噺
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                        var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+                        var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+                        var HDiscountRate = option.data[i]["HDiscountRate"] * 1;   //鎶樻墸鐜�
+                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+                        var HExRate = $("#HExRate").val();                      //姹囩巼
+                        var HMoneyBB = HMoney * HExRate;
+                        ///鏁板瓧绮惧害
+                        option.data[i]["HQty"] = Number(HQty.toFixed(HQtyDec));
+                        option.data[i]["HPrice"] = Number(HPrice.toFixed(HPriceDec));
+                        option.data[i]["HMoney"] = Number(HMoney.toFixed(HMoneyDec));
+                        option.data[i]["HTaxMoney"] = Number(HTaxMoney.toFixed(HMoneyDec));
+                        option.data[i]["HMoneyBB"] = Number(HMoneyBB.toFixed(HMoneyDec));
+                        option.data[i]["HlineTotal"] = Number(HlineTotal.toFixed(HMoneyDec));
+                        option.data[i]["HTaxPrice"] = Number(HTaxPrice.toFixed(HPriceDec));
+                        option.data[i]["HRelTaxPrice"] = Number(HRelTaxPrice.toFixed(HPriceDec));
+                        option.data[i]["HlineTotalBB"] = Number(HlineTotalBB.toFixed(HMoneyDec));
+                    }
+
+                }
+                table.render(option);
+                //#endregion
+            }
+
+            //#endregion
+            
             //#endregion
 
             //#endregion
@@ -1620,13 +1672,318 @@
                         {
                             setInitBySellOutBill(checkStatus);
                         }
-
+                        changeHPrice();
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
                 })
             }
             //#endregion
+
+
+            //#region 閫夋暣鍗�
+            function set_SelectMainBill() {
+                var url;
+                if ($("#BillType").val() == "1401") {
+                    url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+                    HSourceBillName = "閿�鍞鍗�";
+                }
+                else if ($("#BillType").val() == "1205") {
+                    url = "../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillQuery.html?openType=2&HOrgID=" + HOrgID;
+                    HSourceBillName = "閿�鍞嚭搴撳崟";
+                }
+                else {
+                    return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+                }
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: '' + '婧愬崟' + '鍒楄〃'  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [url, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length == 0) {
+                            return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+                        }
+                        var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+                        if (HCusID == 0 || HCusID == '') {
+                            HCusID = checkStatus.data[0]["HCusID"];
+                        }
+                        //鑾峰彇璁剧疆鏉′欢
+                        var sMainWhere = " and hmainid in(";
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i]["HCusID"] != HCusID) {
+                                layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+                                layer.close(index);//鍏抽棴寮圭獥
+                                return;
+                            }
+                            sMainWhere += checkStatus.data[i]["hmainid"]
+                            if (i != checkStatus.data.length - 1) {
+                                sMainWhere += ",";
+                            } else {
+                                sMainWhere += ") ";
+                            }
+                        }
+                        getSeletMainInfo(sMainWhere);
+                        changeHPrice();
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+            function getSeletMainInfo(sMainWhere) {
+                var ajaxLoad = layer.load();
+                if ($("#BillType").val() == "1401") {
+                    $.ajax({
+                        url: GetWEBURL() + '/Xs_SeOrderBill/list',
+                        async: false,
+                        type: "GET",
+                        data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                var dataArray = data1.data;
+                                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    "HMainSourceInterID": "0"
+                                    , "HMainSourceEntryID": "0"
+                                    /*, "HMainSourceBillNo": ""*/
+                                    , "HMainSourceBillType": $("#BillType").val()
+
+                                    , "HDeptID": dataArray[0].HDeptID
+                                    , "HDeptName": dataArray[0].閮ㄩ棬
+                                    , "HMangerID": dataArray[0].HManagerID
+                                    , "HMangerName": dataArray[0].涓荤
+                                    , "HEmpID": dataArray[0].HEmpID
+                                    , "HEmpName": dataArray[0].涓氬姟鍛�
+                                    , "HCusID": dataArray[0].HCusID
+                                    , "HCusName": dataArray[0].瀹㈡埛
+                                    , "HCurID": dataArray[0].HCurID
+                                    , "HCurName": dataArray[0].甯佸埆
+                                    , "HExRate": dataArray[0].姹囩巼
+                                    , "HSSID": dataArray[0].HSSID
+                                    , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+                                    , "HSellSID": dataArray[0].HSellSID
+                                    , "HSellSName": dataArray[0].閿�鍞柟寮�
+                                    
+                                    , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                                    , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+                                });
+                                //瀛愯〃Entry  璧嬪��
+                                var rowdataEntry = [];
+                                for (var i = 0; i < dataArray.length; i++) {
+                                    var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;                           //鏁伴噺
+                                    var HPrice = dataArray[i].鍗曚环;               //鍗曚环
+                                    var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                    var HTaxRate = dataArray[i].绋庣巼 * 0.01;           //绋庣巼
+                                    var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                                    var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+                                    var HExRate = $("#HExRate").val();                      //姹囩巼
+                                    var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+                                    var HMoneyBB = HMoney * HExRate;
+                                    rowdataEntry.push(
+                                        {
+                                            "HMaterID": dataArray[i].HMaterID
+                                            , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                                            , "HUnitID": dataArray[i].HUnitID
+                                            , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                                            , "HQty": dealDoubleToFixed(HQty, 1)
+                                            , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                                            , 'HDiscountRate': "1"                                                     //
+                                            , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                                            , "HTaxRate": dataArray[i].绋庣巼
+                                            , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2)                                                         //
+                                            , "HMoney": dealDoubleToFixed(HMoney, 2)
+                                            , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+                                            , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+                                            , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+                                            , "HRemark": ""
+
+                                            , "HSourceInterID": dataArray[i].hmainid
+                                            , "HSourceEntryID": dataArray[i].hsubid
+                                            , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                                            , "HSourceBillType": dataArray[i].HBillType
+                                            , "HRelationQty": "0"
+                                            , "HRelationMoney": "0"
+
+                                            , 'HPOOrderInterID': "0"
+                                            , 'HPOOrderEntryID': "0"
+                                            , 'HPOOrderBillNo': ""
+
+                                            , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                                            , "HSeOrderInterID": dataArray[i].hmainid
+                                            , "HSeOrderEntryID": dataArray[i].hsubid
+                                            , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+                                        }
+                                    );
+                                }
+                                
+                                optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
+                                table.render(optionEntry);
+                                //瀛愯〃姹囨��
+                                for (var i = 0; i < rowdataEntry.length; i++) {
+                                    var item = rowdataEntry[i];
+                                    for (var j = i + 1; j < rowdataEntry.length; j++) {
+                                        if (rowdataEntry[j].HMaterID == item.HMaterID) {
+                                            rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+                                            rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+                                            rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+                                            rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+                                            var HExRate = $("#HExRate").val();
+                                            rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+                                            rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+                                            rowdataEntry.splice(j, 1);
+                                            j = j - 1;
+                                        }
+                                    }
+                                }
+                                set_InitGridHaveSource();
+                                option.data = rowdataEntry;
+                                haveSource = true;
+                                table.render(option);
+                                layer.close(ajaxLoad);
+                                //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            } else {
+                                layer.close(ajaxLoad);
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                                return;
+                            }
+                        }, error: function () {
+                            layer.close(ajaxLoad);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            return;
+                        }
+                    });
+                } else if ($("#BillType").val() == "1205") {
+                    $.ajax({
+                        url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
+                        type: "GET",
+                        async: false,
+                        data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                dataArray = data1.data;
+                                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    "HMainSourceInterID": "0"
+                                    , "HMainSourceEntryID": "0"
+                                    /*, "HMainSourceBillNo": ""*/
+                                    , "HMainSourceBillType": $("#BillType").val()
+
+                                    , "HDeptID": dataArray[0].HDeptID
+                                    , "HDeptName": dataArray[0].閮ㄩ棬
+                                    , "HMangerID": dataArray[0].HManagerID
+                                    , "HMangerName": dataArray[0].涓荤
+                                    , "HEmpID": dataArray[0].HEmpID
+                                    , "HEmpName": dataArray[0].涓氬姟鍛�
+                                    , "HCusID": dataArray[0].HSupID
+                                    , "HCusName": dataArray[0].瀹㈡埛
+                                    , "HCurID": dataArray[0].涓昏〃甯佸埆id
+                                    , "HCurName": dataArray[0].涓昏〃甯佸埆
+                                    , "HExRate": dataArray[0].涓昏〃姹囩巼
+                                    , "HSSID": "0"
+                                    , "HSSName": ""
+                                    , "HSellSID": dataArray[0].HSellSID
+                                    , "HSellSName": dataArray[0].閿�鍞柟寮�
+                                    , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+                                    , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                                });
+                                    //瀛愯〃  璧嬪��
+                                var rowdataEntry = [];
+                                for (var i = 0; i < dataArray.length; i++) {
+                                    var HQty = dataArray[i].鏁伴噺*1 - dataArray[i].宸插叧鑱旀暟閲�;                           //鏁伴噺
+                                    rowdataEntry.push(
+                                        {
+                                            "HMaterID": dataArray[i].HMaterID
+                                            , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                                            , "HUnitID": dataArray[i].HUnitID
+                                            , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                                            , "HQty": dealDoubleToFixed(HQty, 1)
+                                            , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                            , 'HDiscountRate': "1"                                                     //
+                                            , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                            , "HTaxRate": dataArray[i].绋庣巼
+                                            , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2)                                                         //
+                                            , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+                                            , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+                                            , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+                                            , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+                                            , "HRemark": ""
+
+                                            , "HSourceInterID": dataArray[i].hmainid
+                                            , "HSourceEntryID": dataArray[i].hsubid
+                                            , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                                            , "HSourceBillType": dataArray[i].HBillType
+                                            , "HRelationQty": "0"
+                                            , "HRelationMoney": "0"
+
+                                            , 'HPOOrderInterID': "0"
+                                            , 'HPOOrderEntryID': "0"
+                                            , 'HPOOrderBillNo': ""
+
+                                            , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                            , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+                                            , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+                                            , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+                                        }
+                                    );
+                                }
+                                
+                                optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
+                                table.render(optionEntry);
+                                //瀛愯〃姹囨��
+                                for (var i = 0; i < rowdataEntry.length; i++) {
+                                    var item = rowdataEntry[i];
+                                    for (var j = i + 1; j < rowdataEntry.length; j++) {
+                                        if (rowdataEntry[j].HMaterID == item.HMaterID) {
+                                            rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+                                            rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+                                            rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+                                            rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+                                            var HExRate = $("#HExRate").val();
+                                            rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+                                            rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+                                            rowdataEntry.splice(j, 1);
+                                            j = j - 1;
+                                        }
+                                    }
+                                }
+                                set_InitGridHaveSource();
+                                option.data = rowdataEntry;
+                                haveSource = true;
+                                table.render(option)
+                                layer.close(ajaxLoad);
+                            } else {
+                                layer.close(ajaxLoad);
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                                return;
+                            }
+                        }, error: function () {
+                            layer.close(ajaxLoad);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            return;
+                        }
+                    });
+                } else {
+                    return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+                }
+            }
+            //#endregion
+
             //#endregion
 
             //#region 瀛愯〃鍒濆鍖�
@@ -1648,13 +2005,13 @@
                         , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID"}//f7
                         , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text', event: "HQty" }
-                        , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
+                        , { field: 'HPrice', title: '鍗曚环', width: 100, event: "HPrice", style: 'background-color:#efefef4d;' }
                         , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
                         , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
                         , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
                         , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
                         , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, edit: 'text' }
                         , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
                         , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
                         , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
@@ -1677,6 +2034,9 @@
                         , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
                     ]]
+                    , done: function (res, curr, count) {
+                        $(".layui-table-main").scrollTop(topScroll);
+                    }
                 }
 
                 var rowdata = [{
@@ -1689,7 +2049,7 @@
                     , "HQty": "0"
                     , "HPrice": "0"
                     , "HTaxPrice": "0"
-                    , 'HDiscountRate': "0"
+                    , 'HDiscountRate': "1"
                     , 'HRelTaxPrice': "0"
                     , "HTaxRate": "0"
                     , 'HTaxMoney': "0"
@@ -1765,52 +2125,11 @@
                 table.render(optionEntry);
             }
             function set_InitGridHaveSource() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , totalRow: true
-                    , limit: 500
-                    , height: 500
-                    , loading: false
-                    , cols: [[ //瀛愯〃
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
-                        , { type: 'numbers', title: '搴忓彿', width: 100 }
-                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150, edit: 'text', event: "HMaterID" }//f7
-                        , { 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, edit: 'text', event: "HUnitID" }//f7
-                        , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
-                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
-                        , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
-                        , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
-                        , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
-                        , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-
-                        , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
-
-                        , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-
-                        , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                    ]]
+                //閫変腑婧愬崟鍚庢暟閲忎笉鍙紪杈�
+                for (var i = 0; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i]["field"] == "HQty") {
+                        option.cols[0][i]["edit"] = false;
+                    }
                 }
             }
             //#endregion
@@ -1858,6 +2177,8 @@
                                 , "HRemark": data.琛ㄥご澶囨敞
                                 , "HExplanation": data.鎽樿
                                 , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HProjectID": (data.HProjectID == null ? 0 : data.HProjectID)
+                                , "HProjectName": data.椤圭洰鍚嶇О
 
                                 , "HMaker": data.鍒跺崟浜�
                                 , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
@@ -2008,8 +2329,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -2060,7 +2381,7 @@
 
                         , "HDeptID": dataArray[0].HDeptID
                         , "HDeptName": dataArray[0].閮ㄩ棬
-                        , "HMangerID": dataArray[0].hmanagerid
+                        , "HMangerID": dataArray[0].HManagerID
                         , "HMangerName": dataArray[0].涓荤
                         , "HEmpID": dataArray[0].HEmpID
                         , "HEmpName": dataArray[0].涓氬姟鍛�
@@ -2080,17 +2401,17 @@
                     for (var i = 0; i < dataArray.length; i++) {
                         rowdata.push(
                             {
-                                "HMaterID": dataArray[i].hmaterid
+                                "HMaterID": dataArray[i].HMaterID
                                 , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
                                 , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
                                 , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                , "HUnitID": dataArray[i].hunitid
+                                , "HUnitID": dataArray[i].HUnitID
                                 , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
@@ -2208,6 +2529,7 @@
             function AllowLoadData(data) {
                 //鏁板�兼牸寮忔牎楠屽伐鍏�
                 var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var ref1 = /^-?\d+(\.\d+)?$/;          //鍒ゆ柇瀛楃涓叉槸鍚︿负鏁板瓧(鍖呭惈鏁存暟銆佹诞鐐规暟)锛屾鍒欒〃杈惧紡
                 var temp = "";
 
                 //#region 琛ㄥご鏁版嵁妫�楠�
@@ -2270,11 +2592,11 @@
 
                     //瀹炲彂鏁伴噺鏍煎紡鏍¢獙
                     temp = option.data[i]["HQty"] + "";
-                    if (temp == "0") {
-                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺涓嶈兘涓�0锛�");
+                    if (!ref1.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒");
                         return false;
-                    } else if (!ref.test(temp)) {
-                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                    } else if (temp * 1 == 0) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒");
                         return false;
                     }
 
@@ -2305,25 +2627,26 @@
                         return false;
                     }
 
-                    //閲戦鏍煎紡鏍¢獙
-                    temp = option.data[i]["HMoney"] + "";
-                    if (temp == "0") {
-                        layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
-                        return false;
-                    } else if (!ref.test(temp)) {
-                        layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
-                        return false;
-                    }
+                    ////閲戦鏍煎紡鏍¢獙
+                    //temp = option.data[i]["HMoney"] + "";
+                    //if (temp == "0") {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
+                    //    return false;
+                    //} else if (!ref.test(temp)) {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                    //    return false;
+                    //}
 
-                    //浠风◣鍚堣鏍煎紡鏍¢獙
-                    temp = option.data[i]["HTaxMoney"] + "";
-                    if (temp == "0") {
-                        layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
-                        return false;
-                    } else if (!ref.test(temp)) {
-                        layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
-                        return false;
-                    }
+                    ////绋庨鏍煎紡鏍¢獙
+                    //temp = option.data[i]["HTaxMoney"] + "";
+                    ////if (temp == "0") {
+                    ////    layer.msg("绗�" + (i + 1) + "琛岋細绋庨涓嶈兘涓�0锛�");
+                    ////    return false;
+                    ////} else 
+                    //if (!ref.test(temp)) {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細绋庨璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                    //    return false;
+                    //}
 
                     //鍙戣揣浠撳簱闈炵┖楠岃瘉
                     if (option.data[i]["HWHID"] == "0") {
@@ -2367,11 +2690,13 @@
                                     if (typeof (OptionData.HItemID) != "undefined") {
                                         //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
                                         var HSupID = $("#HCusID").val();
+                                        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 HPrice = obj.data.HPrice * 1;
+                                        var HTaxRate = obj.data.HTaxRate*0.01;
                                         if (HSupID != 0) {
-                                            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"];  //閲戦绮惧害
                                             $.ajax({
                                                 url: GetWEBURL() + "/Gy_Customer/xg",
                                                 //url: "http://localhost:12761/Gy_Supplier/xg",
@@ -2380,63 +2705,51 @@
                                                     "HInterID": HSupID
                                                 },
                                                 success: function (d) {
-                                                    var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
-                                                    var HExRate = $("#HExRate").val();                      //姹囩巼
-                                                    //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                                                    var HQty = obj.data.HQty * 1;                           //鏁伴噺
-                                                    var HPrice = obj.data.HPrice * 1;               //鍗曚环
-                                                    var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
-                                                    var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
-                                                    var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
-                                                    var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                                    var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
-                                                    var HDiscountRate = obj.data.HDiscountRate * 1;   //鎶樻墸鐜�
-                                                    var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
-                                                    var HExRate = $("#HExRate").val();                      //姹囩巼
-                                                    var HMoneyBB = HMoney * HExRate;
-                                                    ///鏁板瓧绮惧害
-                                                    HQty = Number(HQty.toFixed(HQtyDec));
-                                                    HPrice = Number(HPrice.toFixed(HPriceDec));
-                                                    HMoney = Number(HMoney.toFixed(HMoneyDec));
-                                                    HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
-                                                    HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
-                                                    HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
-                                                    HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
-                                                    HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
-                                                    HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
-
-                                                    obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
-                                                        "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
-                                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                                        , "HUnitID": OptionData.HUnitID
-                                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                                        , "HTaxRate": HTaxRate * 100
-                                                        , HQty: HQty                          //鏇存柊HQty瀛楁锛孒Qty
-                                                        , HPrice: HPrice                     //鏇存柊HPrice瀛楁锛孒Price
-                                                        , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
-                                                        , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
-                                                        , HlineTotal: HlineTotal             //鏇存柊HlineTotal瀛楁锛孒lineTotal
-                                                        , HTaxPrice, HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
-                                                        , HRelTaxPrice: HRelTaxPrice            //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
-                                                        , HlineTotalBB: HlineTotalBB              //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
-                                                        , HMoneyBB: HMoneyBB
-                                                    })
-                                                    OptionData = [];
+                                                   HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
                                                 }
                                             });
-                                        } else {
-                                            obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
-                                                "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
-                                                , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                                , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                                , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                                , "HUnitID": OptionData.HUnitID
-                                                , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                            })
-                                            OptionData = [];
                                         }
+                                        var HExRate = $("#HExRate").val();                      //姹囩巼
+                                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                        var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                                        var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+                                        var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+                                        var HDiscountRate = obj.data.HDiscountRate * 1;   //鎶樻墸鐜�
+                                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+                                        var HMoneyBB = HMoney * HExRate;
+                                        ///鏁板瓧绮惧害
+                                        HQty = Number(HQty.toFixed(HQtyDec));
+                                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
+                                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+                                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+
+                                        obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                            "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                            , "HTaxRate": HTaxRate * 100
+                                            , HQty: HQty                          //鏇存柊HQty瀛楁锛孒Qty
+                                            , HPrice: HPrice                     //鏇存柊HPrice瀛楁锛孒Price
+                                            , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                                            , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                                            , HlineTotal: HlineTotal             //鏇存柊HlineTotal瀛楁锛孒lineTotal
+                                            , HTaxPrice, HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                                            , HRelTaxPrice: HRelTaxPrice            //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+                                            , HlineTotalBB: HlineTotalBB              //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+                                            , HMoneyBB: HMoneyBB
+                                        })
+                                        OptionData = [];
                                     }
                                 }
                             })
@@ -2509,9 +2822,14 @@
                         }
                         , end: function () {
                             if (typeof (OptionData.HItemID) != "undefined") {
-                                
                                 //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
                                 var HSupID = $("#HCusID").val();
+                                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 HPrice = obj.data.HPrice * 1;
+                                var HTaxRate = obj.data.HTaxRate*0.01;
                                 if (HSupID != 0) {
                                     $.ajax({
                                         url: GetWEBURL() + "/Gy_Customer/xg",
@@ -2521,46 +2839,52 @@
                                             "HInterID": HSupID
                                         },
                                         success: function (d) {
-                                            var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
-                                            var HExRate = $("#HExRate").val();                      //姹囩巼
-                                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                                            var HQty = obj.data.HQty * 1;                           //鏁伴噺
-                                            var HPrice = obj.data.HPrice * 1;               //鍗曚环
-                                            var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
-                                            var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //绋庨=閲戦*绋庣巼
-                                            var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
-                                            var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
-                                            var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4));     //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
-                                            obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
-                                                "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
-                                                , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                                , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                                , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                                , "HUnitID": OptionData.HUnitID
-                                                , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                                , "HTaxRate": HTaxRate * 100
-                                                , HQty: HQty                               //鏇存柊HQty瀛楁锛孒Qty
-                                                , HPrice: HPrice                         //鏇存柊HPrice瀛楁锛孒Price
-                                                , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
-                                                , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
-                                                , HlineTotal: HlineTotal             //鏇存柊HlineTotal瀛楁锛孒lineTotal
-                                                , HTaxPrice, HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
-                                                , HlineTotalBB: HlineTotalBB              //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
-                                            })
-                                            OptionData = [];
+                                            HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
                                         }
                                     });
-                                } else {
-                                    obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
-                                        "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
-                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                        , "HUnitID": OptionData.HUnitID
-                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                    })
-                                    OptionData = [];
                                 }
+                                var HExRate = $("#HExRate").val();                      //姹囩巼
+                                //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                                var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
+                                var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+                                var HDiscountRate = obj.data.HDiscountRate * 1;   //鎶樻墸鐜�
+                                var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+                                var HExRate = $("#HExRate").val();                      //姹囩巼
+                                var HMoneyBB = HMoney * HExRate;
+                                ///鏁板瓧绮惧害
+                                HQty = Number(HQty.toFixed(HQtyDec));
+                                HPrice = Number(HPrice.toFixed(HPriceDec));
+                                HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
+                                HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+                                HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                                HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+                                HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+
+                                obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                    "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                    , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                    , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                    , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                    , "HUnitID": OptionData.HUnitID
+                                    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                    , "HTaxRate": HTaxRate * 100
+                                    , HQty: HQty                          //鏇存柊HQty瀛楁锛孒Qty
+                                    , HPrice: HPrice                     //鏇存柊HPrice瀛楁锛孒Price
+                                    , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                                    , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                                    , HlineTotal: HlineTotal             //鏇存柊HlineTotal瀛楁锛孒lineTotal
+                                    , HTaxPrice, HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                                    , HRelTaxPrice: HRelTaxPrice            //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+                                    , HlineTotalBB: HlineTotalBB              //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+                                    , HMoneyBB: HMoneyBB
+                                })
+                                OptionData = [];
                             }
                         }
                     })
@@ -2575,14 +2899,15 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else if (haveSource == true) {
                             layer.msg('鏈夋簮鍗曟棤娉曞垹闄わ紒锛侊紒');
                         }else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });
@@ -2956,97 +3281,55 @@
                     , "HSSName": dataArray[0].缁撶畻鏂瑰紡
                     , "HSellSID": dataArray[0].HSellSID
                     , "HSellSName": dataArray[0].閿�鍞柟寮�
+                    , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+                    , "HProjectName": dataArray[0].椤圭洰鍚嶇О
                 });
 
-                if ($("#HPriceType").val() == "鎴愭湰浠�") {
-                    //瀛愯〃鎴愭湰浠稥ntry  璧嬪��
-                    var rowdataEntry = [];
-                    for (var i = 0; i < dataArray.length; i++) {
+                //瀛愯〃Entry  璧嬪��
+                var rowdataEntry = [];
+                for (var i = 0; i < dataArray.length; i++) {
+                    var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;
+                    rowdataEntry.push(
+                        {
+                            "HMaterID": dataArray[i].HMaterID
+                            , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                            , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                            , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                            , "HUnitID": dataArray[i].HUnitID
+                            , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                            , "HQty": dealDoubleToFixed(HQty, 1)
+                            , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                            , 'HDiscountRate': "1"                                                     //
+                            , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                            , "HTaxRate": dataArray[i].绋庣巼
+                            , 'HTaxMoney': "0"                                                         //
+                            , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+                            , 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
+                            , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
+                            , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
+                            , "HRemark": ""
 
-                        rowdataEntry.push(
-                            {
-                                "HMaterID": dataArray[i].HMaterID
-                                , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                                , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                                , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                , "HUnitID": dataArray[i].HUnitID
-                                , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
-                                , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
-                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
-                                , "HTaxRate": dataArray[i].绋庣巼
-                                , 'HTaxMoney': "0"                                                         //
-                                , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
-                                , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
-                                , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
-                                , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
-                                , "HRemark": ""
+                            , "HSourceInterID": dataArray[i].hmainid
+                            , "HSourceEntryID": dataArray[i].hsubid
+                            , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                            , "HSourceBillType": dataArray[i].HBillType
+                            , "HRelationQty": "0"
+                            , "HRelationMoney": "0"
 
-                                , "HSourceInterID": dataArray[i].hmainid
-                                , "HSourceEntryID": dataArray[i].hsubid
-                                , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                                , "HSourceBillType": dataArray[i].HBillType
-                                , "HRelationQty": "0"
-                                , "HRelationMoney": "0"
+                            , 'HPOOrderInterID': "0"
+                            , 'HPOOrderEntryID': "0"
+                            , 'HPOOrderBillNo': ""
 
-                                , 'HPOOrderInterID': "0"
-                                , 'HPOOrderEntryID': "0"
-                                , 'HPOOrderBillNo': ""
-
-                                , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                , "HSeOrderInterID": dataArray[i].hmainid
-                                , "HSeOrderEntryID": dataArray[i].hsubid
-                                , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
-                            }
-                        );
-                    }
-                } else {
-                    //瀛愯〃Entry  璧嬪��
-                    var rowdataEntry = [];
-                    for (var i = 0; i < dataArray.length; i++) {
-                        rowdataEntry.push(
-                            {
-                                "HMaterID": dataArray[i].HMaterID
-                                , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                                , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                                , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                , "HUnitID": dataArray[i].HUnitID
-                                , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
-                                , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
-                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
-                                , "HTaxRate": dataArray[i].绋庣巼
-                                , 'HTaxMoney': "0"                                                         //
-                                , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
-                                , 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
-                                , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
-                                , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
-                                , "HRemark": ""
-
-                                , "HSourceInterID": dataArray[i].hmainid
-                                , "HSourceEntryID": dataArray[i].hsubid
-                                , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                                , "HSourceBillType": dataArray[i].HBillType
-                                , "HRelationQty": "0"
-                                , "HRelationMoney": "0"
-
-                                , 'HPOOrderInterID': "0"
-                                , 'HPOOrderEntryID': "0"
-                                , 'HPOOrderBillNo': ""
-
-                                , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                , "HSeOrderInterID": dataArray[i].hmainid
-                                , "HSeOrderEntryID": dataArray[i].hsubid
-                                , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
-                            }
-                        );
-                    }
+                            , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+                            , "HSeOrderInterID": dataArray[i].hmainid
+                            , "HSeOrderEntryID": dataArray[i].hsubid
+                            , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+                        }
+                    );
                 }
-                optionEntry.data = rowdataEntry;
+                
+                optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
                 table.render(optionEntry);
                 //瀛愯〃姹囨��
                 for (var i = 0; i < rowdataEntry.length; i++) {
@@ -3104,7 +3387,6 @@
                         return;
                     }
                 }
-
                 form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                     "HMainSourceInterID": "0"
                     , "HMainSourceEntryID": "0"
@@ -3113,7 +3395,7 @@
 
                     , "HDeptID": dataArray[0].HDeptID
                     , "HDeptName": dataArray[0].閮ㄩ棬
-                    , "HMangerID": dataArray[0].hmanagerid
+                    , "HMangerID": dataArray[0].HManagerID
                     , "HMangerName": dataArray[0].涓荤
                     , "HEmpID": dataArray[0].HEmpID
                     , "HEmpName": dataArray[0].涓氬姟鍛�
@@ -3126,74 +3408,35 @@
                     , "HSSName": ""
                     , "HSellSID": dataArray[0].HSellSID
                     , "HSellSName": dataArray[0].閿�鍞柟寮�
+
+                    , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                    , "HProjectID": dataArray[0].HProjectID == null ? "0" : dataArray[0].HProjectID
                 });
-                if ($("#HPriceType").val() == "鎴愭湰浠�") {
-                    //瀛愯〃  璧嬪��
-                    var rowdataEntry = [];
+                
+                //瀛愯〃  璧嬪��
+                var rowdataEntry = [];
+                try {
                     for (var i = 0; i < dataArray.length; i++) {
+                        var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].鍏宠仈鏁伴噺;
                         rowdataEntry.push(
                             {
-                                "HMaterID": dataArray[i].hmaterid
+                                "HMaterID": dataArray[i].HMaterID
                                 , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
                                 , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
                                 , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                , "HUnitID": dataArray[i].hunitid
+                                , "HUnitID": dataArray[i].HUnitID
                                 , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
-                                , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
-                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
-                                , "HTaxRate": dataArray[i].绋庣巼
-                                , 'HTaxMoney': "0"                                                         //
-                                , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环, 2)
-                                , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
-                                , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
-                                , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
-                                , "HRemark": ""
-
-                                , "HSourceInterID": dataArray[i].hmainid
-                                , "HSourceEntryID": dataArray[i].hsubid
-                                , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                                , "HSourceBillType": dataArray[i].HBillType
-                                , "HRelationQty": "0"
-                                , "HRelationMoney": "0"
-
-                                , 'HPOOrderInterID': "0"
-                                , 'HPOOrderEntryID': "0"
-                                , 'HPOOrderBillNo': ""
-
-                                , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
-                                , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
-                                , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
-                            }
-                        );
-                    }
-                }
-                else {
-                    //瀛愯〃  璧嬪��
-                    var rowdataEntry = [];
-                    for (var i = 0; i < dataArray.length; i++) {
-                        rowdataEntry.push(
-                            {
-                                "HMaterID": dataArray[i].hmaterid
-                                , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                                , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                                , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                , "HUnitID": dataArray[i].hunitid
-                                , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                                , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+                                , "HQty": dealDoubleToFixed(HQty, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
-                                , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
-                                , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
-                                , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
-                                , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+                                , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+                                , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+                                , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+                                , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
                                 , "HRemark": ""
 
                                 , "HSourceInterID": dataArray[i].hmainid
@@ -3215,8 +3458,11 @@
                         );
                     }
                 }
-                
-                optionEntry.data = rowdataEntry;
+                catch (error) {
+                    layer.alert(error.Message, { icon: 5 });
+                }
+
+                optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
                 table.render(optionEntry);
                 //瀛愯〃姹囨��
                 for (var i = 0; i < rowdataEntry.length; i++) {
@@ -3299,11 +3545,11 @@
             function getDecByMaterID(HMaterID) {
                 var resultData = {};
                 $.ajax({  // 寮傛璇锋眰
-                    url: GetWEBURL() + "Gy_Material/getDecByID",  //璇锋眰鍦板潃
+                    url: GetWEBURL() + "/Gy_Material/getDecByID",  //璇锋眰鍦板潃
                     async: false,   //鏄惁寮�鍚紓姝�
                     type: "GET",   //璇锋眰绫诲瀷
                     data: {   //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
-                        "HMaterID": HMaterID     //  灏唄materid浣滀负璇锋眰鍙傛暟鍙戦��
+                        "HMaterID": HMaterID     //  灏咹MaterID浣滀负璇锋眰鍙傛暟鍙戦��
                     },
                     success: function (result) {   // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
                         if (result.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц

--
Gitblit v1.9.1