From 99d50244a4b233cd882bd8a20f20b7993d3011fd Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 19 三月 2026 17:01:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 6 ++-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 12 +++---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 8 +++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillEdit.html | 45 ++++++++++++----------
4 files changed, 41 insertions(+), 30 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
index 1a37a9d..44a05e3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
@@ -1712,7 +1712,7 @@
async: false,
data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.count>0) {
data = data1.data
}
},
@@ -1743,28 +1743,31 @@
},
done: function (elem, data) {
$(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
- obj.update({
- "HMaterID": data.data[0]["hmainid"]
- , "HMaterCode": data.data[0]["妯″叿缂栧彿"]
- , "HMaterName": data.data[0]["妯″叿鍚嶇О"]
+ if (typeof (OptionData) != "undefined" && OptionData != []) {
+ obj.update({
+ "HMaterID": OptionData["hmainid"]
+ , "HMaterCode": data.data[0]["妯″叿缂栧彿"]
+ , "HMaterName": data.data[0]["妯″叿鍚嶇О"]
- , "HMaterSpec": data.data[0]["妯″叿鍨嬪彿"]
- , "HUnitID": data.data[0]["HUnitID"]
- , "HUnitCode": data.data[0]["璁￠噺鍗曚綅浠ｇ爜"]
- , "HUnitName": data.data[0]["璁￠噺鍗曚綅"]
- , "HWHID": data.data[0]["HWHID"]
- , "HWHName": data.data[0]["榛樿浠撳簱"]
- , "HWHCode": data.data[0]["榛樿浠撳簱浠ｇ爜"]
- , "HSPID": data.data[0]["HSPID"]
- , "HSPName": data.data[0]["榛樿浠撲綅"]
- , "HSPCode": data.data[0]["妯″叿鍚嶇О"]
- , "HDesignLife": 0
- , "HLeaveLife": 0
- , "HQty": 1
- , "HMoney": 0
- })
+ , "HMaterModel": data.data[0]["妯″叿鍨嬪彿"]
+ , "HUnitID": data.data[0]["HUnitID"]
+ , "HUnitNumber": data.data[0]["璁￠噺鍗曚綅浠ｇ爜"]
+ , "HUnitName": data.data[0]["璁￠噺鍗曚綅"]
+ , "HWHID": data.data[0]["HWHID"]
+ , "HWHName": data.data[0]["榛樿浠撳簱"]
+ , "HWHNumber": data.data[0]["榛樿浠撳簱浠ｇ爜"]
+ , "HSPID": data.data[0]["HSPID"]
+ , "HSPName": data.data[0]["榛樿浠撲綅"]
+ , "HSPNumber": data.data[0]["妯″叿鍚嶇О"]
+ , "HDesignLife": 0
+ , "HLeaveLife": 0
+ , "HQty": 1
+ , "HMoney": 0
+ })
- table.render(option);
+ table.render(option);
+ }
+
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index c39e8db..8b7307f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -1526,6 +1526,7 @@
searchKey: '妯″叿鍚嶇О,妯″叿缂栧彿',
sWhere: " ",//table鎼滅储sWhere鏉′欢
ajaxSelect: function (sWhere) {
+ console.log("sWhere", sWhere)
var data = '';
var ModRightNameSelect = 'Gy_MouldFileList';
$.ajax({
@@ -1534,7 +1535,7 @@
async: false,
data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page":1, "size": 5},
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.count >0) {
data = data1.data
}
},
@@ -1580,6 +1581,11 @@
, "HSPID": data.data[0]["HSPID"]
, "HSPName": data.data[0]["榛樿浠撲綅"]
, "HSPCode": data.data[0]["妯″叿鍚嶇О"]
+
+ , "HDesignLife": 0
+ , "HLeaveLife": 0
+ , "HQty": 1
+ , "HMoney": 0
})
table.render(option);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index e7c0d1b..9e4a31c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -1713,7 +1713,7 @@
async: false,
data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.count > 0) {
data = data1.data
}
},
@@ -1746,19 +1746,19 @@
$(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
obj.update({
"HMaterID": data.data[0]["hmainid"]
- , "HMaterCode": data.data[0]["妯″叿缂栧彿"]
+ , "HMaterNumber": data.data[0]["妯″叿缂栧彿"]
, "HMaterName": data.data[0]["妯″叿鍚嶇О"]
- , "HMaterSpec": data.data[0]["妯″叿鍨嬪彿"]
+ , "HMaterModel": data.data[0]["妯″叿鍨嬪彿"]
, "HUnitID": data.data[0]["HUnitID"]
- , "HUnitCode": data.data[0]["璁￠噺鍗曚綅浠ｇ爜"]
+ , "HUnitNumber": data.data[0]["璁￠噺鍗曚綅浠ｇ爜"]
, "HUnitName": data.data[0]["璁￠噺鍗曚綅"]
, "HWHID": data.data[0]["HWHID"]
, "HWHName": data.data[0]["榛樿浠撳簱"]
- , "HWHCode": data.data[0]["榛樿浠撳簱浠ｇ爜"]
+ , "HWHNumber": data.data[0]["榛樿浠撳簱浠ｇ爜"]
, "HSPID": data.data[0]["HSPID"]
, "HSPName": data.data[0]["榛樿浠撲綅"]
- , "HSPCode": data.data[0]["妯″叿鍚嶇О"]
+ , "HSPNumber": data.data[0]["榛樿浠撲綅浠ｇ爜"]
, "HDesignLife": 0
, "HLeaveLife": 0
, "HQty": 1
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index 247ae4b..6943659 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -817,7 +817,7 @@
async: false,
data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.count > 0) {
data = data1.data
}
},
@@ -869,7 +869,7 @@
, "HMoney": 0
})
- table.render(option);
+ //table.render(option);
@@ -1801,9 +1801,11 @@
}
});
}
+
obj.event = "";
return false;
}
+
})
//鍙屽嚮
$('.layui-table-box tbody td[data-field="HMaterCode"]').off('dblclick').on('dblclick', function () {
--
Gitblit v1.9.1