From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
index 5e20cc2..f7d939f 100644
--- a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
+++ b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
@@ -61,6 +61,16 @@
return customColSpanProps(index)
},
},
+ {
+ title: '搴撲綅绫诲瀷',
+ dataIndex: 'type',
+ width: 110,
+ ellipsis: true,
+ ...getColumnSearchProps('type'),
+ customCell: (_, index) => {
+ return customColSpanProps(index)
+ },
+ }
];
const state = reactive({
@@ -102,11 +112,10 @@
tmp.push({
title: formatMessage('db.man_order_detl.anfme', '鏁伴噺'),
dataIndex: 'anfme',
- width: 140,
+ width: 60,
ellipsis: true,
fixed: 'right',
})
-
tmp.push({
title: formatMessage('db.man_order_detl.locNo', '鍑哄簱搴撲綅'),
dataIndex: 'locNo',
@@ -243,20 +252,20 @@
tableDataTmp.push(dataTmp);
}
- if (isused > 0) {
- let dataTmp = JSON.parse(JSON.stringify(item));
- dataTmp.locId = null;
- dataTmp.locNo = null;
- dataTmp.locDetlId = null;
- dataTmp.typeId = item.typeId;
- dataTmp.workQty = item.workQty;
- dataTmp.anfme = isused;
- dataTmp.key = idx;
- dataTmp.operationPort = defaultOperationPort;
+ // if (isused > 0) {
+ // let dataTmp = JSON.parse(JSON.stringify(item));
+ // dataTmp.locId = null;
+ // dataTmp.locNo = null;
+ // dataTmp.locDetlId = null;
+ // dataTmp.typeId = item.typeId;
+ // dataTmp.workQty = item.workQty;
+ // dataTmp.anfme = isused;
+ // dataTmp.key = idx;
+ // dataTmp.operationPort = defaultOperationPort;
- tableDataTmp.push(dataTmp);
- count++;
- }
+ // tableDataTmp.push(dataTmp);
+ // count++;
+ // }
}
colSpan[idx] = count;
--
Gitblit v1.9.1