From 7a0527e207c59cdcce0b1f7a41bd7457a236ab23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 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..f790208 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)
@@ -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