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/PrintReworkProcess.vue |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 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 716b6eb..a02d0ee 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
@@ -122,9 +122,8 @@
 
           }
 
-          //澶勭悊鍚岄厤缃墦鍗�
 
-
+          handleSummary()
           handleGetQRCode()
         } else {
           ElMessage.warning(res.msg)
@@ -197,11 +196,14 @@
           <div id="bj" style="float: right;font-size: 28px">杩� {{ id + 1 }}</div>
           <div>{{ company.companyName }}</div>
           <div>鐢熶骇娴佺▼鍗�</div>
-          <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+          <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">{{itemFlow.otherRemarks}}&nbsp;&nbsp;
+            娴佺▼鍗″彿锛� {{
               itemFlow.process_id
             }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
           </div>
-          <div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+          <div v-else style="text-align: right;font-weight: bolder">
+            {{itemFlow.otherRemarks}}&nbsp;&nbsp;
+            娴佺▼鍗″彿锛� {{
               itemFlow.process_id
             }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
           </div>
@@ -317,14 +319,12 @@
         </td>
       </tr>
       <tr v-for="(itemtextarea,index) in item.detail" :key="index">
-        <td v-if="like='1'" colspan="4" rowspan="6" style="width: 480px;height: 100px ">
-          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
-          </div>
-        </td>
-        <td v-else colspan="6" rowspan="2" style="width: 480px;height: 100px ">
-          <!--          <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
-          <!--          </div>-->
-          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
+        <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
+          <div>
+            娆＄牬绫诲瀷锛歿{itemtextarea.breakage_type}}&nbsp;
+            娆＄牬鍘熷洜锛歿{itemtextarea.breakage_reason}}&nbsp;
+            璐ｄ换宸ュ簭锛歿{itemtextarea.responsible_process}}&nbsp;
+            璐ｄ换鐝粍锛歿{itemtextarea.responsible_team}}
           </div>
         </td>
         <td>瀹屽伐绛惧悕</td>

--
Gitblit v1.8.0