From 9ed06659f63a988a5cfb3a2afb36d95b60c4a5b0 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 28 五月 2024 16:41:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
index aba8340..6a61969 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
@@ -902,7 +902,7 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
-
+ //琛ㄥ崟鏁版嵁妫�楠�
if ($("#HCurID").val() == 0) {
layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -927,6 +927,28 @@
layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ //瀛愯〃鏁版嵁绠�鍗曟楠�
+ //鍚庣画鍙敤澶氫釜鏁扮粍瀛樺偍鍒楀悕鏉ユ墿灞�
+ 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; // 璺宠繃闈炲璞￠」锛堝绌烘暟缁勶級
+ }
+ var rowData = option.data[i];
+ var rowData2 = option2.data[i];
+ for (var col of Object.keys(rowData)) {
+ if (rowData[col] == "0" && col !="LAY_TABLE_INDEX") {
+ layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�");
+ return;
+ }
+ }
+ for (var col of Object.keys(rowData2)) {
+ if (rowData2[col] == "0" && col != "LAY_TABLE_INDEX") {
+ layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�");
+ return;
+ }
+ }
+ }
+
//鐗╂枡鏄庣粏
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -1071,21 +1093,20 @@
OptionData = checkStatus.data[0];
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HUnitID": checkStatus.data[0].HItemID
- , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ "HUnitID": OptionData[0].HItemID
+ , "璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
})
}
})
}
- //璐у竵(TODO 鏈塨ug鍦ㄥ脊鍑烘鎺掑簭浠ュ悗纭畾锛岄�変腑鍏冪礌杩樻槸鍘熸潵浣嶇疆鐨勶紙闇�瑕佸湪璐у竵璧勬枡涓庤閲忓崟浣嶈祫鏂欎腑璁剧疆鎺掑簭浠ｇ爜濡傜墿鏂欓〉闈級)
- //TODO 涓庤揣甯佸拰璁￠噺鍗曚綅鍘熼〉闈㈤渶瑕佽缃弻鍑讳簨浠�
+ //璐у竵
if (obj.event == "HCurID") {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1356,7 +1377,8 @@
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
function GetUnitValue(data) {
- OptionData = data
+ OptionData = data;
+
}
//鍙屽嚮杩斿洖鐗╂枡
--
Gitblit v1.9.1