From 1486fe37aee08fa6b5068f36c035367a138f5896 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 06 十一月 2023 23:23:24 +0800
Subject: [PATCH] 销售订单：保存时增加数据校验
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 131 +++++++++++++++++++++++++------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
2 files changed, 76 insertions(+), 57 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 4365edf..3b765f1 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4671,7 +4671,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">
- <publishTime>10/30/2023 18:13:02</publishTime>
+ <publishTime>11/06/2023 23:22:33</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 9c794c9..4ea087b 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"
@@ -468,9 +468,9 @@
//#region 琛ㄥご鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
- //if (AllowLoadData(data)) {
+ if (AllowLoadData(data)) {
set_SaveBill(data);
- //}
+ }
});
//#endregion
@@ -509,7 +509,7 @@
"HTaxMoney": "0",
"HlineTotal": "0",
"HlineTotalBB": "0",
- "HDate": "",
+ "HDate": Format(new Date(), 'yyyy-MM-dd'),
"HOutStockQty": "0",
"HInvoiceQty": "0",
"HRemark": ""
@@ -592,7 +592,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = value * 1; //鏁伴噺
var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = obj.data.HTaxRate * 1; //绋庣巼
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -607,7 +607,7 @@
obj.update({
HQty: HQty
, HPrice: HPrice
- , HTaxRate: HTaxRate
+ , HTaxRate: HTaxRate * 100
, HTaxPrice: HTaxPrice
, HMoney: HMoney
, HlineTotal: HlineTotal
@@ -632,7 +632,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
var HPrice = value * 1; //鍗曚环
- var HTaxRate = obj.data.HTaxRate * 1; //绋庣巼
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -647,7 +647,7 @@
obj.update({
HQty: HQty
, HPrice: HPrice
- , HTaxRate: HTaxRate
+ , HTaxRate: HTaxRate * 100
, HTaxPrice: HTaxPrice
, HMoney: HMoney
, HlineTotal: HlineTotal
@@ -672,7 +672,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = value * 1; //绋庣巼
+ var HTaxRate = value * 0.01; //绋庣巼
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -687,7 +687,7 @@
obj.update({
HQty: HQty
, HPrice: HPrice
- , HTaxRate: HTaxRate
+ , HTaxRate: HTaxRate * 100
, HTaxPrice: HTaxPrice
, HMoney: HMoney
, HlineTotal: HlineTotal
@@ -825,7 +825,7 @@
"HTaxMoney": "0",
"HlineTotal": "0",
"HlineTotalBB": "0",
- "HDate": "",
+ "HDate": Format(new Date(),'yyyy-MM-dd'),
"HOutStockQty": "0",
"HInvoiceQty": "0",
"HRemark": ""
@@ -1238,11 +1238,6 @@
return false;
}
- if ($("#HCusID").val() == "0") {
- layer.msg("瀹㈡埛鏈�夋嫨!");
- return false;
- }
-
if ($("#HEmpID").val() == "0") {
layer.msg("閿�鍞憳鏈�夋嫨!");
return false;
@@ -1253,8 +1248,17 @@
return false;
}
- if ($("#HMangerID").val() == "0") {
- layer.msg("閿�鍞富绠℃湭閫夋嫨!");
+ temp = $("HExRate").val() + "";
+ if (temp == 0 || temp == "") {
+ layer.msg("姹囩巼涓嶈兘涓�0鎴栫┖!");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("姹囩巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return false;
+ }
+
+ if ($("#HCusID").val() == "0") {
+ layer.msg("瀹㈡埛鏈�夋嫨!");
return false;
}
@@ -1262,6 +1266,18 @@
layer.msg("缁撶畻鏂瑰紡鏈�夋嫨!");
return false;
}
+
+ if ($("#HSellSID").val() == "0") {
+ layer.msg("閿�鍞柟寮忔湭閫夋嫨!");
+ return false;
+ }
+
+ if ($("#HMangerID").val() == "0") {
+ layer.msg("閿�鍞富绠℃湭閫夋嫨!");
+ return false;
+ }
+
+
//if ($("#HPayCusID").val() == "0") {
// layer.msg("缁撶畻鏂规湭閫夋嫨!");
@@ -1273,14 +1289,7 @@
// return false;
//}
- temp = $("HExRate").val() + "";
- if (temp == 0 || temp == "") {
- layer.msg("姹囩巼涓嶈兘涓�0鎴栫┖!");
- return false;
- } else if (!ref.test(temp)){
- layer.msg("姹囩巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
- return false;
- }
+
//#endregion
//#region 瀛愯〃 鏁版嵁妫�楠�
@@ -1292,11 +1301,6 @@
if (option.data[i]["HUnitID"] == "0") {
layer.msg("绗�" + i + "琛岋細璁￠噺鍗曚綅鏈�夋嫨锛�");
- return false;
- }
-
- if (option.data[i]["HDate"] == "") {
- layer.msg("绗�" + i + "琛岋細浜よ揣鏃ユ湡涓嶈兘涓虹┖锛�");
return false;
}
@@ -1320,6 +1324,16 @@
return false;
}
+ //绋庣巼鏍煎紡鏍￠獙
+ temp = option.data[i]["HTaxRate"] + "";
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細绋庣巼涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細绋庣巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+
//鍚◣鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HTaxPrice"] + "";
if (temp == "0") {
@@ -1339,6 +1353,27 @@
layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
}
+
+ //浠风◣鍚堣鏍煎紡鏍￠獙
+ temp = option.data[i]["HlineTotal"] + "";
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+
+ if (option.data[i]["HDate"] == "") {
+ layer.msg("绗�" + i + "琛岋細浜よ揣鏃ユ湡涓嶈兘涓虹┖锛�");
+ return false;
+ }
+
+
+
+
+
+
////鎶樻墸鐜囨牸寮忔牎楠�
//temp = option.data[i]["HDiscountRate"] + "";
@@ -1360,35 +1395,19 @@
// return false;
//}
- //绋庣巼鏍煎紡鏍￠獙
- temp = option.data[i]["HTaxRate"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細绋庣巼涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細绋庣巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
+
//绋庨鏍煎紡鏍￠獙
- temp = option.data[i]["HTaxMoney"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細绋庨涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細绋庨璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
+ //temp = option.data[i]["HTaxMoney"] + "";
+ //if (temp == "0") {
+ // layer.msg("绗�" + i + "琛岋細绋庨涓嶈兘涓�0锛�");
+ // return false;
+ //} else if (!ref.test(temp)) {
+ // layer.msg("绗�" + i + "琛岋細绋庨璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ // return false;
+ //}
- //浠风◣鍚堣鏍煎紡鏍￠獙
- temp = option.data[i]["HlineTotal"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
+
////鏈綅甯佷环绋庡悎璁℃牸寮忔牎楠�
//temp = option.data[i]["HlineTotalBB"] + "";
--
Gitblit v1.9.1