From b8944b950c7bbfbbb5ae729ba9b83d107890d6c4 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 08 五月 2024 16:08:08 +0800
Subject: [PATCH] 1.采购:收料通知单,应付单 编辑时,如果3条子表数据删除某一条子表行后,进行时保存,保存校验报错 2.销售:2.1发货通知单 选源单后,子表 单价 金额 进行赋值,子表 按F7时 增加 物料,计量单位,发货仓库双击返回 2.2应收单 子表按F7增加 物料 计量单位 双击返回 2.3 销售订单 修复 子表 计量单位 仓库 双击返回 2.4 销售出库单 子表F7 增加发货仓库 双击返回
---
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 82 ++++++++++++++++------------------------
1 files changed, 33 insertions(+), 49 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 de75887..f3e55b1 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"
@@ -1453,7 +1453,7 @@
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, 'HDiscountRate': dataArray[i].鎶樻墸鐜� //
- , 'HRelTaxPrice': dataArray[i].瀹為檯鍚◣鍗曚环
+ , 'HRelTaxPrice': dataArray[i].瀹為檯鍚◣鍗曚环
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': dataArray[i].绋庨 //
, "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -1530,7 +1530,7 @@
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dataArray[i].鍚◣鍗曚环
+ , "HTaxPrice": dataArray[i].鍚◣鍗曚环
, 'HDiscountRate': dataArray[i].鎶樻墸鐜� //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
@@ -1643,14 +1643,33 @@
layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
- if ($("#HSupID").val() == "0") {
- layer.msg("渚涘簲鍟嗘湭閫夋嫨!");
- return false;
+ if ($("#HCurID").val() == 0) {
+ layer.msg("璇烽�夋嫨甯佸埆锛�");
+ return;
}
-
- if ($("#HCurID").val() == "0") {
- layer.msg("甯佸埆鏈�夋嫨!");
- return false;
+ if ($("#HExRate").val() == 0) {
+ layer.msg("璇疯緭鍏ユ眹鐜囷紒");
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�");
+ return;
+ }
+ if ($("#HDeptID").val() == 0) {
+ layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�");
+ return;
+ }
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒");
+ return;
+ }
+ if ($("#HPSStyleID").val() == 0) {
+ layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�");
+ return;
+ }
+ if ($("#HSSID").val() == 0) {
+ layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�");
+ return;
}
temp = $("#HExRate").val() + "";
@@ -1665,6 +1684,9 @@
//#region 瀛愯〃 鏁版嵁妫�楠�
for (var i = 0; i < option.data.length; i++) {
+ if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+ continue; // 璺宠繃闈炲璞￠」锛堝绌烘暟缁勶級
+ }
if (option.data[i]["HMaterID"] == "0") {
layer.msg("绗�" + (i+1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
return false;
@@ -1729,12 +1751,6 @@
return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
-
- //鍙戣揣浠撳簱闈炵┖楠岃瘉
- if (option.data[i]["HWHID"] == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
return false;
}
}
@@ -2242,6 +2258,7 @@
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
@@ -2353,40 +2370,7 @@
}
//#endregion
- //#region 淇濆瓨鏂规硶鏍￠獙
- function AllowLoadData(data) {
- if ($("#HCurID").val() == 0) {
- layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HExRate").val() == 0) {
- layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HEmpID").val() == 0) {
- layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HDeptID").val() == 0) {
- layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HSupID").val() == 0) {
- layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HPSStyleID").val() == 0) {
- layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HSSID").val() == 0) {
- layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- return true;
- }
-
- //endregion
+
//#endregion
--
Gitblit v1.9.1