From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/userManagement.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/company/src/views/business/userManagement.vue b/company/src/views/business/userManagement.vue
index a33803b..f0d98fb 100644
--- a/company/src/views/business/userManagement.vue
+++ b/company/src/views/business/userManagement.vue
@@ -36,20 +36,19 @@
<el-table-column prop="username" label="璐﹀彿" min-width="120px"></el-table-column>
<el-table-column prop="realname" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="100px"></el-table-column>
- <el-table-column prop="companyDepartmentPathName" label="褰掑睘鍏徃" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="褰掑睘鍏徃" min-width="100px"></el-table-column>
<el-table-column label="鎺堟潈浼佷笟" min-width="100px">
<template slot-scope="{row}">
<span>{{row.authNum}}瀹�</span>
</template>
</el-table-column>
- <el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
+ <el-table-column label="鏄惁瓒呯" min-width="100px">
<template slot-scope="{row}">
- <ul>
- <li v-for="role in row.roles" :key="role.id">{{role.name}}</li>
- </ul>
+ <span v-if="row.isAdmin === '1'">鏄�</span>
+ <span v-if="row.isAdmin === '0'">鍚�</span>
</template>
</el-table-column>
- <el-table-column label="鍚敤鐘舵��" min-width="100px">
+ <el-table-column label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<el-switch
v-if="!row.fixed"
@@ -99,7 +98,8 @@
username: '',
realname: '',
mobile: '',
- companyName: ''
+ companyName: '',
+ type: 1
}
}
},
--
Gitblit v1.9.3