From 9050274d1c1cdfd3a2f45984fdacf44fd4a9fb2a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 二月 2025 08:27:20 +0800
Subject: [PATCH] 修改标签

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
index 5ac28a4..67c6553 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -31,6 +31,13 @@
   mergeTechnologyNumber:null
 })
 
+//鎵撳嵃鏃堕棿
+const currentTime = new Date();
+const formattedTime = currentTime.getFullYear()
+    + '-' + (currentTime.getMonth() + 1) + '-'
+    + currentTime.getDate() + ' ' + currentTime.getHours() + ':'
+    + currentTime.getMinutes();formattedTime
+
 const {currentRoute} = useRouter()
 const route = currentRoute.value
 const printMerge = props.printMerge
@@ -45,6 +52,7 @@
 }
 data.value.printList = JSON.parse(props.printList)
 
+let name=company.companyName
 //鍘婚櫎閲嶅瀵硅薄
 // let uniqueObjects = {};
 // // 閬嶅巻鍘熷鏁版嵁鏁扮粍
@@ -231,14 +239,18 @@
       <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 style="left: 150px">{{ 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}}&nbsp;&nbsp;
+              鏃堕棿锛歿{formattedTime}}
+            </div>
+            <div>
+              <span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -270,7 +282,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