From 3b935e81064d96ca76089f00558a3c25a34c7203 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 03 十二月 2024 10:33:11 +0800
Subject: [PATCH] 应收单：子表数量改为 输入不为0的数字
---
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 59 +++++++++++++++++------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
2 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 782a536..ec21672 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -6943,7 +6943,7 @@
<publishTime>11/17/2023 14:59:01</publishTime>
</File>
<File Include="views/閿�鍞鐞�/搴旀敹鍗�/Xs_ReceivableBill.html">
- <publishTime>12/02/2024 15:15:02</publishTime>
+ <publishTime>12/03/2024 10:29:49</publishTime>
</File>
<File Include="views/閿�鍞鐞�/搴旀敹鍗�/Xs_ReceivableBillList.html">
<publishTime>12/02/2024 15:15:02</publishTime>
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 1da4aa0..acc2a0a 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"
@@ -1023,6 +1023,7 @@
table.on('edit(mainTable)', function (obj) {
//鏁板�兼牸寮忔牎楠屽伐鍏�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var ref1 = /^-?\d+(\.\d+)?$/; //鍒ゆ柇瀛楃涓叉槸鍚︿负鏁板瓧(鍖呭惈鏁存暟銆佹诞鐐规暟)锛屾鍒欒〃杈惧紡
var temp = "";
var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
@@ -1039,14 +1040,23 @@
case "HQty": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp) || temp == 0) {
+ if (!ref1.test(temp)) {
//鎭㈠鏁版嵁鍒扮紪杈戝墠
obj.update({
HQty: oldText
});
table.render(option);
- layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ layer.msg("鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛�!");
+ return;
+ } else if (temp * 1 == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛�!");
return;
}
@@ -2680,6 +2690,7 @@
function AllowLoadData(data) {
//鏁板�兼牸寮忔牎楠屽伐鍏�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var ref1 = /^-?\d+(\.\d+)?$/; //鍒ゆ柇瀛楃涓叉槸鍚︿负鏁板瓧(鍖呭惈鏁存暟銆佹诞鐐规暟)锛屾鍒欒〃杈惧紡
var temp = "";
//#region 琛ㄥご鏁版嵁妫�楠�
@@ -2742,11 +2753,11 @@
//瀹炲彂鏁伴噺鏍煎紡鏍￠獙
temp = option.data[i]["HQty"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺涓嶈兘涓�0锛�");
+ if (!ref1.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒");
return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ } else if (temp * 1 == 0) {
+ layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒");
return false;
}
@@ -2777,26 +2788,26 @@
return false;
}
- //閲戦鏍煎紡鏍￠獙
- temp = option.data[i]["HMoney"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
-
- //绋庨鏍煎紡鏍￠獙
- temp = option.data[i]["HTaxMoney"] + "";
+ ////閲戦鏍煎紡鏍￠獙
+ //temp = option.data[i]["HMoney"] + "";
//if (temp == "0") {
- // layer.msg("绗�" + (i + 1) + "琛岋細绋庨涓嶈兘涓�0锛�");
+ // layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
// return false;
- //} else
- if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細绋庨璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
- return false;
- }
+ //} else if (!ref.test(temp)) {
+ // layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ // 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鐨勬暟瀛楋紒");
+ // return false;
+ //}
//鍙戣揣浠撳簱闈炵┖楠岃瘉
if (option.data[i]["HWHID"] == "0") {
--
Gitblit v1.9.1