From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时,打印显示小片信息

---
 north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
index cc51b10..d7bb128 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
@@ -41,6 +41,7 @@
 if (like == '') {
   like = null
 }
+let name=company.companyName
 data.value.printList = JSON.parse(props.printList)
 let flowCardCount = data.value.printList.length
 onMounted(() => {
@@ -194,14 +195,17 @@
       <thead>
       <tr v-for="(itemFlow,index) in item.detail" :key="index">
         <td    colspan="34">
-          <div style="float: left;">杩旂墖鍗曞彿锛歿{itemFlow.patch_id}}</div>
+
           <div id="bj" style="float: right;font-size: 28px">杩� {{ id + 1 }}</div>
           <div>{{ company.companyName }}</div>
           <div>鐢熶骇娴佺▼鍗�</div>
           <div  style="font-weight: bolder;display: flex;justify-content:space-between">
-            <div>鎵撳嵃浜猴細{{user.user.userName}}</div>
             <div>
-              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
+              杩旂墖鍗曞彿锛歿{itemFlow.patch_id}}&nbsp;&nbsp;&nbsp;
+              鎵撳嵃浜猴細{{user.user.userName}}
+            </div>
+            <div>
+              <span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -233,7 +237,7 @@
         <td rowspan='2'>鏁伴噺</td>
         <td rowspan='2'>闈㈢Н</td>
         <td rowspan='2'>鍛ㄩ暱</td>
-        <td rowspan='2'>鍗婂緞</td>
+        <td rowspan='2'>鍗婂緞/澶囨敞</td>
         <td rowspan='2'>绫诲瀷</td>
         <td rowspan='2'>鍘熷洜</td>
         <td rowspan='2'>宸ュ簭</td>

--
Gitblit v1.8.0