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/PrintProcessStraight.vue |  109 +++++++++++++++++-------------------------------------
 1 files changed, 34 insertions(+), 75 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
index c2a1e86..8d6f2a2 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
@@ -260,13 +260,8 @@
               鎵撳嵃浜猴細{{user.user.userName}} &nbsp;&nbsp;
               鏃堕棿锛歿{formattedTime}}
               &nbsp;&nbsp;
-              <span style="font-weight: bolder;" v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">
-                鎵撳嵃鎬绘暟閲忥細{{totalQuantity}}
-              鎵撳嵃鎬婚潰绉細{{totalArea}}
-              </span>
             </div>
             <div>
-              <span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -276,37 +271,31 @@
       </tr>
       <tr v-for="(items,index) in item.detail" :key="index">
         <td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
-        <td colspan="2">{{ items.customer_name }}</td>
-        <td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
-        <td colspan="4" style="min-width: 250px;">{{ items.project }}</td>
+        <td colspan="1" style="width: 200px;font-size: 17px">{{ items.customer_name }}</td>
+        <td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
+        <td colspan="1" style="min-width: 100px">{{ items.edging_type }}</td>
         <td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
-        <td :colspan="2+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
+        <td :colspan="1+item.processList.length*1"  style="width: 500px">{{ items.process }}</td>
       </tr>
       <tr v-for="(itemTr,index) in item.detail" :key="index">
-        <td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
-        <td colspan="2">{{ itemTr.edging_type }}</td>
+        <td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
+        <td colspan="1" style="font-size: 17px">{{ itemTr.project }}</td>
         <td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
-        <td colspan="4">{{ itemTr.glass_child }}</td>
+        <td colspan="1">{{ itemTr.glass_child }}</td>
         <td class="tdNowrap">浜у搧鍚嶇О锛�</td>
-        <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+        <td :colspan="1+item.processList.length*1">{{ itemTr.product_name }}</td>
       </tr>
       <tr>
-        <td rowspan='2'>搴忓彿</td>
-        <td rowspan='2'>鍥惧彿</td>
-        <td rowspan='2'>缂栧彿</td>
-        <td rowspan="2">灏忕墖椤哄簭</td>
-        <td rowspan='2' style="width: 90px">瀹�*楂�</td>
-        <td rowspan='2' >鏁伴噺</td>
-        <td rowspan='2'>闈㈢Н</td>
-        <td rowspan='2'>鍛ㄩ暱</td>
-        <td rowspan='2'>鍗婂緞/澶囨敞</td>
-        <td rowspan='2'>澶囨敞</td>
-        <td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
+        <td rowspan='2' style="font-size: 15px">搴忓彿</td>
+        <td rowspan='2' style="font-size: 15px">瀹�*楂�</td>
+        <td rowspan='2' style="font-size: 15px">鏁伴噺</td>
+        <td rowspan='2' style="font-size: 15px">澶囨敞</td>
+        <td rowspan='2' style="font-size: 15px">闈㈢Н</td>
+        <td v-for="(itemPr,index) in item.processList" :key="index"  colspan="1">{{ itemPr.process }}</td>
       </tr>
       <tr>
         <template v-for=" n in item.processList.length">
           <td>{{ company.printLabel.printFlowCard.patch }}</td>
-          <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
         </template>
       </tr>
       </thead>
@@ -314,20 +303,13 @@
 
       <tr v-for="(itemDatile,index) in item.detailList" :key="index">
         <td>{{ itemDatile.order_number }}</td>
-        <td>{{ itemDatile.mapNumber }}</td>
-        <td v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">{{ itemDatile.building_number }}</td>
-        <td v-else>{{ itemDatile.s01Value }}</td>
-        <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()"/>
+        <td style="font-size: 20px">{{ itemDatile.child_width }}</td>
+        <td class="item" style="width: 60px;height: 100%">
+          <input v-model="itemDatile.quantity" style="width: 100%;height: 100%;font-size: 17px"  @keyup="handleSummary()"/>
         </td>
-        <td>{{ itemDatile.total_area }}</td>
-        <td>{{ itemDatile.perimeter }}</td>
-        <td>{{ itemDatile.bend_radius }}</td>
         <td>{{ itemDatile.remarks }}</td>
+        <td>{{ itemDatile.total_area }}</td>
         <template v-for=" n in item.processList.length">
-          <td></td>
           <td></td>
         </template>
       </tr>
@@ -337,44 +319,37 @@
           <label>{{ itemsum.quantity }}</label>
           闈㈢Н锛�
           <label>{{ itemsum.gross_area }}</label>
-          閲嶉噺锛�
-          <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
         </td>
       </tr>
       <tr v-for="(itemtextarea,index) in item.detail" :key="index">
 
         <td>瀹屽伐绛惧悕</td>
-        <td colspan="2"></td>
-        <td colspan="2"></td>
-        <td colspan="2"></td>
-        <td colspan="2"></td>
-        <td colspan="2"></td>
+        <td colspan="1"></td>
+        <td colspan="1"></td>
+        <td colspan="1"></td>
+        <td colspan="1"></td>
         <template v-for=" n in item.processList.length">
-          <td colspan="2"></td>
+          <td></td>
         </template>
       </tr>
       <tr>
         <td>鐢熶骇鏃ユ湡</td>
-        <td colspan="2"></td>
-        <td colspan="2"></td>
-        <td colspan="2"></td>
-        <td colspan="2"></td>
-        <td colspan="2"></td>
+        <td colspan="1"></td>
+        <td colspan="1"></td>
+        <td colspan="1"></td>
+        <td colspan="1"></td>
         <template v-for=" n in item.processList.length">
-          <td colspan="2"></td>
+          <td></td>
         </template>
       </tr>
 
-      <tr>
-        <td>鍘熺墖绠卞彿</td>
-        <td colspan="31"></td>
-      </tr>
+
       <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
         <td colspan="31">
           <span style="display: flex;">
             <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
             <div class='qrCode' style="width: 80px;height: 80px;">
-            <img :src=qrCodeItems.qrcode>
+            <img style="width: 97%;height: 97%;margin-top: 1px" :src=qrCodeItems.qrcode>
           </div>
           <span style="float: left;font-weight: bolder">{{
               qrCodeItem.process_id + "/" + qrCodeItems.technologyNumber
@@ -384,27 +359,12 @@
         </td>
 
       </tr>
-      <tr v-if="company.remarkSwitch=='1'">
-        <td colspan="31">
-          <div style="display: flex;flex-wrap: wrap;">
-            <div class="nuber_xx" v-for="(itemremark,index) in item.remarkList" :key="index">
-             <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&&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>
-      </tr>
       </tbody>
       <tfoot>
 
       <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 style="width: 99%;height: 99%;text-align: left;margin-left: 10px"><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>
@@ -484,11 +444,10 @@
 
 
 @media print {
-  @page {
-    size: auto;  /* auto is the initial value */
-    margin: 4mm 5mm 10mm 5mm  /* this affects the margin in the printer settings */
+    @page {
+      margin: 10mm 10mm 5mm 10mm !important;
+    }
 
-  }
 
   table {
     page-break-before: always;

--
Gitblit v1.8.0