|
@@ -32,7 +32,7 @@
|
|
|
<el-table :data="tableData" show-summary border>
|
|
|
<el-table-column v-for="(item, index) in columns" :key="index" :prop="item.dicDataValue" :label="item.dicDataName" align="center">
|
|
|
<template #default="{ row, column, $index }">
|
|
|
- <span v-if="column.property === 'orgName'">{{ row.Group_OrgCode_OrgName?.orgName }}</span>
|
|
|
+ <span v-if="column.property === 'OrgName'">{{ row?.OrgName }}</span>
|
|
|
<el-button type="primary" @click="handleDetail(row, row[column.property])" link v-else>{{ row[column.property] }}</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -87,12 +87,12 @@ const queryList = throttle(() => {
|
|
|
departmentUnsatisfied(request)
|
|
|
.then((res: any) => {
|
|
|
columns.value = res.result?.dicReason ?? [];
|
|
|
- columns.value.unshift({ dicDataName: '部门名称', dicDataValue: 'orgName' });
|
|
|
+ columns.value.unshift({ dicDataName: '部门名称', dicDataValue: 'OrgName' });
|
|
|
tableData.value = res.result?.data ?? [];
|
|
|
// 判断部门名称是否重复 重复的合并数据 并去除重复数据
|
|
|
const arr = [];
|
|
|
tableData.value.forEach((item: any) => {
|
|
|
- const index = arr.findIndex((v: any) => v.Group_OrgCode_OrgName.orgName === item.Group_OrgCode_OrgName.orgName);
|
|
|
+ const index = arr.findIndex((v: any) => v.OrgName === item.OrgName);
|
|
|
if (index === -1) {
|
|
|
arr.push(item);
|
|
|
} else {
|
|
@@ -136,7 +136,7 @@ const handleDetail = (row: any, column) => {
|
|
|
id: columnKey,
|
|
|
startTime: startTime ?? 'null',
|
|
|
endTime: endTime ?? 'null',
|
|
|
- orgId: row.Group_OrgCode_OrgName?.orgCode,
|
|
|
+ orgId: row?.OrgCode,
|
|
|
},
|
|
|
});
|
|
|
};
|