From cb94e393ea3cd9c1d8bbf1240e44baf084d87bbc Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 16 八月 2024 08:49:24 +0800
Subject: [PATCH] 下片台模块更改图片顺序
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 2aec6e9..7ef904f 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()
@@ -23,6 +26,7 @@
const dialogFormVisible = ref(false);
// 琛ㄥ崟鏁版嵁
const workstationId = ref('');
+const workFlowCard = ref('');
const selectedProjectNoa = ref(null); // 褰撳墠閫変腑鐨勮鑹�
const flowCardId = ref('');
const flowCardOptions = ref('[]');
@@ -35,7 +39,7 @@
const printFlowCardId = ref('')
const printLayer = ref('')
const now = new Date();
-const timeRange = ref([new Date(now.setHours(0, 0, 0, 0)), new Date(now.setHours(23, 59, 59, 999))])
+const timeRange = ref([])
const handleChange = async () => {
console.log("瑙﹀彂寮�鍏�")
@@ -129,6 +133,7 @@
const handleBindRack2 = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ workFlowCard.value=row.flowCardId;
};
//娓呴櫎鍐呭
const handleclear = async () => {
@@ -143,6 +148,9 @@
console.log('娓呴櫎鎴愬姛');
ElMessage.success(response.message);
dialogFormVisiblea2.value = false;
+ if(fullFlowCard.value==workFlowCard.value){
+ fullFlowCard.value="";
+ }
} else if (response.code === 500) {
// 娓呴櫎澶辫触鐨勯�昏緫
console.log('娓呴櫎澶辫触');
@@ -189,12 +197,11 @@
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 == "") {
+
+ if (fullFlowCard.value == ""&&autoPrint.value==true) {
for (let i = 0; i < tableData.length; i++) {
if (tableData[i].totalQuantity != 0) {
if (tableData[i].totalQuantity == tableData[i].racksNumber + tableData[i].otherNumber && fullFlowCard.value != tableData[i].flowCardId) {
@@ -208,7 +215,9 @@
}
}
}
-
+ if(data.params!=null){
+ tableData.splice(0, tableData.length, ...data.params[0]);
+ }
// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
@@ -310,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>#" +
@@ -403,7 +412,7 @@
</el-select>
<span class="demonstration">鏃堕棿娈�</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" value-format = "YYYY-MM-DD hh:mm:ss"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
--
Gitblit v1.8.0