From 06c4e59fa35c1b9e74da9cf3d081e78c13d17e20 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期一, 14 七月 2025 06:36:36 +0800
Subject: [PATCH] no message

---
 zy-asrs-admin/src/components/order/order/orderOut.vue |   64 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 8b776d7..2551e97 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,
@@ -78,6 +79,27 @@
         ...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: 100,
@@ -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';
@@ -237,8 +257,30 @@
     })
 };
 
+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.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 +431,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>
@@ -397,7 +438,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>
 
@@ -441,18 +482,21 @@
                         <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" />
 </template>
 
 <style></style>

--
Gitblit v1.9.1