From 33b5b3d2fb2b41cdce6e4cb783f27ee70ad3afb8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 18:10:16 +0800
Subject: [PATCH] 生成出库单功能优化
---
zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
index f7d939f..e5b98f8 100644
--- a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
+++ b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
@@ -174,17 +174,37 @@
list: tableData.value
};
- post('/api/out/orderOut/merge/wave', requestParam).then((resp) => {
- let result = resp.data;
- if (result.code == 200) {
- message.success(formatMessage('page.add.success', '鍑哄簱鎴愬姛'));
- open.value = false;
- emit('closeParent', true)
- emit('reload', true)
- } else {
- message.error(result.msg);
- }
- })
+ let locs = tableData.value.filter(item => item.locId == null && item.locs.length < 1);
+ if (locs != null && locs.length > 0) {
+ message.error("鐗╂枡搴撳瓨涓嶈冻锛屾棤娉曠敓鎴愬嚭搴撲换鍔� 锛侊紒");
+ return
+ }
+
+ Modal.confirm({
+ title: formatMessage('page.cancel', '鍙栨秷'),
+ content: formatMessage('page.cancel.confirm', '纭畾鐢熸垚鍑哄簱浠诲姟鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ post('/api/out/orderOut/merge/wave', requestParam).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ message.success(formatMessage('page.add.success', '鍑哄簱鎴愬姛'));
+ open.value = false;
+ emit('closeParent', true)
+ emit('reload', true)
+ } else {
+ message.error(result.msg);
+ }
+ })
+ } catch (error) {
+ message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
+ }
+ },
+ });
+
+
}
const handleOrderMergePreview = async () => {
@@ -353,7 +373,7 @@
<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-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)">
--
Gitblit v1.9.1