From 1e65e680519a32480219e1866baa245df1a8fd17 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 16:19:36 +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 | 116 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 94 insertions(+), 22 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..da6dec3 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', '鍗曟嵁绫诲瀷'),
@@ -78,25 +79,46 @@
...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', '浼樺厛绾�'),
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', '娣诲姞鏃堕棿'),
@@ -133,13 +155,12 @@
ellipsis: true,
...getColumnSearchProps('memo'),
},
-
{
title: formatMessage('common.operation', '鎿嶄綔'),
name: 'oper',
dataIndex: 'oper',
key: 'oper',
- width: 240,
+ width: 350,
fixed: 'right',
},
];
@@ -160,7 +181,6 @@
function getPage() {
state.loading = true;
-
let apiUrl = '/api/order/page';
if (props.ioModel == 'in') {
apiUrl = '/api/order/in/page';
@@ -194,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({
@@ -237,8 +282,31 @@
})
};
+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
+ 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()
}
@@ -389,7 +457,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>
@@ -440,19 +507,24 @@
<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 type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫')
}}</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>
</div>
</template>
</template>
</a-table>
-
<ShowOrderDetlComponent ref="showOrderDetlChild" />
-
</div>
+ <OrderPrint ref="printChild" />
</template>
<style></style>
--
Gitblit v1.9.1