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/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 115 +++++++++----
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 51 +++++-
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 32 ++-
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 82 ++++------
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 9
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 99 ++++++------
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 83 +++++++++
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 2
9 files changed, 312 insertions(+), 165 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7078c95..78cc31c 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,8 +8,8 @@
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
/* var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�*/
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
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index e5c77e0..c55b9cc 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -1196,6 +1196,11 @@
//#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;
@@ -1787,8 +1792,8 @@
"HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
"HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅,
"HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
- "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�, "HWHID": checkStatus.data[j].HWHID,
- "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
+ "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�,
+ "HWHID": checkStatus.data[j].HWHIDSub,"鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
"HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
})
j++;
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 7891a13..761cb10 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -393,7 +393,7 @@
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
- window.OptionData = {};
+ window.OptionData = [];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1402";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -704,7 +704,8 @@
,"HWHID": "0"
, "鍙戣揣浠撳簱": ""
, "HQty": checkStatus.data[i].鏁伴噺,
- "HPrice": "0", "HMoney": "0", "HRemark": ""
+ "HPrice": checkStatus.data[i].鍗曚环,
+ "HMoney": checkStatus.data[i].閲戦, "HRemark": ""
, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
, "HSourceBillType": checkStatus.data[i].HBillType
@@ -814,8 +815,8 @@
, "HEmpName": data.涓氬姟鍛�
, "HCusID": data.HCusID
, "HCusName": data.瀹㈡埛
- , "HWHID": data.HWHID
- , "HWHName": data.鍙戣揣浠撳簱
+ , "HWHID": data.涓讳粨搴揑D
+ , "HWHName": data.涓诲彂璐т粨搴�
, "HAddress": data.浜よ揣鍦板潃
, "HDeptName": data.閮ㄩ棬
, "HDeptID": data.HDeptID
@@ -1061,6 +1062,20 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
})
}
//璁￠噺鍗曚綅
@@ -1073,7 +1088,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1089,6 +1104,16 @@
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1121,10 +1146,13 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (typeof (OptionData.HItemID) != "undefined") {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1160,7 +1188,7 @@
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1282,7 +1310,7 @@
, area: ['90%', '90%']//澶у皬
, title: '涓荤鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1300,7 +1328,7 @@
//椤圭洰浠ｇ爜
function get_checkSearchHProNumber() {
- var HOrgID = $("#HOrgID").val();
+ var HOrgID = sessionStorage["OrganizationID"];
//鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
layer.open({
type: 2
@@ -1373,29 +1401,29 @@
//浠ヤ笂鏄痩ayui妯″潡
});
// 鍩虹璧勬枡杩斿洖鏁版嵁
- //function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
- //{
- // $("#HEmpName").val(obj[0].HName);
- // $("#HEmpID").val(obj[0].HItemID);
- //}
+ function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
+ {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
- //function GetHSupValue(obj) //杩斿洖瀹㈡埛
- //{
- // $("#HCusName").val(obj[0].HName);
- // $("#HCusID").val(obj[0].HItemID);
- //}
+ function GetHCusNameValue(obj) //杩斿洖瀹㈡埛
+ {
+ $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
+ $("#HCusID").val(obj[0].HItemID);
+ }
- //function GetHManagerValue(obj) //杩斿洖涓荤
- //{
- // $("#HManagerName").val(obj[0].HName);
- // $("#HManagerID").val(obj[0].HItemID);
- //}
+ function GetHManagerValue(obj) //杩斿洖涓荤
+ {
+ $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
- //function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
- //{
- // $("#HDeptName").val(obj[0].HName);
- // $("#HDeptID").val(obj[0].HItemID);
- //}
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
//椤圭洰浠ｇ爜
function GetProjectBillValue(obj) {
@@ -1407,11 +1435,6 @@
} else {
layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
}
- }
-
- //鍙屽嚮杩斿洖浠撳簱
- function GetHWHSubValue(data) {
- OptionData = data[0]
}
function GetHWHValue(obj) //杩斿洖浠撳簱
@@ -1428,6 +1451,24 @@
}
layui.table.render(option);
}
+
+ //鍙屽嚮杩斿洖浠撳簱
+ function GetHWHSubValue(data) {
+ OptionData = data[0]
+ }
+
+ function GetGyMaterial(obj) //鐗╂枡鍚嶇О
+ {
+ OptionData = obj;
+ }
+
+ function GetAuxiliaryUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ OptionData = obj[0];
+ }
+
+
+
</script>
</body>
</html>
\ No newline at end of file
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 66e5a06..eff8284 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"
@@ -169,7 +169,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁撶畻鏂瑰紡</label>
<div class="layui-input-inline">
<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -346,7 +346,7 @@
var allVal;
var HModName = "Xs_ReceivableBill";
-
+ window.OptionData = [];
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
@@ -1758,7 +1758,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1772,13 +1772,27 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
, "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1792,7 +1806,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1804,10 +1818,20 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -2425,6 +2449,15 @@
$("#HSSName").val(obj[0].HName);
$("#HSSID").val(obj[0].HItemID);
}
+ function GetGyMaterial(obj) //鐗╂枡鍚嶇О
+ {
+ OptionData = obj;
+ }
+
+ function GetAuxiliaryUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ OptionData = obj[0];
+ }
//#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
function dealDoubleToFixed(data, num) {
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 7a6d65a..e37911a 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"
@@ -91,7 +91,7 @@
<div class="layui-inline">
<label class="layui-form-label">閿�鍞憳</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -245,7 +245,7 @@
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -1243,7 +1243,7 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;', edit: 'text', event:"HUnitID" }//f7
, { field: 'HRemark_TL', title: '鎶曟枡', width: 100, edit: 'text' }
, { field: 'HRemark_SJG', title: '娣卞姞宸�', width: 100, edit: 'text' }
, { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
@@ -1943,6 +1943,7 @@
//#region 瀛愯〃 鏁版嵁妫�楠�
var RowCount = 0;
for (var i = 0; i < option.data.length; i++) {
+
if (option.data[i]["HMaterID"] == "0") {
continue;
}
@@ -2552,10 +2553,6 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- //if (checkStatus.data.length != 1) {
- // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- //}
-
var rowIndex = $(obj.tr).attr("data-index") * 1;
for (var i = 0; i < checkStatus.data.length; i++) {
if (rowIndex + i >= option.data.length) {
@@ -2650,7 +2647,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2708,10 +2705,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWHID": HDataEmp.HItemID
+ , "浠撳簱": HDataEmp.浠撳簱鍚嶇О
+ })
+ HDataEmp = {};
+ }
}
})
@@ -3471,7 +3472,7 @@
function GetHManagerValue(obj) //杩斿洖涓荤
{
- $("#HManagerName").val(obj[0].HName);
+ $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HManagerID").val(obj[0].HItemID);
}
@@ -3493,12 +3494,12 @@
$("#HSellSID").val(obj[0].HItemID);
}
- function GetMaterValue(obj) //鐗╂枡鍚嶇О
+ function GetGyMaterial(obj) //鐗╂枡鍚嶇О
{
- HDataEmp = obj[0];
+ HDataEmp = obj;
}
- function GetUnitValue(obj) //璁￠噺鍗曚綅
+ function GetAuxiliaryUnitValue(obj) //璁￠噺鍗曚綅
{
HDataEmp = obj[0];
}
@@ -3507,6 +3508,39 @@
{
HDataEmp = obj[0];
}
+
+ //椤圭洰浠ｇ爜
+ function GetProjectBillValue(obj) {
+ if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
+ $("#HProjectID").val(obj[0].HInterID);
+ $("#HProjectNumber").val(obj[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
+ }
+
+ //鍙屽嚮杩斿洖浠撳簱
+ function GetHWHSubValue(data) {
+ HDataEmp = data[0]
+ }
+
+ function GetHWHValue(obj) //杩斿洖浠撳簱
+ {
+ $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+ $("#HWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
+ option.data[i]["HWHID"] = obj[0].HItemID;
+ option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
+ }
+
//#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
function getCustomerByCusID(HCusID) {
@@ -3626,38 +3660,7 @@
}
//#endregion
- //椤圭洰浠ｇ爜
- function GetProjectBillValue(obj) {
- if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
- $("#HProjectID").val(obj[0].HInterID);
- $("#HProjectNumber").val(obj[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
- $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
-
- } else {
- layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
- }
- }
-
- //鍙屽嚮杩斿洖浠撳簱
- function GetHWHSubValue(data) {
- OptionData = data[0]
- }
-
- function GetHWHValue(obj) //杩斿洖浠撳簱
- {
- $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
- $("#HWHID").val(obj[0].HItemID);
- if (option.data.length > 0) {
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
- option.data[i]["HWHID"] = obj[0].HItemID;
- option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
- }
- }
- }
- layui.table.render(option);
- }
-
+
//#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
function dealDoubleToFixed(data, num) {
//鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 74d119e..4f99838 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -517,6 +517,9 @@
//鍒濆鍖栧瓙琛�
set_InitGrid();
+ //鍔ㄦ�佽幏鍙栨簮鍗�
+ HBillType();
+
//#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
if (OperationType == 1) { //鏃犳簮鍗曟柊澧�
/* $("#HItemID").val(0);*/
@@ -558,9 +561,6 @@
//鍒濆鍖栫粍缁�
Organ();
-
- //鍔ㄦ�佽幏鍙栨簮鍗�
- HBillType();
//#region 椤甸潰鍒濆鍖栧悗锛屾牴鎹鎴疯幏鍙栧鎴蜂綑棰�
getCustomerBalance($("#HSupID").val());
@@ -1817,7 +1817,7 @@
});
HOrgIDBar = data.HSTOCKORGID == null ? 0 : data.HSTOCKORGID;
-
+ $("#BillType").val(data.HMainSourceBillType);
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < result.data.length; i++) {
@@ -2119,6 +2119,11 @@
//#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;
@@ -2327,10 +2332,13 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (typeof (HDataTemp.HItemID) != "undefined") {
+ obj.update({
+ "HWHID": HDataTemp.HItemID
+ , "鍙戣揣浠撳簱": HDataTemp.浠撳簱鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -3183,17 +3191,17 @@
layui.table.render(option);
}
- function GetMaterValue(obj) //鐗╂枡鍚嶇О
+ function GetGyMaterial(obj) //鐗╂枡鍚嶇О
{
- HDataTemp = obj[0];
+ HDataTemp = obj;
}
function GetUnitValue(obj) //璁￠噺鍗曚綅
{
HDataTemp = obj[0];
}
-
- function GetHSubWHValue(obj) //瀛愯〃鍙戣揣浠撳簱
+
+ function GetHWHSubValue(obj) //瀛愯〃鍙戣揣浠撳簱
{
HDataTemp = obj[0];
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 506de7f..f0bd441 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -405,7 +405,7 @@
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200, sort: true }
, { field: '浠舵暟', title: '浠舵暟', totalRow: true, width: 200, sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', totalRow: true, width: 200, sort: true }
- //, { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
+ , { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
, { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true}
, { field: '绋庣巼', title: '绋庣巼', width: 200, sort: true, totalRow: true }
, { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 200, sort: true, totalRow: true }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index e8dd74f..f57a262 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -880,7 +880,7 @@
, "HSupName": data.渚涘簲鍟�
, "HEmpID": data.HEmpID
, "HEmpName": data.涓氬姟鍛�
- , "HWHID": data.HWHID
+ , "HWHID": data.涓昏〃浠撳簱ID
, "HWHName": data.涓昏〃浠撳簱
, "HSecManagerID": data.HSecManagerID
, "HSecManagerName": data.楠屾敹鍛�
@@ -1839,10 +1839,9 @@
for (var i = 0; i < checkStatus.data.length; i++) {
option.data.push({
"HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
- "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅,"HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
- "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,
- "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
- "HMoney": checkStatus.data[j].閲戦,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
+ "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
+ "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,"HMoney": checkStatus.data[j].閲戦,
"HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
"HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": checkStatus.data[j].浠风◣鍚堣
})
@@ -2028,6 +2027,10 @@
//#region 淇濆瓨鏂规硶鏍￠獙
function AllowLoadData(data) {
+
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
if ($("#HWHID").val() == 0) {
layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -2064,6 +2067,76 @@
layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ //#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;
+ }
+
+ if (option.data[i]["HUnitID"] == "0") {
+ layer.msg("绗�" + (i + 1) + "琛岋細璁￠噺鍗曚綅鏈�夋嫨锛�");
+ return false;
+ }
+
+ //瀹炲彂鏁伴噺鏍煎紡鏍￠獙
+ temp = option.data[i]["HQty"] + "";
+ 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]["HPrice"] + "";
+ 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]["HTaxPrice"] + "";
+ 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]["HTaxRate"] + "";
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ 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;
+ }
+ //鏀舵枡浠撳簱闈炵┖楠岃瘉
+ if (option.data[i]["HWHID"] == "0") {
+ layer.msg("绗�" + (i + 1) + "琛岋細鏀舵枡浠撳簱鏈�夋嫨锛�");
+ return false;
+ }
+ }
+ //#endregion
return true;
}
--
Gitblit v1.9.1