From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 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 592201c..8da7166 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
@@ -75,7 +75,6 @@
       }else{
         request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}`, data.value).then((res) => {
           if (res.code == 200) {
-            console.log(res.data.data)
             load(res.data.data)
           } else {
             ElMessage.warning(res.msg)
@@ -174,33 +173,33 @@
     produceList.value[j].detail[0].weight = sumWeight
   }
   //澶勭悊鍚堝苟鎵撳嵃
-  if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
-
-    produceList.value.forEach(item => {
-      item.detail[0].technologyNumber = printMerge;
-    });
-
-    //鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
-    if (like == null) {
-      let process = produceList.value[0].detail[0].process
-      let indexOfJiaJiao = process.indexOf('澶硅兌');
-      if (indexOfJiaJiao !== -1) {
-        // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
-        let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
-        produceList.value.forEach(item => {
-          item.detail[0].process = afterJiaJiao
-        })
-      }
-
-      let indexOfProceList = produceList.value[0].processList
-      let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
-
-      if (getProceList !== -1) {
-        // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
-        produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
-      }
-    }
-  }
+  // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
+  //
+  //   produceList.value.forEach(item => {
+  //     item.detail[0].technologyNumber = printMerge;
+  //   });
+  //
+  //   //鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
+  //   if (like == null) {
+  //     let process = produceList.value[0].detail[0].process
+  //     let indexOfJiaJiao = process.indexOf('澶硅兌');
+  //     if (indexOfJiaJiao !== -1) {
+  //       // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
+  //       let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
+  //       produceList.value.forEach(item => {
+  //         item.detail[0].process = afterJiaJiao
+  //       })
+  //     }
+  //
+  //     let indexOfProceList = produceList.value[0].processList
+  //     let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
+  //
+  //     if (getProceList !== -1) {
+  //       // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
+  //       produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
+  //     }
+  //   }
+  // }
 
 
   // produceList.value.forEach(item => {
@@ -266,7 +265,7 @@
               鏃堕棿锛歿{formattedTime}}
               &nbsp;&nbsp;
             </div>
-            <div>{{itemFlow.rack}}
+            <div><span v-if="item.detailList[0].merge===1">鍚�</span>{{itemFlow.rack}}
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -308,7 +307,8 @@
 
       <tr v-for="(itemDatile,index) in item.detailList" :key="index">
         <td>{{ itemDatile.order_number }}</td>
-        <td style="font-size: 20px">{{ itemDatile.child_width }}</td>
+        <td style="font-size: 20px" v-if="itemDatile.mapNumber===''">{{ itemDatile.child_width }}</td>
+        <td style="font-size: 20px" v-else>{{ itemDatile.mapNumber }}</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>

--
Gitblit v1.8.0