From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue |   69 ++++++++++++----------------------
 1 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
index 49419f2..6f42cef 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
@@ -1,14 +1,12 @@
 <script setup>
 import request from "@/utils/request"
-import {ElDatePicker, ElMessage} from "element-plus"
-import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
-import {Search} from "@element-plus/icons-vue"
+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()
 //璇█鑾峰彇
 const {t} = useI18n()
@@ -19,14 +17,10 @@
 let dataList = ref([])
 let list = ref([])
 let lastList=ref([])
-
 let filterData = ref({})
-
 const data = ref({
   printList: []
 })
-
-
 // const {currentRoute} = useRouter()
 // const route = currentRoute.value
 // data.value.printList = JSON.parse(route.query.printList)
@@ -36,27 +30,22 @@
 let props = defineProps({
   printFlowCardId: null,
   printLayer: null,
+  printGlassId: null,
 })
-
 onMounted(async () => {
-  console.log(props.printFlowCardId,props.printLayer)
-  const response = await request.post('/unLoadGlass/downGlassInfo/downGlassLabelPrint',{
-        flowCardId:props.printFlowCardId,
-        layer:props.printLayer
-    });
+  const response = await request.post('/unLoadGlass/downGlassInfo/downGlassLabelPrint', {
+    flowCardId: props.printFlowCardId,
+    layer: props.printLayer,
+    glassId: props.printGlassId
+  });
         if (response.code == 200) {
           console.log("lastList.value",response.data)
           lastList.value=response.data;
-          
         } else {
           ElMessage.error(response.message);
         }
-
     }
-
 )
-
-
 // // 鎵撳嵃鏂规硶
 // const printFlowCard = () => {
 //   // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
@@ -64,11 +53,9 @@
 //   let doc = document;
 //   let body = doc.body || doc.getElementsByTagName("body")[0];
 //   let printId = "print-" + Date.now();
-
 //   // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
 //   let content = doc.createElement("div");
 //   content.id = printId;
-
 //   // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
 //   let style = doc.createElement("style");
 //   style.innerHTML =
@@ -98,16 +85,20 @@
 //   }, 20);
 // }
 </script>
-
 <template>
   <!-- <el-button id="printButton" @click="printFlowCard();">鎵撳嵃</el-button> -->
   <div id="printFlowCard" >
-    <template v-for="(item,id) in lastList">
+    <template v-for="(item,index) in lastList">
     <div id="entirety" >
-      <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>
       <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;
@@ -120,38 +111,34 @@
         <span>{{ item.processing_note }}</span>
       </div>
     </div>
-    <div style="width: 20px" v-if="id%2===0"></div>
+    <div style="width: 20px" v-if="index%2===0"></div>
+    <div class="print-page" v-else></div>
     </template>
   </div>
-
 </template>
-
 <style scoped>
 * {
   margin: 0;
   padding: 0;
 }
-
 #printButton {
   /*margin-top: -20px;*/
   width: 100px;
 }
-
 #printFlowCard {
   display: flex;
   justify-content: left;
   flex-wrap: wrap;
   width: 500px;
 }
-
 #entirety{
   text-align: center;
-  width: 48%;
-  height: 160px;
+  width: 46%;
+  height: 170px;
   border: black 1px;
   word-wrap: break-word;
+  margin-left: 10px;
 }
-
 .row1 {
   font-size: 12pt;
   font-weight: bold;
@@ -160,7 +147,6 @@
 .row1 span {
   font-size: 12pt;
 }
-
 .row2 {
   font-size: 14pt;
   font-weight: bold;
@@ -173,7 +159,6 @@
   font-size: 12pt;
   font-weight: bold;
 }
-
 .row3 {
   margin-top: -5px;
   height: 35px;
@@ -181,36 +166,30 @@
   font-weight: bolder;
   line-height: 35px;
 }
-
 .row5 {
   height: 50px;
   font-weight: bold;
   font-size: 12pt;
-  margin-left: 20px;
+  /* margin-left: 20px; */
 }
 .row5 span {
   font-size: 12pt;
 }
-
 .row6 {
   height: 15px;
   font-weight: bold;
   font-size: 8pt;
 }
-
-
-
-
-
 @media print {
+  .print-page {
+    page-break-after: always; /* 娣诲姞鍒嗛〉绗︼紝鍦ㄦ瘡涓猵rint-page div涔嬪悗鍒嗛〉 */
+  }
   div {
     page-break-inside: avoid;
   }
   @page {
     size: auto;  /* auto is the initial value */
     margin: 2mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
-
   }
 }
-
 </style>
\ No newline at end of file

--
Gitblit v1.8.0