From db2c3d7fe3d1e89b49b9628f408ba883dc75dc51 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 17:11:43 +0800
Subject: [PATCH] no message
---
zy-asrs-admin/src/views/out/wave/index.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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..6a4b61a 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,
};
}
@@ -53,7 +55,7 @@
{
title: formatMessage('db.man_wave.wave_no', '娉㈡鍙�'),
dataIndex: 'waveNo',
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('waveNo'),
customCell: (_, index) => {
@@ -63,7 +65,7 @@
{
title: formatMessage('db.man_wave.waveType$', '绫诲瀷'),
dataIndex: 'waveType$',
- width: 140,
+ width: 110,
ellipsis: true,
...getColumnSearchProps('waveType$'),
customCell: (_, index) => {
@@ -73,7 +75,7 @@
{
title: formatMessage('db.man_wave.waveStatus$', '鐘舵��'),
dataIndex: 'waveStatus$',
- width: 140,
+ width: 120,
ellipsis: true,
...getColumnSearchProps('waveStatus$'),
customCell: (_, index) => {
@@ -83,14 +85,14 @@
{
title: formatMessage('db.man_wave.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['mat$', 'matnr'],
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('matnr'),
},
{
title: formatMessage('db.man_wave.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: ['mat$', 'maktx'],
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('maktx'),
},
@@ -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