From db2c3d7fe3d1e89b49b9628f408ba883dc75dc51 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 17:11:43 +0800
Subject: [PATCH] no message
---
zy-asrs-admin/src/components/order/order/orderIn.vue | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/orderIn.vue b/zy-asrs-admin/src/components/order/order/orderIn.vue
index b9213ec..827d393 100644
--- a/zy-asrs-admin/src/components/order/order/orderIn.vue
+++ b/zy-asrs-admin/src/components/order/order/orderIn.vue
@@ -1,5 +1,5 @@
<script setup>
-import { getCurrentInstance, ref, computed, reactive, defineProps } from 'vue';
+import {getCurrentInstance, ref, computed, reactive, defineProps, nextTick} from 'vue';
import { useRouter } from "vue-router";
import { get, post, postBlob, postForm } from '@/utils/request.js'
import { message, Modal } from 'ant-design-vue';
@@ -8,6 +8,7 @@
import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
import ShowOrderDetlComponent from '@/components/orderDetl/show.vue';
+import OrderPrint from '@/components/print/orderPrint/index.vue'
import {
DownOutlined,
UploadOutlined,
@@ -50,14 +51,14 @@
{
title: formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿'),
dataIndex: 'orderNo',
- width: 140,
+ width: 230,
ellipsis: true,
...getColumnSearchProps('orderNo'),
},
{
title: formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡'),
dataIndex: 'orderTime',
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('orderTime'),
},
@@ -92,7 +93,7 @@
{
title: formatMessage('db.man_order.create_time', '娣诲姞鏃堕棿'),
dataIndex: 'createTime$',
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('createTime$'),
},
@@ -106,7 +107,7 @@
{
title: formatMessage('db.man_order.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('updateTime$'),
},
@@ -216,6 +217,28 @@
showOrderDetlChild.value.orderId = item.id;
}
+const printChild = ref(null);
+// 鎵撳嵃璁㈠崟
+const handlePrint = async (record) => {
+ let printData = [];
+
+ const resp = await get("/api/orderDetl/orderId/" + record.__v_raw.id, {});
+ let result = resp.data;
+
+ result.data.forEach((item) => {
+ let newItem = {};
+ newItem.matnr = item.mat$.matnr
+ newItem.maktx = item.mat$.maktx
+ newItem.specs = item.mat$.specs
+ newItem.batch = item.batch
+ newItem.anfme = item.anfme
+ printData.push(newItem)
+ })
+ printChild.value.printData = printData;
+ printChild.value.orderNo = record.__v_raw.orderNo
+ printChild.value.open = true;
+}
+
const handleExport = async (intl) => {
postBlob('/api/order/export', {
ioModel: props.ioModel,
@@ -229,7 +252,6 @@
};
const onSearch = () => {
- // console.log('search');
getPage()
}
@@ -368,6 +390,9 @@
<div style="display: flex;justify-content: space-evenly;">
<a-button type="link" primary @click="showDetl(record)">{{ formatMessage('page.order.orderDetl', '璁㈠崟鏄庣粏')
}}</a-button>
+ <a-button type="link" primary @click="handlePrint(record)">{{ formatMessage('page.order.orderDetl',
+ '鎵撳嵃璁㈠崟')
+ }}</a-button>
<a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
<a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
}}</a-button>
@@ -379,6 +404,7 @@
<ShowOrderDetlComponent ref="showOrderDetlChild" />
</div>
+ <OrderPrint ref="printChild" />
</template>
<style></style>
--
Gitblit v1.9.1