From 33b5b3d2fb2b41cdce6e4cb783f27ee70ad3afb8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 18:10:16 +0800
Subject: [PATCH] 生成出库单功能优化

---
 zy-asrs-admin/src/components/print/orderPrint/template/template1.vue |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

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..b788655 100644
--- a/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
+++ b/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
@@ -15,35 +15,43 @@
     repeatNum: {
         type: Number,
         default: 1
+    },
+    data: {
+        type: Object,
+        default: {}
+    },
+    inModel: {
+        type: String,
+        default: ''
     }
 });
-const { orderNo, list, repeatNum } = toRefs(props)
-
+const { orderNo, list, repeatNum, data, inModel } = 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="100%" 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>
-                    <td align="center" colspan="3">蹇�掑崟鍙�</td>
+                    <td align="center" :colspan="inModel == 'in' ? '3' : '2'">蹇�掑崟鍙�</td>
                     <td align="center" colspan="4">鏀惰揣鍦板潃</td>
+                    <td align="center" colspan="1" v-if="inModel != 'in'">鍑哄簱鍙�</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="inModel == 'in' ? '3' : '2'">{{ data.logistics }}</td>
+                        <td align="center" colspan="4">{{ data.address }}</td>
+                        <td align="center" colspan="1" v-if="inModel != 'in'">{{ data.site }}</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