From 1e65e680519a32480219e1866baa245df1a8fd17 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 16:19:36 +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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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 b788655..720b004 100644
--- a/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
+++ b/zy-asrs-admin/src/components/print/orderPrint/template/template1.vue
@@ -62,18 +62,20 @@
<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="inModel == 'in' ? '2' : '1'">鎵规</td>
<td align="center" colspan="2">瑙勬牸</td>
<td align="center" colspan="1">鏁伴噺 </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="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="inModel == 'in' ? '2' : '1'">{{ item.batch }}</td>
<td align="center" colspan="2">{{ item.specs }}</td>
<td align="center" colspan="1">{{ item.anfme }}</td>
+ <td align="center" colspan="1" v-if="inModel != 'in'">{{ item.wareType$ }}</td>
</tr>
</template>
</table>
--
Gitblit v1.9.1