From ebef191888d9d2c2a2e7a7f677189164e4eef0b3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 05 八月 2025 19:04:33 +0800
Subject: [PATCH] 车间委外接收单列表bug处理
---
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html | 61 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 26 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index ccf1bac..8a5d91e 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -884,14 +884,15 @@
if (HSourceBillData == null) {
layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
- } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
- var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
- layer.alert(err, { icon: 5 });
- return;
- } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
- return;
}
+ //else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
+ // var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ // layer.alert(err, { icon: 5 });
+ // return;
+ //} else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+ // layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ // return;
+ //}
} else {
return;
}
@@ -987,16 +988,16 @@
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HWHID": dataArray[i].HWHID
- , "閫�鏂欎粨搴�": dataArray[i].閫�鏂欎粨搴�
+ , "閫�鏂欎粨搴�": dataArray[i].浠撳簱
, "HSPID": dataArray[i].HSPID
, "浠撲綅鍚嶇О": dataArray[i].浠撲綅鍚嶇О
, "HSecUnitID": dataArray[i].HSecUnitID
, "杈呭姪鍗曚綅": dataArray[i].杈呭姪鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': dataArray[i].鎶樻墸鐜� //
- , 'HRelTaxPrice': "0"
+ /*, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)*/
+ /*, 'HDiscountRate': dataArray[i].鎶樻墸鐜�*/ //
+ /*, 'HRelTaxPrice': "0"*/
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': dataArray[i].绋庨 //
, "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -1021,7 +1022,8 @@
);
}
option.data = rowdata;
- table.render(option);
+ table.render(option);
+ OperationType = 1;//璁剧疆鎿嶄綔绫诲瀷涓烘柊澧�
}
//#endregion
@@ -1053,10 +1055,10 @@
layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HManagerName").val() == 0) {
- layer.msg("璇烽�夋嫨涓荤锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HManagerName").val() == 0) {
+ // layer.msg("璇烽�夋嫨涓荤锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
//瀛愯〃鏁版嵁妫�楠岀畝鍗曡〃鍗曢獙璇�
//鍚庣画鍙敤澶氫釜鏁扮粍瀛樺偍鍒楀悕鎵╁睍
for (var i = 0; i < option.data.length; i++) {
@@ -1065,7 +1067,7 @@
}
var rowData = option.data[i];
for (var col of Object.keys(rowData)) {
- if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
+ if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col == "HUnitID")) {
layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�");
return;
}
@@ -1516,7 +1518,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=Warehouse', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1533,12 +1535,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "閫�鏂欎粨搴�": OptionData.浠撳簱鍚嶇О
- })
- }
+ , end: function () {
+ if (typeof (OptionData[0].HItemID) != undefined) {
+ obj.update({
+ "HWHID": OptionData[0].HItemID
+ , "閫�鏂欎粨搴�": OptionData[0].浠撳簱鍚嶇О
+ })
+ }
+ OptionData = "";
+ }
})
}
//閫�鏂欎粨浣�
@@ -1740,7 +1745,7 @@
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex === '0') {
+ if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
obj.del();
@@ -2109,7 +2114,11 @@
$("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HManagerID").val(obj[0].HItemID);
}
-
+ function GetGyCur(obj) {
+ $("#HCurName").val(obj.璐у竵鍚嶇О);
+ $("#HCurID").val(obj.HItemID);
+ $("#HExRate").val(obj.姹囩巼);
+ }
//鍙屽嚮杩斿洖鐗╂枡
function GetGyMaterial(data) {
OptionData = data
--
Gitblit v1.9.1