From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +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 | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 52cbacb..223037e 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, nextTick} 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';
@@ -77,6 +77,27 @@
width: 140,
ellipsis: true,
...getColumnSearchProps('orderSettle$'),
+ },
+ {
+ title: formatMessage('db.man_order.order_settle', '瀹㈡埛鍚嶇О'),
+ dataIndex: 'customer',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('customer'),
+ },
+ {
+ title: formatMessage('db.man_order.order_settle', '鐢佃瘽'),
+ dataIndex: 'phone',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('phone'),
+ },
+ {
+ title: formatMessage('db.man_order.order_settle', '鍦板潃'),
+ dataIndex: 'address',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('address'),
},
{
title: formatMessage('db.man_order.ioPri', '浼樺厛绾�'),
@@ -161,7 +182,6 @@
function getPage() {
state.loading = true;
-
let apiUrl = '/api/order/page';
if (props.ioModel == 'in') {
apiUrl = '/api/order/in/page';
@@ -241,21 +261,21 @@
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;
+ 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 = () => {
@@ -410,7 +430,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>
@@ -418,7 +437,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>
@@ -459,25 +478,24 @@
<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="handlePrint(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>
<a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
- }}</a-button>
+ }}</a-button>
</div>
</template>
</template>
</a-table>
-
<ShowOrderDetlComponent ref="showOrderDetlChild" />
-
</div>
- <OrderPrint ref="printChild" />
+ <OrderPrint ref="printChild" />
</template>
<style></style>
--
Gitblit v1.9.1