From 29ab542ad30b4c3549e0ff776ba5e49d73f7f974 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 03 九月 2025 14:51:37 +0800
Subject: [PATCH] `1`
---
zy-asrs-admin/src/components/order/order/orderOut.vue | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 223037e..da6dec3 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.vue
@@ -155,13 +155,12 @@
ellipsis: true,
...getColumnSearchProps('memo'),
},
-
{
title: formatMessage('common.operation', '鎿嶄綔'),
name: 'oper',
dataIndex: 'oper',
key: 'oper',
- width: 240,
+ width: 350,
fixed: 'right',
},
];
@@ -215,6 +214,31 @@
editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
editChild.value.isSave = item == null;
}
+
+// const handleDone = (item) => {
+// Modal.confirm({
+// title: formatMessage('page.delete', '瀹岀粨'),
+// content: formatMessage('page.delete.confirm', '纭畾瀹屾垚璇ラ」鍚楋紵'),
+// maskClosable: true,
+// onOk: async () => {
+// const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+// try {
+// post('/api/order/done/' + rows.map((row) => row.id).join(','), {}).then(resp => {
+// let result = resp.data;
+// if (result.code === 200) {
+// message.success(result.msg);
+// } else {
+// message.error(result.msg);
+// }
+// getPage()
+// hide()
+// })
+// } catch (error) {
+// message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
+// }
+// },
+// });
+// }
const handleDel = (rows) => {
Modal.confirm({
@@ -271,15 +295,18 @@
newItem.specs = item.mat$.specs
newItem.batch = item.batch
newItem.anfme = item.anfme
+ newItem.wareType$ = item.wareType$
printData.push(newItem)
})
printChild.value.printData = printData;
+ printChild.value.data = record.__v_raw;
printChild.value.orderNo = record.__v_raw.orderNo
printChild.value.open = true;
}
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
@@ -437,7 +464,7 @@
<a-select v-model:value="channel" :options="channelList" mode="multiple"
style="width: 100px;"></a-select>
<a-button @click="handleGenerateWave()">{{ formatMessage('common.generateWave', '鐢熸垚娉㈡')
- }}</a-button>
+ }}</a-button>
</div>
</div>
@@ -480,15 +507,17 @@
<div style="display: flex;justify-content: space-evenly;">
<a-button type="link" primary @click="showDetl(record)">{{ formatMessage('page.order.orderDetl',
'璁㈠崟鏄庣粏')
- }}</a-button>
+ }}</a-button>
<a-button type="link" primary @click="handlePrint(record)">{{
formatMessage('page.order.orderDetl',
'鎵撳嵃璁㈠崟')
- }}</a-button>
+ }}</a-button>
<a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫')
- }}</a-button>
+ }}</a-button>
+ <!-- <a-button type="link" primary @click="handleDone(record)">{{ formatMessage('page.edit', '瀹岀粨')
+ }}</a-button> -->
<a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
- }}</a-button>
+ }}</a-button>
</div>
</template>
</template>
--
Gitblit v1.9.1