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 | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-admin/src/views/out/orderOut/index.vue b/zy-asrs-admin/src/views/out/orderOut/index.vue
index 0da913d..e362c5f 100644
--- a/zy-asrs-admin/src/views/out/orderOut/index.vue
+++ b/zy-asrs-admin/src/views/out/orderOut/index.vue
@@ -74,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({
@@ -120,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) {
@@ -196,7 +197,7 @@
if (result.code == 200) {
message.success(formatMessage('page.add.success', '鎴愬姛'));
emit('pageReload', 'reload')
- }else{
+ } else {
message.error(result.msg);
}
})
@@ -214,11 +215,11 @@
<div style="display: flex;">
<a-card :title="formatMessage('common.order', '璁㈠崟')" style="flex: 4;margin-right: 30px;">
<div style="margin-bottom: 10px;display: flex;">
- <div style="margin-right: 10px;">
+ <!-- <div style="margin-right: 10px;">
<a-button @click="handleMergeOrderOut()">
{{ formatMessage('common.orderOut', '鍚堝苟璁㈠崟') }}
</a-button>
- </div>
+ </div> -->
<div style="margin-right: 10px;">
<a-button @click="handleGenerateWave()">
{{ formatMessage('common.generateWave', '鐢熸垚娉㈡') }}
@@ -240,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"
--
Gitblit v1.9.1