From 626deed5a6d673ea417fa50b7e61d23aec09a247 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 七月 2025 14:13:24 +0800
Subject: [PATCH] no message

---
 zy-asrs-admin/src/components/print/orderPrint/template/template1.vue |   22 ++++++++++++----------
 zy-asrs-admin/src/components/print/orderPrint/index.vue              |    4 +++-
 zy-asrs-admin/src/components/order/order/orderOut.vue                |    4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 223037e..15ecfb5 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.vue
@@ -155,13 +155,12 @@
         ellipsis: true,
         ...getColumnSearchProps('memo'),
     },
-
     {
         title: formatMessage('common.operation', '鎿嶄綔'),
         name: 'oper',
         dataIndex: 'oper',
         key: 'oper',
-        width: 240,
+        width: 350,
         fixed: 'right',
     },
 ];
@@ -274,6 +273,7 @@
         printData.push(newItem)
     })
     printChild.value.printData = printData;
+    printChild.value.data = record.__v_raw;
     printChild.value.orderNo = record.__v_raw.orderNo
     printChild.value.open = true;
 }
diff --git a/zy-asrs-admin/src/components/print/orderPrint/index.vue b/zy-asrs-admin/src/components/print/orderPrint/index.vue
index b9f6a02..b18c231 100644
--- a/zy-asrs-admin/src/components/print/orderPrint/index.vue
+++ b/zy-asrs-admin/src/components/print/orderPrint/index.vue
@@ -10,6 +10,7 @@
 const printChild = ref(null);
 const selectTemplate = ref('Template1');
 let open = ref(false);
+let data = ref({})
 let printData = ref([]);
 let repeatNum = ref(1);
 let orderNo = ref('');
@@ -34,6 +35,7 @@
 defineExpose({
     open,
     orderNo,
+    data,
     printData
 })
 </script>
@@ -42,7 +44,7 @@
     <a-modal v-model:open="open" :title="formatMessage('', '璁㈠崟鎵撳嵃')" @ok="handleOk" :width="'60%'" v-if="open">
         <div style="height: 500px;overflow-x: hidden;overflow-y: scroll;">
             <div style="margin-top: 20px;">
-                <Component :is="template[selectTemplate]" ref="printChild" :list="printData" :repeatNum="repeatNum" :orderNo="orderNo" />
+                <Component :is="template[selectTemplate]" ref="printChild" :list="printData" :repeatNum="repeatNum" :orderNo="orderNo" :data="data"/>
             </div>
         </div>
         <template #footer>
diff --git a/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue b/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
index c2762bc..c003210 100644
--- a/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
+++ b/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
@@ -15,17 +15,19 @@
     repeatNum: {
         type: Number,
         default: 1
+    },
+    data: {
+        type: Object,
+        default: {}
     }
 });
-const { orderNo, list, repeatNum } = toRefs(props)
-
+const { orderNo, list, repeatNum, data } = toRefs(props)
 </script>
 
 <template>
     <div id="printOrder">
         <div>
-            <table class="contain" width="1200" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
-
+            <table class="contain" width="980" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                 <tr style="height: 40px">
                     <td align="center" colspan="2">瀹㈡埛鍚嶇О</td>
                     <td align="center" colspan="2">鑱旂郴鐢佃瘽</td>
@@ -33,17 +35,17 @@
                     <td align="center" colspan="4">鏀惰揣鍦板潃</td>
                 </tr>
                 <template v-for="(item, index) in list" :key="index">
-                    <tr style="height: 40px">
-                        <td align="center" colspan="2">{{ item.customer }}</td>
-                        <td align="center" colspan="2">{{ item.phone }}</td>
-                        <td align="center" colspan="3">{{ item.logistics }}</td>
-                        <td align="center" colspan="4">{{ item.address }}</td>
+                    <tr style="height: 40px" v-if="index == 0">
+                        <td align="center" colspan="2">{{ data.customer }}</td>
+                        <td align="center" colspan="2">{{ data.phone }}</td>
+                        <td align="center" colspan="3">{{ data.logistics }}</td>
+                        <td align="center" colspan="4">{{ data.address }}</td>
                     </tr>
                 </template>
                 <tr style="height: 100px">
                     <td colspan="1" align="center" scope="col">璁㈠崟鍙�</td>
                     <td colspan="2" align="center" scope="col">{{ orderNo }}</td>
-                    <td class="barcode" colspan="8" align="center" scope="col" >
+                    <td class="barcode" colspan="8" align="center" scope="col">
                         <img :src="globalState.url + '/api/code/auth?type=1&param=' + orderNo" width="70%;" />
                         <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
                             <span>{{ orderNo }} </span>

--
Gitblit v1.9.1