From 613e4e92157dd697629dbad17fd091ae37637bc7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 17 十一月 2025 08:50:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 651166f..e046032 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -300,6 +300,11 @@
               鏃堕棿锛歿{formattedTime}}
               &nbsp;&nbsp;
               <span style="font-weight: bolder;" >
+                鎬绘暟閲忥細{{itemFlow.orderQuantity}}
+              鎬婚潰绉細{{itemFlow.orderArea}}
+              </span>
+              &nbsp;
+              <span style="font-weight: bolder;" >
                 鎵撳嵃鎬绘暟閲忥細{{totalQuantity}}
               鎵撳嵃鎬婚潰绉細{{totalArea}}
               </span>
@@ -336,7 +341,7 @@
         <td rowspan='2'>鍥惧彿</td>
         <td rowspan='2'>缂栧彿</td>
         <td rowspan="2">灏忕墖椤哄簭</td>
-        <td v-if="name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�'"  rowspan='2' style="width: 90px">瀹�(寮ч暱)脳楂�</td>
+        <td v-if="name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�'"  rowspan='2' style="width: 90px">瀹�(寮ч暱)*楂�</td>
         <td v-else rowspan='2' style="width: 90px">瀹�*楂�</td>
         <td rowspan='2' >鏁伴噺</td>
         <td rowspan='2'>闈㈢Н</td>
@@ -362,7 +367,7 @@
         <td>{{ itemDatile.technology_number }}</td>
         <td>{{ itemDatile.child_width }}</td>
         <td class="item" style="width: 60px;height: 100%;">
-          <input v-model="itemDatile.quantity" style="width: 100%;height: 100%"  @keyup="handleSummary()"/>
+          <input v-model="itemDatile.quantity" style="width: 100%;height: 100%;font-weight: bold;"  @keyup="handleSummary()"/>
         </td>
         <td>{{ itemDatile.total_area }}</td>
         <td>{{ itemDatile.perimeter }}</td>
@@ -447,7 +452,9 @@
 
       <tr v-for="(itemtextareas,index) in item.detail" :key="index">
         <td  colspan="31"  style="width: 480px;height: 150px ">
-          <div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+          <div v-if="name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�'" style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 16px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+          </div>
+          <div v-else style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
           </div>
         </td>
       </tr>

--
Gitblit v1.8.0