liangbin
/
JSDW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(用户管理): 统一角色显示字段为roleNames并更新单位管理相关字段 

将用户管理和审核中的角色显示字段从remark改为roleNames
在单位管理中将unitName和unitType字段更新为deptName和deptType
同时更新相关API调用和类型判断方法
This commit is contained in:
liangbin 2026-01-30 13:37:35 +08:00
parent 06b10364fa
commit 8ef3a7c6f1
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/Logistics/UserManagement/index.vue
View File

@ -89,7 +89,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="phonenumber" label="联系电话" /> <el-table-column prop="phonenumber" label="联系电话" />
<el-table-column prop="remark" label="角色" /> <el-table-column prop="roleNames" label="角色" />
<el-table-column prop="status" label="状态"> <el-table-column prop="status" label="状态">
<template #default="{ row }"> <template #default="{ row }">
<el-tag :type="getStatusTagType(row.status)">{{ statusMap[row.status] }}</el-tag> <el-tag :type="getStatusTagType(row.status)">{{ statusMap[row.status] }}</el-tag>

2
src/views/Logistics/UserReview/index.vue
View File

@ -27,7 +27,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="phonenumber" label="联系电话" /> <el-table-column prop="phonenumber" label="联系电话" />
<el-table-column prop="remark" label="角色" /> <el-table-column prop="roleNames" label="角色" />
<el-table-column prop="status" label="状态"> <el-table-column prop="status" label="状态">
<template #default="{ row }"> <template #default="{ row }">
<el-tag type="primary"> <el-tag type="primary">

15
src/views/Tenement/EnterpriseManagement/index.vue
View File

@ -40,10 +40,10 @@
<div class="card-box"> <div class="card-box">
<el-table v-loading="loading" :data="tableData" > <el-table v-loading="loading" :data="tableData" >
<el-table-column prop="unitName" label="单位名称"></el-table-column> <el-table-column prop="deptName" label="单位名称"></el-table-column>
<el-table-column prop="unitType" label="单位类型"> <el-table-column prop="deptType" label="单位类型">
<template #default="scope"> <template #default="scope">
{{ getUnitTypeName(scope.row.unitType) }} {{ getUnitTypeName(scope.row.deptType) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="areaName" label="所属区域"></el-table-column> <el-table-column prop="areaName" label="所属区域"></el-table-column>
@ -78,6 +78,7 @@
<script setup name="Index"> <script setup name="Index">
import { ref, onMounted } from "vue"; import { ref, onMounted } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { listDept } from "@/api/system/dept";
import { listUnitArchive, delUnitArchive, changeUnitArchiveStatus } from "@/api/unit"; import { listUnitArchive, delUnitArchive, changeUnitArchiveStatus } from "@/api/unit";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
@ -103,7 +104,7 @@ const getList = async () => {
loading.value = true; loading.value = true;
try { try {
const params = { const params = {
unitType: parseInt(activeTab.value), deptType: parseInt(activeTab.value),
pageNum: pageNum.value, pageNum: pageNum.value,
pageSize: pageSize.value pageSize: pageSize.value
}; };
@ -119,7 +120,7 @@ const getList = async () => {
params.status = queryForm.value.status; params.status = queryForm.value.status;
} }
const response = await listUnitArchive(params); const response = await listDept(params);
if (response.code === 200) { if (response.code === 200) {
tableData.value = response.rows || response.data || []; tableData.value = response.rows || response.data || [];
total.value = response.total || 0; total.value = response.total || 0;
@ -253,13 +254,13 @@ const handleDelete = (row) => {
}; };
// 根据unitType获取单位类型名称 // 根据unitType获取单位类型名称
const getUnitTypeName = (unitType) => { const getUnitTypeName = (deptType) => {
const typeMap = { const typeMap = {
1: '施工单位', 1: '施工单位',
2: '监理单位', 2: '监理单位',
3: '业主单位' 3: '业主单位'
}; };
return typeMap[unitType] || '未知类型'; return typeMap[deptType] || '未知类型';
}; };
// 组件挂载时获取数据 // 组件挂载时获取数据