From ba1fb184917b1651221a6decf1144911ff489f86 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 13 八月 2024 11:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 76 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 25 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 3b70f05..d29324c 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"
@@ -670,7 +670,10 @@
//鏁板�兼牸寮忔牎楠屽伐鍏�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
var temp = "";
-
+ var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+ var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
+ var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
+ var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -705,12 +708,11 @@
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
- //璁剧疆鏁版嵁灏忔暟浣嶆暟
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- HMoney = dealDoubleToFixed(HMoney, 2);
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxPrice = Number(HPrice.toFixed(HPriceDec));
HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -750,12 +752,11 @@
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
- //璁剧疆鏁版嵁灏忔暟浣嶆暟
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- HMoney = dealDoubleToFixed(HMoney, 2);
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxPrice = Number(HPrice.toFixed(HPriceDec));
HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -795,12 +796,11 @@
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
- //璁剧疆鏁版嵁灏忔暟浣嶆暟
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- HMoney = dealDoubleToFixed(HMoney, 2);
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxPrice = Number(HPrice.toFixed(HPriceDec));
HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -840,12 +840,11 @@
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
- //璁剧疆鏁版嵁灏忔暟浣嶆暟
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- HMoney = dealDoubleToFixed(HMoney, 2);
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxPrice = Number(HPrice.toFixed(HPriceDec));
HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -857,6 +856,7 @@
, HMoney: HMoney
, HTaxMoney: HTaxMoney
});
+ table.render(option)
break;
default:
}
@@ -2830,6 +2830,32 @@
}
//#endregion
+ //#region 鏍规嵁鐗╂枡ID鑾峰彇绮惧害
+ function getDecByMaterID(HMaterID) {
+ var resultData = {};
+ $.ajax({ // 寮傛璇锋眰
+ url: GetWEBURL() + "Gy_Material/getDecByID", //璇锋眰鍦板潃
+ async: false, //鏄惁寮�鍚紓姝�
+ type: "GET", //璇锋眰绫诲瀷
+ data: { //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
+ "HMaterID": HMaterID // 灏唄materid浣滀负璇锋眰鍙傛暟鍙戦��
+ },
+ success: function (result) { // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
+ if (result.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
+ var data = result.data; //澹版槑data鍙橀噺锛屽苟灏嗗叾璧嬪�间负result瀵硅薄涓殑data灞炴��
+ resultData = data[0]; //灏哾ata鏁扮粍锛堟垨绫绘暟缁勫璞★級鐨勭涓�涓厓绱犺祴鍊肩粰鍙橀噺resultData
+ }
+ //else {
+ // layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); //result.msg瀵硅薄锛屾彁绀哄脊绐� 绫诲瀷涓�5锛� 鎸夐挳锛屽拰鎸夐挳鐨勫悕绉颁负閫�鍑� 鏃堕棿 涓�100绉掞紝浠ュ強鍋忕Щ閲忥紙`offset: 't'
+ //}
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 }); //鎻愮ず寮圭獥 鍙戠敓閿欒 锛岃绀烘爣蹇椾负5鐨�
+ }
+ });
+ return resultData;
+ }
+ //#endregion
+
//#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞嚭搴撳崟鏁版嵁
function getPushSource_SellOutBillInit(HSourceInterID, HSourceEntryID) {
var res = "none";
--
Gitblit v1.9.1