From 37228d95e8be6406fad13495cd1512cc81b625aa Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 十月 2024 08:12:44 +0800
Subject: [PATCH] 大理片添加指定人工位置下片,下片添加扫码打印标签,添加卧式理片最大尺寸限制

---
 UI-Project/src/views/UnLoadGlass/loadmachinerack.vue |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 5a918af..b0b40f3 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -44,6 +44,7 @@
 const dialogTableVisible1 = ref(false)
 const printFlowCardId = ref('')
 const printLayer = ref('')
+const printGlassId = ref('')
 const now = new Date();
 const timeRange = ref([])
 const browser = ref(false)
@@ -234,6 +235,9 @@
       scanGlass.value.width = height;
       scanGlass.value.height = width;
     }
+    if(autoPrint.value == true && browser.value == true){
+      open1(scanGlass);
+    }
   }
 
   //鑷姩鎵撳嵃
@@ -338,6 +342,7 @@
 
   printFlowCardId.value = row.flowCardId;
   printLayer.value = row.layer
+  printGlassId.value = row.glassId
   dialogTableVisible1.value = true;
   setTimeout(() => {
     printFlowCard1();
@@ -536,6 +541,7 @@
               </div>
               <div style="font-size: 50px; text-align: center;position: absolute;top:0px;left:170px;">
                 <div>浜哄伐涓嬬墖褰撳墠鐜荤拑淇℃伅</div>
+                <div><el-button type="primary" @click="open1(takeGlass)" >鎵撳嵃鏍囩</el-button></div>
                 <div>{{ takeGlass.flowCardId }}</div>
                 <div>{{ takeGlass.layer }}</div>
                 <div>{{ takeGlass.glassId }}</div>
@@ -551,6 +557,7 @@
               </div>
               <div style="font-size: 50px; text-align: center;position: absolute;top:0px;left:200px;">
                 <div>鎵爜鏋綋鍓嶇幓鐠冧俊鎭�</div>
+                <div><el-button type="primary" @click="open1(scanGlass)" >鎵撳嵃鏍囩</el-button></div>
                 <div>{{ scanGlass.flowCardId }}</div>
                 <div>{{ scanGlass.layer }}</div>
                 <div>{{ scanGlass.glassId }}</div>
@@ -622,7 +629,7 @@
       style="width: 100%;height: 100%" />
   </el-dialog>
   <el-dialog id="sizePrintCalrd1" v-model="dialogTableVisible1" destroy-on-close>
-    <print-label id="printFlowCard" :printFlowCardId="printFlowCardId" :printLayer="printLayer" style="" />
+    <print-label id="printFlowCard" :printFlowCardId="printFlowCardId" :printLayer="printLayer" :printGlassId="printGlassId"  style="" />
   </el-dialog>
 
 </template>

--
Gitblit v1.8.0