From ac655eccac04f4c3ccc40268aab9491a51c64755 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 08 十一月 2023 13:19:55 +0800
Subject: [PATCH] 销售订单：选择 物料后，根据 主表客户 带出税率，并重算记录中的数量、单价、含税单价、金额、价税合计
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 71 +++++++++++++++++++++++++++++++----
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
2 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index bb0ba65..6409fcc 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4704,7 +4704,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">
- <publishTime>11/08/2023 12:11:40</publishTime>
+ <publishTime>11/08/2023 13:15:40</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillDyColList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
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 0742388..2299912 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"
@@ -1642,15 +1642,64 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
- , "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
- })
+
+
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+ //鑾峰彇閫夋嫨鐗╂枡鍓嶅悗鐨勭◣鐜�
+ var value = subHTaxRate; //閫夋嫨鐗╂枡鍚庢牴鎹鎴峰緱鍒扮殑绋庣巼
+ var oldText = obj.data.HTaxRate; //璇ヨ褰曚腑鍘熸湁鐨勭◣鐜�
+
+ //绋庣巼鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp)) {
+ //绋庣巼鎭㈠鍒扮紪杈戝墠锛岃缃墿鏂欑瓑淇℃伅
+ obj.update({
+ HTaxRate: oldText
+
+ , "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ });
+ table.render(option);
+
+ layer.msg("鑾峰彇鍒扮殑绋庣巼涓嶅悎娉曪紝宸茶嚜鍔ㄥ彉鏇翠负鍘熸湁绋庣巼!");
+ } else {
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HTaxRate = value * 0.01; //绋庣巼
+ /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+ //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HTaxRate: HTaxRate * 100
+ , HTaxPrice: HTaxPrice
+ , HMoney: HMoney
+ , HlineTotal: HlineTotal
+
+ , "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+
+ });
+ table.render(option);
+ }
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -1828,6 +1877,9 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ //瀛愯〃绋庣巼锛屾牴鎹鎴峰甫鍑�
+ var subHTaxRate = 0;
+
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
@@ -1875,6 +1927,7 @@
$("#HSSID").val(data.HSSID);
$("#HSSName").val(data.HSSName);
+ subHTaxRate = data.HTaxRate;
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
--
Gitblit v1.9.1