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 |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 cc9e101..b788655 100644
--- a/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
+++ b/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
@@ -19,9 +19,13 @@
     data: {
         type: Object,
         default: {}
+    },
+    inModel: {
+        type: String,
+        default: ''
     }
 });
-const { orderNo, list, repeatNum, data } = toRefs(props)
+const { orderNo, list, repeatNum, data, inModel } = toRefs(props)
 </script>
 
 <template>
@@ -31,15 +35,17 @@
                 <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" 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="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">

--
Gitblit v1.9.1