From ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue |   78 +++++++++++++++++++++++++++-----------
 1 files changed, 55 insertions(+), 23 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 1751cb6..628e4d1 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
@@ -13,6 +13,7 @@
 let produceList = ref([])
 let labelList = ref([])
 let projectNo = ref([])
+let type = ref([])
 let orderId = ref([])
 const data = ref({
   printList: []
@@ -24,19 +25,19 @@
 const {currentRoute} = useRouter()
 const route = currentRoute.value
 projectNo.value = route.query.projectNo
-data.value.printList = JSON.parse(route.query.printList)
+type.value = route.query.type
 onMounted(() => {
   if(projectNo.value!=null){
-    request.post(`/processCard/getSelectPrintLabel/${projectNo.value}`).then((res) => {
+    request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
       if (res.code == 200) {
         labelList.value = deepClone(res.data.data)
-
       } else {
         ElMessage.warning(res.msg)
         router.push("/login")
       }
     })
   }else{
+    data.value.printList = JSON.parse(route.query.printList)
     request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => {
       if (res.code == 200) {
         produceList.value = deepClone(res.data.data)
@@ -83,7 +84,11 @@
     style.innerHTML =
         "body>#" +
         printId +
-        "{display:none}@media print{body>:not(#" +
+        "{display:none}@media print{" +
+        "@page {" +
+        "    size: auto; " +
+        "    margin: 13mm 4mm 0mm 4mm; " +
+        "  }body>:not(#" +
         printId +
         "){display:none !important}body>#" +
         printId +
@@ -127,19 +132,23 @@
     </div>-->
     <div id="entirety" v-for="(item,id) in labelList" >
         <div class="row1">
+
+          <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.type_name.includes('涓┖')">涓┖</span>
-          <span v-else-if="item.type_name.includes('澶瑰眰')">澶瑰眰</span>
-          <span v-else-if="item.type_name.includes('澶硅兌')">澶硅兌</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>
 
-        <div class="row3" v-if="item.other_columns==null||(JSON.parse(item.other_columns).S02==null)">{{item.width}}*{{item.height}}={{item.quantity}}</div>
-        <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</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>{{item.project}}</span>&nbsp;
           <span>{{ item.building_number }}</span>
+          <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
         </div>
         <div class="row6">
           <span>{{item.glass_child}}</span>&nbsp;
@@ -166,20 +175,26 @@
   justify-content: left;
   flex-wrap: wrap;
   margin-left: 5px;
-  margin-top: 15px;
 }
 
 #entirety{
   text-align: center;
-  width: 185px;
+  width: 180px;
   height: 87px;
   margin-bottom: 10px;
+  margin-right: 5px;
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 .row1 {
   font-size: 8pt;
   font-weight: bold;
   height: 20px;
+}
+.row1 span {
+  font-size: 8pt;
+  font-weight: bold;
 }
 
 .row2 {
@@ -192,15 +207,17 @@
   font-weight: bold;
 }
 
-.row1 span {
-  font-size: 8pt;
-  font-weight: bold;
-}
+
+
+
+
+
+
 
 .row3 {
   margin-top: -5px;
   height: 25px;
-  font-size: 12pt;
+  font-size: 15pt;
   font-weight: bolder;
 }
 
@@ -209,25 +226,40 @@
   font-weight: bold;
   font-size: 8pt;
 }
+.row5 span {
+  font-size: 10pt;
+  font-weight: bold;
+}
 
 .row6 {
   height: 20px;
   font-weight: bold;
   font-size: 8pt;
 }
-
-
-
-@page {
-  size: auto;  /* auto is the initial value */
-  margin: 8mm 4mm 0mm 6mm  /* this affects the margin in the printer settings */
-
+.row6 span {
+  font-size: 10pt;
+  font-weight: bold;
 }
+.cell{
+  position: absolute;
+  font-weight: bold;
+  margin-left: 5px;
+  margin-top: 0px;
+}
+
+
+
+
 
 @media print {
   div {
     page-break-inside: avoid;
   }
+  @page {
+    size: auto;  /* auto is the initial value */
+    margin: 13mm 4mm 0mm 4mm;  /* this affects the margin in the printer settings */
+
+  }
 }
 
 </style>
\ No newline at end of file

--
Gitblit v1.8.0