From 7786552f47c9fbc3d233321e5484ef33da116e6a Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 13 三月 2021 10:38:33 +0800
Subject: [PATCH] 1.0.3 pda关联组托-隐藏物料名称，改为显示生成单号
---
src/main/webapp/views/pda/combPro.html | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index c79f993..0792161 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -135,7 +135,8 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', event: 'warehouse', style: 'cursor: pointer;color: blue'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'warehouse', align: 'center', title: '鐢熸垚鍗曞彿'}
+// {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
}
@@ -198,7 +199,7 @@
for (var i=0;i<data.length;i++) {
var toPush = true;
for (var j=0;j<matData.length;j++){
- if (data[i].matNo === matData[j].matNo) {
+ if (data[i].matNo === matData[j].matNo && data[i].warehouse === matData[j].warehouse) {
matData[j].count = Number(matData[j].count) + Number(data[i].count);
toPush = false;
}
--
Gitblit v1.9.1