From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +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/print/orderPrint/template/template1.vue |   92 ++++++++++++++++++++++++++-------------------
 1 files changed, 53 insertions(+), 39 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 ae08ee5..c2762bc 100644
--- a/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
+++ b/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
@@ -1,13 +1,13 @@
 <script setup>
-import {toRefs, ref, defineProps, watch} from 'vue';
+import { toRefs, ref, defineProps, watch } from 'vue';
 import { globalState } from '@/config.js'
 import { formatMessage } from '@/utils/localeUtils';
 
 const props = defineProps({
-  orderNo: {
-    type: String,
-    default: ''
-  },
+    orderNo: {
+        type: String,
+        default: ''
+    },
     list: {
         type: Array,
         default: []
@@ -17,45 +17,59 @@
         default: 1
     }
 });
-const { orderNo,list, repeatNum } = toRefs(props)
+const { orderNo, list, repeatNum } = toRefs(props)
 
 </script>
 
 <template>
     <div id="printOrder">
-                <div>
-                    <table class="contain" width="1200"
-                        style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
-                        <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="9" 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>
-                                </div>
-                            </td>
-                        </tr>
-                      <tr style="height: 40px">
-                        <td align="center" colspan="1">搴忓彿</td>
-                        <td align="center" colspan="2">鍟嗗搧缂栧彿</td>
-                        <td align="center" colspan="3">鍟嗗搧鍚嶇О</td>
-                        <td align="center" colspan="2">鎵规</td>
-                        <td align="center" colspan="2">瑙勬牸</td>
-                        <td align="center" colspan="1">鏁伴噺 </td>
-                      </tr>
-                        <template v-for="(item, index) in list" :key="index">
-                        <tr style="height: 40px">
-                          <td align="center" colspan="1">{{index + 1}}</td>
-                          <td align="center" colspan="2">{{ item.matnr }}</td>
-                          <td align="center" colspan="3">{{ item.maktx }}</td>
-                          <td align="center" colspan="2">{{ item.batch }}</td>
-                          <td align="center" colspan="2">{{ item.specs }}</td>
-                          <td align="center" colspan="1">{{ item.anfme }}</td>
-                        </tr>
-                        </template>
-                    </table>
-                </div>
+        <div>
+            <table class="contain" width="1200" 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="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>
+                </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" >
+                        <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>
+                        </div>
+                    </td>
+                </tr>
+                <tr style="height: 40px">
+                    <td align="center" colspan="1">搴忓彿</td>
+                    <td align="center" colspan="2">鍟嗗搧缂栧彿</td>
+                    <td align="center" colspan="3">鍟嗗搧鍚嶇О</td>
+                    <td align="center" colspan="2">鎵规</td>
+                    <td align="center" colspan="2">瑙勬牸</td>
+                    <td align="center" colspan="1">鏁伴噺 </td>
+                </tr>
+                <template v-for="(item, index) in list" :key="index">
+                    <tr style="height: 40px">
+                        <td align="center" colspan="1">{{ index + 1 }}</td>
+                        <td align="center" colspan="2">{{ item.matnr }}</td>
+                        <td align="center" colspan="3">{{ item.maktx }}</td>
+                        <td align="center" colspan="2">{{ item.batch }}</td>
+                        <td align="center" colspan="2">{{ item.specs }}</td>
+                        <td align="center" colspan="1">{{ item.anfme }}</td>
+                    </tr>
+                </template>
+            </table>
+        </div>
     </div>
 </template>
 

--
Gitblit v1.9.1