From a1a7c03eae40f4b0344fce652e1a240cf5283624 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 13 九月 2024 16:37:42 +0800
Subject: [PATCH] #合并订单出库，统一转波次出库前最新代码
---
zy-asrs-admin/src/views/out/wave/index.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-admin/src/views/out/wave/index.vue b/zy-asrs-admin/src/views/out/wave/index.vue
index 098a2a2..f0c760e 100644
--- a/zy-asrs-admin/src/views/out/wave/index.vue
+++ b/zy-asrs-admin/src/views/out/wave/index.vue
@@ -1,5 +1,5 @@
<script setup>
-import { getCurrentInstance, ref, computed, reactive } from 'vue';
+import { getCurrentInstance, ref, computed, reactive, watch } from 'vue';
import { useRouter } from "vue-router";
import { get, post, postBlob } from '@/utils/request.js'
import { message, Modal } from 'ant-design-vue';
@@ -143,6 +143,7 @@
detl.waveId = item.id;
detl.waveType = item.waveType;
detl.waveType$ = item.waveType$;
+ detl.generateTask = item.generateTask;
tmp.push(detl)
})
})
@@ -219,8 +220,6 @@
// }
const handleGenerateOut = (item) => {
- console.log(item);
-
get('/api/wave/list/' + item.waveId, {}).then(resp => {
let result = resp.data;
let data = result.data;
@@ -231,6 +230,7 @@
orderOutMergePreviewChild.value.open = true;
orderOutMergePreviewChild.value.records = orderIds;
+ orderOutMergePreviewChild.value.waveId = item.waveId;
})
}
@@ -311,13 +311,15 @@
</div> -->
</div>
<a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="index"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.columns" @resizeColumn="handleResizeColumn"
+ :loading="state.loading">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
- <a-button type="link" primary @click="handleGenerateOut(record)">{{ formatMessage('page.generateOut',
- '鐢熸垚鍑哄簱浠诲姟')
- }}</a-button>
+ <a-button type="link" primary @click="handleGenerateOut(record)" :disabled="record.generateTask">{{
+ formatMessage('page.generateOut',
+ '鐢熸垚鍑哄簱浠诲姟')
+ }}</a-button>
<a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
}}</a-button>
</div>
--
Gitblit v1.9.1