From 03c894b105bff46879625b67cdebc8c2d947d29f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 八月 2024 11:31:24 +0800
Subject: [PATCH] 修改流程卡打印样式,根据线路添加在磨边队列查不到时查所有线队列数据

---
 UI-Project/src/views/UnLoadGlass/PrintFlow.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index 709f477..fa5a0e8 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -47,6 +47,8 @@
   for (let i = 0; i < produceList.value.length; i++) {
     //鏁伴噺
     let totalQuantity = 0;
+    //钀芥灦鏁伴噺
+    let totalQuantity1 = 0;
     //闈㈢Н
     let totalArea = 0;
     //閲嶉噺
@@ -54,6 +56,7 @@
     // 瀵规瘡涓泦鍚堜腑鐨� detailList 杩涜璁$畻
     produceList.value[i].detailList.forEach(collection => {
       totalQuantity += collection.quantity * 1;
+      totalQuantity1 += collection.quantity1 * 1;
       //姣忎釜搴忓彿闈㈢Н
       collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
       totalArea += collection.total_area * 1;
@@ -63,6 +66,7 @@
     });
     // 杈撳嚭姣忎釜闆嗗悎涓殑鎬绘暟閲�
     produceList.value[i].detail[0].quantity = totalQuantity
+    produceList.value[i].detail[0].quantity1 = totalQuantity
     produceList.value[i].detail[0].gross_area = totalArea
     produceList.value[i].detail[0].weight = totalWeight
   }
@@ -160,10 +164,11 @@
       </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>
@@ -198,12 +203,14 @@
 
       <tr v-for="(itemDatile,index) in item.detailList" :key="index">
         <td>{{ itemDatile.order_number }}</td>
-        <td>{{ itemDatile.s01Value }}</td>
+        <!-- <td>{{ itemDatile.s01Value }}</td> -->
         <td>{{ itemDatile.technology_number }}</td>
         <td>{{ itemDatile.child_width }}</td>
         <td class="item" style="width: 5%;height: 100%;">
-          <input v-model="itemDatile.quantity" style="width: 100%;height: 100%"  @keyup="handleSummary()"/>
+          {{ itemDatile.quantity }}
+          <!-- <input v-model="itemDatile.quantity" style="width: 100%;height: 100%"  @keyup="handleSummary()"/> -->
         </td>
+        <td>{{ itemDatile.quantity1 }}</td>
         <td>{{ itemDatile.total_area }}</td>
         <td>{{ itemDatile.perimeter }}</td>
         <td>{{ itemDatile.bend_radius }}</td>
@@ -235,6 +242,8 @@
         <td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
           鏁伴噺锛�
           <label>{{ itemsum.quantity }}</label>
+          钀藉姞鏁伴噺锛�
+          <label>{{ itemsum.quantity1 }}</label>
           闈㈢Н锛�
           <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
           閲嶉噺锛�

--
Gitblit v1.8.0