From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
index c40dcfe..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',
@@ -212,8 +221,8 @@
dataTmp.locNo = null;
dataTmp.locDetlId = null;
dataTmp.anfme = item.anfme;
- dataTmp.typeId = val.typeId;
- dataTmp.workQty = val.workQty;
+ dataTmp.typeId = item.typeId;
+ dataTmp.workQty = item.workQty;
dataTmp.key = idx;
dataTmp.operationPort = defaultOperationPort;
@@ -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 = val.typeId;
- dataTmp.workQty = val.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;
@@ -344,10 +353,12 @@
<template #bodyCell="{ column, text, record, index }">
<template v-if="column.dataIndex === 'locNo'">
<div v-if="record.locId != null && record.anfme > 0">
- <!-- <a-tag color="green">{{ record.locNo }}</a-tag> -->
- <a-select v-model:value="record.locId" :options="record.otherLocs"
+<!-- <a-tag color="green">{{ record.locNo }}</a-tag>-->
+ <a-select v-model:value="record.locNo" :options="record.otherLocs"
:fieldNames="{ label: 'locNo', value: 'locId' }"
- @change="handleOtherLocChange(index, record)"></a-select>
+ @change="handleOtherLocChange(index, record)">
+
+ </a-select>
</div>
<div v-else>
<a-tag color="red">搴撳瓨涓嶈冻</a-tag>
--
Gitblit v1.9.1