From bf44ae2dd15b2b139ce56b1ba1294fdfd220c763 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 25 十二月 2024 17:13:34 +0800
Subject: [PATCH] #问题修复 1. 列表字段空间调整 2. 地址链接放至配置文件中 3. 定时任务执行完成后，状态修改补上 4. 修改状态时，需校验上一步状态是否对应 5. 下发任务完成后，查看是否修改状态为2 7. 任务状态列表，数据显示不全问题修复 8. 波次列表，表格合并问题导致多订单出库问题
---
zy-asrs-admin/src/views/out/wave/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-admin/src/views/out/wave/index.vue b/zy-asrs-admin/src/views/out/wave/index.vue
index 1223551..cae5cfd 100644
--- a/zy-asrs-admin/src/views/out/wave/index.vue
+++ b/zy-asrs-admin/src/views/out/wave/index.vue
@@ -41,10 +41,12 @@
let tableDataColSpan = []
const customColSpanProps = (index) => {
let count = tableDataColSpan[index];
- if (count == null) {
+ console.log(index + ' ----=====-->' + count)
+ if (count == null || count == undefined) {
count = 0;
}
- return {
+ console.log(' ----=====-->' + count)
+ return {
rowSpan: count,
};
}
@@ -150,13 +152,11 @@
let colSpan = []
data.forEach((item) => {
let count = 0;
-
item.waveDetlList.forEach((detl) => {
detl.waveStatus = item.waveStatus;
detl.waveStatus$ = item.waveStatus$;
detl.waveType = item.waveType;
detl.waveType$ = item.waveType$;
-
count++;
tmp.push(detl)
})
@@ -166,10 +166,11 @@
})
tableDataColSpan = colSpan;
+ console.log('=========>');
+ console.log(tmp)
+ console.log(tableDataColSpan);
tableData.value = tmp;
-
state.loading = false;
-
} else if (result.code === 401) {
message.error(result.msg);
logout()
--
Gitblit v1.9.1