From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/out/orderOut/index.vue | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-admin/src/views/out/orderOut/index.vue b/zy-asrs-admin/src/views/out/orderOut/index.vue
index 74da6d9..e362c5f 100644
--- a/zy-asrs-admin/src/views/out/orderOut/index.vue
+++ b/zy-asrs-admin/src/views/out/orderOut/index.vue
@@ -11,6 +11,8 @@
const router = useRouter();
+const emit = defineEmits(['pageReload'])
+
const TABLE_KEY = 'table-order-detl';
let currentPage = 1;
let pageSize = 10;
@@ -72,13 +74,13 @@
...getColumnSearchProps('batch'),
},
- {
- title: formatMessage('common.operation', '鎿嶄綔'),
- name: 'oper',
- dataIndex: 'oper',
- key: 'oper',
- width: 140,
- },
+ // {
+ // title: formatMessage('common.operation', '鎿嶄綔'),
+ // name: 'oper',
+ // dataIndex: 'oper',
+ // key: 'oper',
+ // width: 140,
+ // },
];
const state = reactive({
@@ -118,7 +120,8 @@
post('/api/order/out/page', {
current: currentPage,
pageSize: pageSize,
- condition: searchOrder.value
+ condition: searchOrder.value,
+ orderOut: true,
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
@@ -168,13 +171,36 @@
message.error(formatMessage("page.orderOut.mergeOrderOut.error", "璇烽�夋嫨鑷冲皯涓�鏉¤鍗�"));
return;
}
-
+
orderOutMergePreviewChild.value.open = true;
orderOutMergePreviewChild.value.records = orderIdList;
}
const handleChildReload = () => {
handleTableReload()
+}
+
+const handleGenerateWave = () => {
+ let orderIdList = [];
+ checkedOrderKeys.value.forEach((idx) => {
+ let index = parseInt(idx.split("-")[1]);
+ orderIdList.push(orderData.value[index].id)
+ })
+
+ if (orderIdList.length == 0) {
+ message.error(formatMessage("page.orderOut.mergeOrderOut.error", "璇烽�夋嫨鑷冲皯涓�鏉¤鍗�"));
+ return;
+ }
+
+ post('/api/out/wave/generate', orderIdList).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ message.success(formatMessage('page.add.success', '鎴愬姛'));
+ emit('pageReload', 'reload')
+ } else {
+ message.error(result.msg);
+ }
+ })
}
</script>
@@ -188,12 +214,22 @@
<template>
<div style="display: flex;">
<a-card :title="formatMessage('common.order', '璁㈠崟')" style="flex: 4;margin-right: 30px;">
- <a-button @click="handleMergeOrderOut()">
- {{ formatMessage('common.orderOut', '鍚堝苟璁㈠崟') }}
- </a-button>
+ <div style="margin-bottom: 10px;display: flex;">
+ <!-- <div style="margin-right: 10px;">
+ <a-button @click="handleMergeOrderOut()">
+ {{ formatMessage('common.orderOut', '鍚堝苟璁㈠崟') }}
+ </a-button>
+ </div> -->
+ <div style="margin-right: 10px;">
+ <a-button @click="handleGenerateWave()">
+ {{ formatMessage('common.generateWave', '鐢熸垚娉㈡') }}
+ </a-button>
+ </div>
+ </div>
<a-input v-model:value="searchOrder" @change="handleSearchOrder"
:placeholder="formatMessage('page.input', '璇疯緭鍏�')" style="margin-bottom: 8px" />
- <a-tree @select="handleOrderSelected" :tree-data="orderData" v-model:checkedKeys="checkedOrderKeys" checkable blockNode>
+ <a-tree @select="handleOrderSelected" :tree-data="orderData" v-model:checkedKeys="checkedOrderKeys"
+ checkable blockNode>
<template #title="{ orderNo, createTime$ }">
<div style="display: flex;justify-content: space-between">
<div>{{ orderNo }}</div>
@@ -205,9 +241,9 @@
<a-card style="flex: 10;">
<div class="table-header">
- <a-button size="small" @click="handleBatchOrderOut()">
+ <!-- <a-button size="small" @click="handleBatchOrderOut()">
{{ formatMessage('common.orderOut', '鎵归噺鍑哄簱') }}
- </a-button>
+ </a-button> -->
</div>
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
:data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
@@ -223,7 +259,7 @@
</template>
</a-table>
</a-card>
-
+
<OrderOutBatchPreviewView ref="orderOutBatchPreviewChild" @reload="handleChildReload" />
<OrderOutMergePreviewView ref="orderOutMergePreviewChild" @reload="handleChildReload" />
</div>
--
Gitblit v1.9.1