From 4746f0aed5d63ab90aa86cbc61ebe7a74211a95c Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 05 七月 2025 15:32:22 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/components/order/order/orderOut.vue | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 5fdbe08..85a6da8 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.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,
@@ -52,16 +53,16 @@
{
title: formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿'),
dataIndex: 'orderNo',
- width: 140,
+ width: 160,
ellipsis: true,
...getColumnSearchProps('orderNo'),
},
{
- title: formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡'),
- dataIndex: 'orderTime',
- width: 140,
+ title: formatMessage('db.man_order.wave_no', '娉㈡缂栧彿'),
+ dataIndex: 'waveNo',
+ width: 160,
ellipsis: true,
- ...getColumnSearchProps('orderTime'),
+ ...getColumnSearchProps('waveNo'),
},
{
title: formatMessage('db.man_order.order_type', '鍗曟嵁绫诲瀷'),
@@ -80,23 +81,23 @@
{
title: formatMessage('db.man_order.ioPri', '浼樺厛绾�'),
dataIndex: 'ioPri',
- width: 140,
+ width: 100,
ellipsis: true,
...getColumnSearchProps('ioPri'),
},
{
- title: formatMessage('db.man_order.wave_no', '娉㈡缂栧彿'),
- dataIndex: 'waveNo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('waveNo'),
- },
- {
title: formatMessage('db.man_order.status', '鐘舵��'),
dataIndex: 'status$',
- width: 140,
+ width: 80,
ellipsis: true,
...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡'),
+ dataIndex: 'orderTime',
+ width: 160,
+ ellipsis: true,
+ ...getColumnSearchProps('orderTime'),
},
{
title: formatMessage('db.man_order.create_time', '娣诲姞鏃堕棿'),
@@ -236,6 +237,26 @@
return true;
})
};
+
+const printChild = ref(null);
+// 鎵撳嵃璁㈠崟
+const handlePrint = async (record) => {
+ let printData = [];
+ const resp = await get("/api/orderDetl/orderId/" + record.__v_raw.id, {});
+ const 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 onSearch = () => {
// console.log('search');
@@ -389,7 +410,6 @@
style="width: 140px;margin-right: 10px;" show-search allowClear :options="orderTypeQueryList"
optionFilterProp="label" optionLabelProp="label">
</a-select>
-
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
style="width: 200px;" @search="onSearch" />
</div>
@@ -438,9 +458,12 @@
<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="showDetl(record)">{{ formatMessage('page.order.orderDetl',
- '璁㈠崟鏄庣粏')
- }}</a-button>
+ <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', '鍒犻櫎')
@@ -449,10 +472,9 @@
</template>
</template>
</a-table>
-
<ShowOrderDetlComponent ref="showOrderDetlChild" />
-
</div>
+ <OrderPrint ref="printChild" />
</template>
<style></style>
--
Gitblit v1.9.1