From cb2fc709d4e2aec6bbea3e6f4e8ccc24f3d27756 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期日, 06 十月 2024 17:27:08 +0800
Subject: [PATCH] 工艺路线工价

---
 WebTM/views/销售管理/应收单/Xs_ReceivableBill.html |  620 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 488 insertions(+), 132 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 6ba396b..31270ae 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"
@@ -54,7 +54,8 @@
                         <h1 style="text-align: center; padding: 10px 0;"><b>搴旀敹鍗�</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
-                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--鍩烘湰淇℃伅-->
@@ -81,9 +82,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">
@@ -92,7 +93,7 @@
                                                 <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -100,34 +101,25 @@
                                         </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="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>-->
-                                            </div>
-                                        </div>
+
                                         <div class="layui-inline">
                                             <label class="layui-form-label">閿�鍞儴闂�</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hdeptlist" style="width:40px;">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float: left; width: 110px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>-->
+                                                </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">涓荤</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                 <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>-->
+                                                </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -136,54 +128,8 @@
                                                 <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>-->
-                                            </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="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
-                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                </button>-->
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">閿�鍞柟寮�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hsellslist" style="width:40px;">
-                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                </button>-->
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">缁撶畻鏂瑰紡</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
-                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                </button>-->
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">鏀舵鏃ユ湡<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block">
-                                                <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
+                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+            </button>-->
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -204,16 +150,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row" style="margin-top:10px;">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
-                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
+                                    
 
                                     <!--闅愯棌瀛楁-->
                                     <div class="layui-row" style="display:none;">
@@ -233,6 +170,81 @@
                                             <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" value="" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                    
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閿�鍞憳</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+            </button>-->
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">甯佸埆</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+            </button>-->
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏀舵鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
+                                            </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="HSellSName" id="HSellSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hsellslist" style="width:40px;">
+                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+            </button>-->
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+            </button>-->
+                                            </div>
+                                        </div>
+                                        
+                                    </div>
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
                                             </div>
                                         </div>
                                     </div>
@@ -524,9 +536,9 @@
                 }
                 //#endregion
 
-                //if (AllowLoadData(data)) {
+                if (AllowLoadData(data)) {
                     set_SaveBill(data);
-                //}
+                }
             });
             //#endregion
             //#endregion
@@ -580,6 +592,339 @@
             });
             //#endregion
 
+            //#region 鍥炶溅閫夋嫨婧愬崟
+            $('#HMainSourceBillNo').on('keydown', function (event) {
+                var HSourceBillNo = $('#HMainSourceBillNo').val();//锛堟簮鍗曞崟鎹彿锛�
+                if (event.keyCode == 13) {
+                    var ajaxLoad = layer.load();
+                    var url;
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    if (HSourceBillNo == "") {
+                        return;
+                    }
+                    if ($("#BillType").val() == "1401") {
+                        //婧愬崟绫诲瀷鏄攢鍞鍗�
+                        url = "/Xs_SeOrderBill/PushList";
+                    } else if ($("#BillType").val() == "1205") {
+                        //婧愬崟绫诲瀷鏄攢鍞嚭搴撳崟
+                        url = "/Kf_SellOutBill/PushList";
+                    }
+                    $.ajax({
+                        url: GetWEBURL() + url,
+                        type: "GET",
+                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                var dataArray = result.data;
+                                if ($("#BillType").val() == "1401") {
+                                    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].閿�鍞柟寮�
+                                    });
+
+                                    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': "1"                                                     //
+                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 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].鍗曟嵁鍙�
+                                                }
+                                            );
+                                        }
+                                    } 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': "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 = 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;
+
+                                } else if ($("#BillType").val() == "1205") {
+                                    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].HCurID
+                                        , "HCurName": dataArray[0].甯佸埆
+                                        , "HExRate": dataArray[0].姹囩巼
+                                        , "HSSID": "0"
+                                        , "HSSName": ""
+                                        , "HSellSID": dataArray[0].HSellSID
+                                        , "HSellSName": dataArray[0].閿�鍞柟寮�
+                                    });
+                                    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': "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].婧愬崟鍗曞彿 : ""
+                                                }
+                                            );
+                                        }
+                                    }
+                                    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': "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 = 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.msg("鏌ヨ鎴愬姛", { time: 1 * 1000, icon: 1 });
+                            } else {
+                                layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                layer.close(ajaxLoad);
+                            }
+                        }, error: function () {
+                            layer.alert(result.Message + "鍙戠敓閿欒!", { icon: 5 });
+                            layer.close(ajaxLoad);
+                        }
+                    });
+                }
+            });
+            //#endregion
+
+
+
             //#endregion
 
             //#region 澶嶉�夋鐘舵�佸彉鏇�
@@ -601,7 +946,7 @@
                     , "HQty": "0"
                     , "HPrice": "0"
                     , "HTaxPrice": "0"
-                    , 'HDiscountRate': "0"
+                    , 'HDiscountRate': "1"
                     , 'HRelTaxPrice': "0"
                     , "HTaxRate": "0"
                     , 'HTaxMoney': "0"
@@ -1067,19 +1412,19 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HDeptName").val(checkStatus.data[0].HName);
-                    //    $("#HDeptID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
                 })
             }
             //#endregion
@@ -1092,19 +1437,19 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閿�鍞富绠″垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HManagerName").val(checkStatus.data[0].HName);
-                    //    $("#HManagerID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HMangerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
                 })
             }
             //#endregion
@@ -1257,7 +1602,17 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-
+                        var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+                        if (HCusID == 0 || HCusID == '') {
+                            HCusID = checkStatus.data[0]["HCusID"];
+                        }
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i]["HCusID"] != HCusID) {
+                                layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+                                layer.close(index);
+                                return;
+                            }
+                        }
                         if ($("#BillType").val() == "1401") {
                             setInitBySeOrderBill(checkStatus);
                         }
@@ -1334,7 +1689,7 @@
                     , "HQty": "0"
                     , "HPrice": "0"
                     , "HTaxPrice": "0"
-                    , 'HDiscountRate': "0"
+                    , 'HDiscountRate': "1"
                     , 'HRelTaxPrice': "0"
                     , "HTaxRate": "0"
                     , 'HTaxMoney': "0"
@@ -1653,8 +2008,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)
@@ -1734,8 +2089,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].鏁伴噺 * dataArray[i].鍗曚环, 2)
@@ -1960,13 +2315,14 @@
                         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鐨勬暟瀛楋紒");
+                    //if (temp == "0") {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細绋庨涓嶈兘涓�0锛�");
+                    //    return false;
+                    //} else 
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細绋庨璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
                         return false;
                     }
 
@@ -2619,8 +2975,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
@@ -2662,8 +3018,8 @@
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
-                                , 'HDiscountRate': "0"                                                     //
-                                , 'HRelTaxPrice': "0"
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
                                 , "HTaxRate": dataArray[i].绋庣巼
                                 , 'HTaxMoney': "0"                                                         //
                                 , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -2787,8 +3143,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].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环, 2)
@@ -2831,8 +3187,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].鏁伴噺 * dataArray[i].鍗曚环, 2)
@@ -3010,18 +3366,18 @@
             $("#HCusID").val(obj[0].HItemID);
         }
 
+        
         function GetHManagerValue(obj)  //杩斿洖涓荤
         {
-            $("#HMangerName").val(obj[0].HName);
+            $("#HMangerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HMangerID").val(obj[0].HItemID);
         }
 
         function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
         {
-            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
             $("#HDeptID").val(obj[0].HItemID);
         }
-
         function GetSellStyleValue(obj)  //杩斿洖閿�鍞柟寮�
         {
             $("#HSellSName").val(obj[0].HName);

--
Gitblit v1.9.1