From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/components/task/showTaskDetl/index.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-admin/src/components/task/showTaskDetl/index.vue b/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
index 64b3225..040af68 100644
--- a/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
+++ b/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
@@ -51,13 +51,13 @@
...getColumnSearchProps('taskNo'),
},
{
- title: formatMessage('db.man_task_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_task_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['mat$', 'matnr'],
width: 140,
ellipsis: true,
},
{
- title: formatMessage('db.man_task_detl.maktx', '鐗╂枡鍚�'),
+ title: formatMessage('db.man_task_detl.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: ['mat$', 'maktx'],
width: 140,
ellipsis: true,
@@ -96,6 +96,13 @@
width: 140,
ellipsis: true,
...getColumnSearchProps('orderNo'),
+ },
+ {
+ title: formatMessage('db.man_task_detl.wave_no', '娉㈡缂栧彿'),
+ dataIndex: ['wave$', 'waveNo'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveNo'),
},
];
@@ -151,6 +158,8 @@
watch(taskId, (newVal, oldVal) => {
if (newVal != null) {
+ state.loading = true;
+ tableData.value = []
get("/api/taskDetl/taskId/" + newVal, {}).then((resp) => {
let result = resp.data;
let index = 1;
@@ -160,6 +169,8 @@
tmp.push(item)
})
tableData.value = tmp;
+
+ state.loading = false;
})
get("/api/task/" + newVal, {}).then((resp) => {
@@ -210,11 +221,17 @@
</div>
</div>
<a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
- :scroll="{ y: 768 }" :columns="state.columns">
+ :scroll="{ y: 768 }" :columns="state.columns" :loading="state.loading">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'orderNo'">
<a-button type="link" @click="openOrderDetl(record)">{{ text }}</a-button>
</template>
+
+ <template v-if="typeof (column.dataIndex) === 'object'">
+ <template v-if="column.dataIndex[1] === 'waveNo'">
+ {{ text }}
+ </template>
+ </template>
</template>
</a-table>
</a-modal>
--
Gitblit v1.9.1