From 9866aa9501cd64269857bcc6c75a77a2fcd4c9d4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 263e1a4..9f02cb4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -6,7 +6,8 @@
 import {useRouter} from 'vue-router'
 import {changeFilterEvent, filterChanged} from "@/hook"
 import {useI18n} from 'vue-i18n'
-import deepClone from "@/utils/deepClone";
+import deepClone from "@/utils/deepClone"
+import companyInfo from "@/stores/sd/companyInfo"
 //璇█鑾峰彇
 const {t} = useI18n()
 let router = useRouter()
@@ -18,7 +19,8 @@
 const data = ref({
   printList: []
 })
-
+let remarks = ref('')
+const company = companyInfo()
 
 
 
@@ -137,6 +139,7 @@
 
 <template>
   <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
+  <el-input v-if="!company.showDeliveryCreator" v-model="remarks" style="background-color: transparent;border: none;margin-top: -20px;width: 100px"/>
   <div id="printFlowCard" >
     <div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >
 
@@ -164,12 +167,13 @@
       <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
       <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
       <div class="row5">
-        <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number }}</span>
+        <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
         <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
       </div>
       <div class="row6">
         <span>{{item.glass_child}}</span>&nbsp;
-        <span>{{item.processing_note}}</span>
+        <span v-if="company.showDeliveryCreator" >{{item.processing_note}}</span>
+        <span v-else style="font-size: 6pt">{{item.processing_note}}</span>
       </div>
       <div class="row5">
         <span>{{item.project}}</span>&nbsp;
@@ -187,34 +191,28 @@
           <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
           <span>{{ item.customer_name }}</span>&nbsp;
           <span>{{ item.order_id }}</span>&nbsp;
-          <span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
-          <span v-else-if="item.process.includes('涓┖')">涓┖</span>
-          <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
-          <span v-else></span>
+
           <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
 
         </div>
         <div class="row2" v-else>
           <span>{{ item.customer_name }}</span>&nbsp;
           <span>{{ item.order_id }}</span>&nbsp;
-          <span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
-          <span v-else-if="item.process.includes('涓┖')">涓┖</span>
-          <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
-          <span v-else></span>
         </div>
 
         <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
         <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
+
         <div class="row5">
-          <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number }}</span>
+          <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
           <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
         </div>
         <div class="row6">
           <span>{{item.glass_child}}</span>&nbsp;
-          <span>{{item.processing_note}}</span>
         </div>
         <div class="row5">
           <span>{{item.project}}</span>&nbsp;
+          <span style="font-size: 7pt" v-if="!company.showDeliveryCreator">{{remarks}}</span>
         </div>
       </div>
     </template>
@@ -313,8 +311,8 @@
   position: absolute;
   font-weight: bold;
   margin-left: 5px;
-  margin-top: 0px;
-  font-size: 8pt;
+  margin-top: -6px;
+  font-size: 6pt;
 }
 
 .cell1{
@@ -323,6 +321,9 @@
   margin-left: 158px;
   margin-top: -21px;
 }
+.font-size {
+  font-size: 6pt;
+}
 
 
 

--
Gitblit v1.8.0