From 924ce82faeec6d896fcdc360b279215e84b69fb9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 11:44:44 +0800
Subject: [PATCH] 1、代码补充提交

---
 UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue |   52 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
index 35c3a2d..1f535f9 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
@@ -2,10 +2,6 @@
 import request from "@/utils/request"
 import {ElMessage} from "element-plus"
 import {onMounted, ref} from "vue"
-// import {useRouter} from 'vue-router'
-// import {changeFilterEvent, filterChanged} from "@/hook"
-// import {useI18n} from 'vue-i18n'
-// import deepClone from "@/utils/deepClone";
 import companyInfo from "@/lang/companyInfo"
 
 const company = companyInfo()
@@ -106,21 +102,30 @@
     <div id="entirety" >
      
       <div class="row1">
-        <div style="position: absolute;font-weight: bold;margin-left: 5px;" v-if="item.tempering_layout_id!=null">{{ item.tempering_layout_id }}/{{ item.tempering_feed_sequence }}</div>
+        
         <span>{{ item.customer_name }}</span>&nbsp;
         <span>{{ item.order_id }}</span>
         <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 style="position: absolute;font-weight: bold;margin-left: 210px;margin-top: -26px;" >{{ index+1 }}</div>
       </div>
       <div  class="row2">
         <span>{{ item.project }}</span>&nbsp;
         <span>{{ item.building_number }}</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="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
+        <span v-if="item.tempering_layout_id!==null "  style="font-size: 7pt;">
+          ({{ index+1 }}) {{ item.tempering_layout_id }}/{{ item.tempering_feed_sequence }}
+        </span>
+        {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
+      </div>
+      <div class="row3" v-else>
+        <span v-if="item.heat_layout_id!==null "  style="font-size: 7pt;">
+          ({{ index+1 }}) {{ item.tempering_layout_id }}/{{ item.tempering_feed_sequence }}
+        </span>
+        {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
+      </div>
       <div class="row5">
         <span>{{item.glass_child }}</span>&nbsp;
         <span>{{ item.processing_note }}</span>
@@ -153,11 +158,10 @@
 
 #entirety{
   text-align: center;
-  width: 46%;
-  height: 170px;
+  width: 48%;
+  height: 160px;
   border: black 1px;
   word-wrap: break-word;
-  margin-left: 10px;
 }
 
 .row1 {
@@ -166,16 +170,15 @@
   height: 35px;
 }
 .row1 span {
-  font-size: 12pt;
-}
-
-.row2 {
   font-size: 14pt;
+}
+.row2 {
+  font-size: 12pt;
   font-weight: bold;
   height: 35px;
 }
 .row2 span {
-  font-size: 12pt;
+  font-size: 17pt;
 }
 span {
   font-size: 12pt;
@@ -185,25 +188,30 @@
 .row3 {
   margin-top: -5px;
   height: 35px;
-  font-size: 22pt;
+  font-size: 20pt;
   font-weight: bolder;
   line-height: 35px;
+}
+.row3 span{
+  font-size: 24pt;
 }
 
 .row5 {
   height: 50px;
   font-weight: bold;
-  font-size: 12pt;
-  /* margin-left: 20px; */
+  font-size: 14pt;
 }
 .row5 span {
-  font-size: 12pt;
+  font-size: 16pt;
 }
 
 .row6 {
-  height: 15px;
+  height: 25px;
   font-weight: bold;
-  font-size: 8pt;
+  font-size: 10pt;
+}
+.row6 span {
+  font-size: 16pt;
 }
 
 

--
Gitblit v1.8.0