From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue
index e785701..ecba99e 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue
@@ -39,7 +39,7 @@
 data.value.printList = JSON.parse(props.list)
 
 onMounted(() => {
-      request.post(`/Replenish/getSelectPrintCustomLabel/${type}`, data.value).then((res) => {
+      request.post(`/Replenish/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => {
         if (res.code == 200) {
 
           produceList.value = deepClone(res.data.title)
@@ -110,13 +110,14 @@
     <div v-for="(item1,id) in lastList"   class="entirety_semi">
         <div class="row4">{{faceOrientation}}</div>
         <div v-for="(item,id) in labelList"  class="contentRow">
-          <div class="row1">{{ item.title }}:</div>
-          <div class="row2">{{ item1[item.name] }}</div>
+          <div class="row1" v-if="item1[item.name] != null && item1[item.name] !== ''">{{ item.title }}锛歿{ item1[item.name] }}</div>
+<!--          <div class="row2" v-if="item1[item.name] != null && item1[item.name] !== ''">{{ item1[item.name] }}</div>-->
 
         </div>
         <div class="row3">
           <label>W:{{ item1.width }}</label>
-          &nbsp;&nbsp;
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           <label>H:{{ item1.height }}</label>
         </div>
 
@@ -133,7 +134,7 @@
 
 body{
   overflow: hidden;
-  font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
+  font-family: Arial;
 
 }
 
@@ -177,23 +178,20 @@
 }
 
 .row1{
-  width: 30%;
-  font-weight: bolder;
+  width: 100%;
 }
 
 .row4{
-  font-weight: bolder;
   text-align: right;
 }
 
 .row1,.row2{
   text-align: left;
-  font-weight: bolder;
 }
 
 @page {
   size: auto;  /* auto is the initial value */
-  margin: 0mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
+  margin: 2mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
 
 }
 

--
Gitblit v1.8.0