From 249575ff2f0d737f4ef01dfb1c09d82078144fda Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 17 三月 2025 15:17:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index e401059..8c06ef2 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -84,24 +84,17 @@
if (data.LoadOneState != null) {
cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
}
- if (data.stationOne != null) {
- data.stationOne[0].forEach((station) => {
- if(station.patternThickness !== undefined){
- station.haspatternThickness=false;
- }else{
- station.haspatternThickness=true;
- }
- // stationInfos[station.patternThickness] = {
- // haspatternThickness: station.patternThickness !== undefined,
- // };
- });
-
- console.log(data.stationOne);
- if (data.list != null) {
- tableDataa.value = data.list[0].slice(0, 2);
- } else {
- tableDataa.value = [];
- }
+if (data.stationOne!=null) {
+ const processedData = [...data.stationOne[0]];
+ if (processedData.length > 0) {
+ processedData[0] = { ...processedData[0], workstationId: 1 };
+ }
+ if (processedData.length > 1) {
+ processedData[1] = { ...processedData[1], workstationId: 2 };
+ }
+ tableDataa.value = processedData;
+ }else {
+ tableDataa.value = []
}
if(data.loadTask1!=null){
tableData.value = data.loadTask1[0]
@@ -506,7 +499,7 @@
<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" :disabled="(!stationInfos[scope.row.patternThickness])" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
+ <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0