From 3eb10e612d09c4d3d3519544b5e2e0229881c108 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 05 十一月 2024 17:12:51 +0800
Subject: [PATCH] 采购管理：采购订单，收料通知单，采购入库单，应付单，付款单；销售管理：销售订单，发货通知单，销售出库单，应收单；修改
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 2
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 205 +++++++++++++++++++++++++++------------------------
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 2
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 5 +
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 2
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 2
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 2
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 2
8 files changed, 118 insertions(+), 104 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index bd61a75..d09066d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -42,7 +42,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁缂栧彿<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
</div>
</div>
@@ -720,6 +720,7 @@
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HPrice', title: '鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HMoney', title: '缁撶畻閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HInvoiceBillNo_Sub', title: '鍙戠エ鍙风爜', width: 100,style: 'background-color:#efefef4d;' }
, { field: 'HReceiveBillInterID', title: '鎺ユ敹婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HReceiveBillEntryID', title: '鎺ユ敹婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HReceiveBillNo', title: '鎺ユ敹婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
@@ -1069,6 +1070,7 @@
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3) //
, "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HInvoiceBillNo_Sub": dataArray[i].鍙戠エ缂栧彿
, "HReceiveBillInterID": dataArray[i].hmainid
, "HReceiveBillEntryID": dataArray[i].hsubid
, "HReceiveBillNo": dataArray[i].鍗曟嵁鍙�
@@ -1385,6 +1387,7 @@
, "HQty": dealDoubleToFixed(result.data[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(result.data[i].鍗曚环, 3) //
, "HMoney": dealDoubleToFixed(result.data[i].缁撶畻閲戦, 2)
+ , "HInvoiceBillNo_Sub": result.data[i].鍙戠エ鍙风爜
, "HReceiveBillInterID": result.data[i].婧愬崟涓诲唴鐮�
, "HReceiveBillEntryID": result.data[i].婧愬崟瀛愬唴鐮�
, "HReceiveBillNo": result.data[i].婧愬崟鍗曞彿
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index b5bf9ff..ec92e1a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -66,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>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index c28306e..d376fd7 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -65,7 +65,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
</div>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 0aabc7a..f479d84 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -66,7 +66,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
</div>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index b547496..1878e93 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -67,7 +67,7 @@
<div class="layui-col-xs4 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">
<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
</div>
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 31270ae..b7e6c99 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"
@@ -65,7 +65,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>
@@ -2368,11 +2368,18 @@
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 = 0;
+ if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ HPrice = OptionData.鍚◣鎴愭湰浠� * 1;//鍗曚环
+ } else {
+ HPrice = OptionData.缁撶畻浠� * 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",
@@ -2381,63 +2388,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`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": 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`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": 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`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": 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 = [];
}
}
})
@@ -2510,9 +2505,19 @@
}
, 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 = 0;
+ if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ HPrice = OptionData.鍚◣鎴愭湰浠� * 1;//鍗曚环
+ } else {
+ HPrice = OptionData.缁撶畻浠� * 1;//鍗曚环
+ }
+ var HTaxRate = obj.data.HTaxRate*0.01;
if (HSupID != 0) {
$.ajax({
url: GetWEBURL() + "/Gy_Customer/xg",
@@ -2522,46 +2527,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`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": 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`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": 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`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": 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 = [];
}
}
})
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index ccf9c76..daf6b1e 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -77,7 +77,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁缂栧彿<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
</div>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 191d25e..0658ad3 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -70,7 +70,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value=0>
</div>
--
Gitblit v1.9.1