From 5c2c761c8fad6be3f3e65fcfa1af2e6047edf731 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 15 八月 2024 10:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 5463263..e72c5e9 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -6,6 +6,9 @@
import request from "@/utils/request";
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {host, WebSocketHost} from '@/utils/constants'
+import PrintFlow from "@/views/UnLoadGlass/PrintFlow.vue";
+import Landingindication from "./Landingindication.vue";
+import Landingindicationtwo from "./Landingindicationtwo.vue";
const router = useRouter()
const {t} = useI18n()
@@ -146,7 +149,7 @@
ElMessage.success(response.message);
dialogFormVisiblea2.value = false;
if(fullFlowCard.value==workFlowCard.value){
- fullFlowCard.value=="";
+ fullFlowCard.value="";
}
} else if (response.code === 500) {
// 娓呴櫎澶辫触鐨勯�昏緫
@@ -194,11 +197,10 @@
selectOptionsa.value = data.engineerIdList[0]
}
if (data.autoPrint != null) {
- autoPrint.value = data.autoPrint;
+ autoPrint.value = data.autoPrint[0];
}
- console.log(autoPrint.value)
- tableData.splice(0, tableData.length, ...data.params[0]);
+
if (fullFlowCard.value == ""&&autoPrint.value==true) {
for (let i = 0; i < tableData.length; i++) {
if (tableData[i].totalQuantity != 0) {
@@ -213,7 +215,9 @@
}
}
}
-
+ if(data.params!=null){
+ tableData.splice(0, tableData.length, ...data.params[0]);
+ }
// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
@@ -315,7 +319,7 @@
"{display:none}@media print{" +
"@page {" +
" size: auto; " +
- " margin: 2mm 2mm 0mm 1mm; " +
+ " margin: 10mm 2mm 10mm 1mm; " +
" }body>:not(#" +
printId +
"){display:none !important}body>#" +
--
Gitblit v1.8.0