From 88dac9c2f9b83c627fa94d6b035b332a2f0e3d15 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 08 七月 2024 18:22:09 +0800
Subject: [PATCH] 标签增加部门、子管理员也有标签管理
---
src/views/user/student/list.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 38fcd86..c6b3a81 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -39,7 +39,7 @@
<el-tag :type="row.condition == '姝ｅ父' || row.condition == null ? 'success' : 'warning'">{{ row.condition ? row.condition : '姝ｅ父' }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
+ <el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter" align="center"/>
<el-table-column prop="phone" label="鎵嬫満鍙�" width="120"/>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
<el-table-column label="鐘舵��" prop="status" width="70px">
@@ -60,7 +60,7 @@
<router-link :to="{path:'/log/user/list', query:{userId:row.id}}" class="link-left">
<el-button size="mini" >鏃ュ織</el-button>
</router-link>
- <el-button size="mini" @click="status(row)" class="link-left">鐘舵��</el-button>
+ <el-button type="primary" size="mini" @click="status(row)" class="link-left">鐘舵��</el-button>
<el-button type="primary" size="mini" @click="transposition(row)" class="link-left">璋冨姩</el-button>
<el-popconfirm title="纭鍒犻櫎鍚�" @confirm="deleteUser(row)">
<el-button v-if="!deptAdmin()" slot="reference" size="mini" type="danger" class="link-left">鍒犻櫎</el-button>
@@ -92,14 +92,13 @@
:title="title"
:visible.sync="dialogVisible"
width="400px">
- <el-select v-model="examine.departmentId" multiple filterable placeholder="璇烽�夋嫨閮ㄩ棬">
- <el-option
- v-for="item in deptList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
+ <el-cascader
+ clearable
+ :disabled="this.$route.query.id"
+ v-model="examine.departmentId"
+ :options="deptList"
+ :props="{ emitPath: false, multiple: true, value: 'id', label: 'name', checkStrictly: true }"
+ ></el-cascader>
<el-input type="textarea" maxlength="100" show-word-limit :autosize="{ minRows: 4}" :rows="2" v-model="examine.reason" placeholder="璇疯緭鍏ユ儏鍐佃鏄�" style="margin-top: 30px;"></el-input>
<upload :fileUrl="examine.contentUrl" :fileSizeLimitM="1024" :uploadNum="1" @getUploadUrl="getUploadAttachmentUrl" @removeFile="removeAttachmentFile" style="margin-top: 30px;"/>
<span slot="footer" class="dialog-footer">
@@ -115,6 +114,7 @@
import Pagination from '@/components/Pagination'
import userApi from '@/api/user'
import departmentExamineApi from '@/api/departmentExamine'
+import department from '@/api/department'
import Upload from '@/components/UploadC'
export default {
@@ -197,10 +197,14 @@
})
},
transposition(item) {
+ if (item.departmentExamineResult) {
+ this.$message.warning("璇ョ敤鎴疯皟鍔ㄥ緟瀹℃牳");
+ return
+ }
this.examine.userId = item.id
this.examine.departmentId = item.deptIdList
this.examine.nowDepartmentIds = item.deptIdList.join(',')
- departmentExamineApi.getDeptList().then(res => {
+ department.getDeptAdmins().then(res => {
if (res.code === 1) {
this.deptList = res.response
this.dialogVisible = true
@@ -210,6 +214,10 @@
})
},
status(user) {
+ if (user.conditionExamineResult) {
+ this.$message.warning("璇ョ敤鎴风姸鎬佸緟瀹℃牳");
+ return
+ }
this.statusVisible = true;
this.conditionExamine.sourceCondition = user.condition ? user.condition : '0';
this.conditionExamine.userId = user.id
--
Gitblit v1.8.0