From 4998bc7bf98638a06a22d0613869130bececc8c3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 24 九月 2024 11:25:23 +0800
Subject: [PATCH] 采购订单操作类型初始化，应收应付折扣率初始修复
---
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 55 ++++++++++++++-------------
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 20 +++++-----
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 5 ++
3 files changed, 42 insertions(+), 38 deletions(-)
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 14bc4e7..b5bf9ff 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"
@@ -681,8 +681,8 @@
, "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': HTaxMoney //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -782,8 +782,8 @@
, "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': HTaxMoney //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -872,7 +872,7 @@
, "HQty": "0"
, "HPrice": "0"
, "HTaxPrice": "0"
- , 'HDiscountRate': "0"
+ , 'HDiscountRate': "1"
, 'HRelTaxPrice': "0"
, "HTaxRate": "0"
, 'HTaxMoney': "0"
@@ -1409,7 +1409,7 @@
, "HQty": "0"
, "HPrice": "0"
, "HTaxPrice": "0"
- , 'HDiscountRate': "0"
+ , 'HDiscountRate': "1"
, 'HRelTaxPrice': "0"
, "HTaxRate": "0"
, 'HTaxMoney': "0"
@@ -2920,8 +2920,8 @@
, "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': HTaxMoney //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -3054,8 +3054,8 @@
, "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': HTaxMoney //
, "HMoney": dealDoubleToFixed(HMoney, 2)
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 0d2f742..1a1cc72 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"
@@ -432,7 +432,10 @@
})
}
//#endregion
-
+ //鍒ゆ柇椤甸潰鎵撳紑鏂瑰紡
+ if (OperationType == null || OperationType == "" || typeof (params[params[0]]) == "undefined") {
+ OperationType = 1;//鎿嶄綔绫诲瀷鍒濆鍖�
+ }
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) { //鍒ゆ柇 linterid 鍙橀噺鏄惁涓虹┖鎴栬�呯瓑浜�0
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 96a1a0c..bd5c5d8 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"
@@ -664,8 +664,8 @@
, "HQty": dealDoubleToFixed(HQty, 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': dealDoubleToFixed(HTaxMoney, 2) //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -716,8 +716,8 @@
, "HQty": dealDoubleToFixed(HQty, 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': dealDoubleToFixed(HTaxMoney, 2) //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -808,8 +808,8 @@
, "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': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2) //
, "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
@@ -853,8 +853,8 @@
, "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': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
, "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
@@ -946,7 +946,7 @@
, "HQty": "0"
, "HPrice": "0"
, "HTaxPrice": "0"
- , 'HDiscountRate': "0"
+ , 'HDiscountRate': "1"
, 'HRelTaxPrice': "0"
, "HTaxRate": "0"
, 'HTaxMoney': "0"
@@ -2008,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)
@@ -2089,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)
@@ -2315,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;
}
@@ -2974,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)
@@ -3017,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)
@@ -3142,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)
@@ -3186,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)
--
Gitblit v1.9.1