From 274e725e925144a53a70b270bb10b804fa195cd8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 31 十二月 2024 14:43:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 3e74879..7033a51 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -60,7 +60,8 @@
if (response.code === 200) {
tableData.splice(0, tableData.length, ...response.data);
ElMessage.error(response.message);
- }
+ window.localStorage.setItem('engineeringId', tableData[0].engineeringId)
+}
} catch (error) {
}
};
@@ -78,6 +79,7 @@
canSelectProjecta.value = true;
canSelectProjectb.value = true;
canSelectProjectc.value = false;
+ tableData.value = '';
}
};
onBeforeUnmount(() => {
@@ -113,7 +115,7 @@
engineerId: selectedProjectNo.value,
filmRemove: parseInt(filmRemove.value, 10),
})
- window.localStorage.setItem('engineeringId', selectedProjectNo.value)
+ window.localStorage.setItem('engineeringIda', selectedProjectNo.value)
window.localStorage.setItem('filmRemove', filmRemove.value)
if (response.code == 200) {
ElMessage.success(response.message);
@@ -165,13 +167,13 @@
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringId = window.localStorage.getItem('engineeringId')
+ let engineeringIda = window.localStorage.getItem('engineeringIda')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 5,
filmRemove: filmRemove,
- engineerId: engineeringId,
+ engineerId: engineeringIda,
state: 1,
})
if (response.code == 200) {
--
Gitblit v1.8.0