From 1d193f2cc23f54634ef8ed73c11436fbe76bb575 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 19 八月 2024 14:13:39 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 62fc842..c2013ab 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -383,14 +383,19 @@
</td>
</tr>
- <tr v-if="company.remarkSwitch=='1'" v-for="(itemremark,index) in item.remarkList" :key="index">
+ <tr v-if="company.remarkSwitch=='1'">
<td colspan="29">
- 缂栧彿锛歿{itemremark.S01}}
- 澶囨敞1锛歿{itemremark.S02}}
- 澶囨敞2锛歿{itemremark.S03}}
- 澶囨敞3锛歿{itemremark.S04}}
- 澶囨敞4锛歿{itemremark.S05}}
-
+ <div style="display: flex;flex-wrap: wrap;">
+ <div v-for="(itemremark,index) in item.remarkList" :key="index">
+ <span v-if="!(itemremark.S02==null&&itemremark.S03==null&&itemremark.S04==null&&itemremark.S05==null)">
+ 缂栧彿锛歿{itemremark.S01}}
+ </span>
+ <span v-if="itemremark.S02!=null">澶囨敞1锛歿{itemremark.S02}}</span>
+ <span v-if="itemremark.S03!=null">澶囨敞2锛歿{itemremark.S03}}</span>
+ <span v-if="itemremark.S04!=null">澶囨敞3锛歿{itemremark.S04}}</span>
+ <span v-if="itemremark.S05!=null">澶囨敞4锛歿{itemremark.S05}}</span>
+ </div>
+ </div>
</td>
</tr>
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
@@ -443,11 +448,11 @@
}
#contentTable tbody {
-
+white-space: nowrap;
}
.tdNowrap {
-
+ white-space: nowrap;
}
#contentTable tfoot {
--
Gitblit v1.8.0