From b7546c0dcc65d193b7a549aa267a70a1a2dcac61 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 14 十月 2024 08:42:53 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 aec6100..352bf7c 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -379,10 +379,10 @@
              <span v-if="!(itemremark.S02==null&&itemremark.S03==null&&itemremark.S04==null&&itemremark.S05==null)">
                缂栧彿锛歿{itemremark.S01}}
              </span>&nbsp;&nbsp;
-              <span v-if="itemremark.S02!=null">澶囨敞1锛歿{itemremark.S02}}</span>&nbsp;&nbsp;
-              <span v-if="itemremark.S03!=null">澶囨敞2锛歿{itemremark.S03}}</span>&nbsp;&nbsp;
-              <span v-if="itemremark.S04!=null">澶囨敞3锛歿{itemremark.S04}}</span>&nbsp;&nbsp;
-              <span v-if="itemremark.S05!=null">澶囨敞4锛歿{itemremark.S05}}</span>
+              <span v-if="itemremark.S02!=null&&itemremark.S02!=''">澶囨敞1锛歿{itemremark.S02}}</span>&nbsp;&nbsp;
+              <span v-if="itemremark.S03!=null&&itemremark.S03!=''">澶囨敞2锛歿{itemremark.S03}}</span>&nbsp;&nbsp;
+              <span v-if="itemremark.S04!=null&&itemremark.S04!=''">澶囨敞3锛歿{itemremark.S04}}</span>&nbsp;&nbsp;
+              <span v-if="itemremark.S05!=null&&itemremark.S05!=''">澶囨敞4锛歿{itemremark.S05}}</span>
             </div>
           </div>
         </td>

--
Gitblit v1.8.0