From 62c740e91951c0c4782165ce667eb8017fe76f38 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 16 十月 2024 13:51:07 +0800
Subject: [PATCH] 部门管理员没有标签菜单
---
src/views/user/student/list.vue | 319 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 283 insertions(+), 36 deletions(-)
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 94b1815..346d738 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -4,6 +4,14 @@
<el-form-item label="鐪熷疄濮撳悕锛�">
<el-input v-model="queryParam.userName" size="small" clearable></el-input>
</el-form-item>
+ <el-form-item label="閮ㄩ棬锛�">
+ <el-cascader
+ clearable
+ v-model="queryParam.departmentId"
+ :options="depts"
+ :props="{ emitPath: false, value: 'id', label: 'name', checkStrictly: true, multiple: true }"
+ ></el-cascader>
+ </el-form-item>
<el-form-item >
<div style="display: flex">
<el-button type="primary" @click="submitForm" size="small">鏌ヨ</el-button>
@@ -20,7 +28,6 @@
:file-list="fileList"
:before-upload="beforeAvatarUpload">
<el-button type="primary">瀵煎叆</el-button>
- <!-- <div slot="tip" class="el-upload__tip">鍙兘涓婁紶Excel鏂囦欢</div>-->
</el-upload>
</div>
</el-form-item>
@@ -30,9 +37,9 @@
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" width="150"/>
<el-table-column prop="deptNames" label="閮ㄩ棬" />
- <el-table-column label="鏍囩" prop="tagNames" width="80px">
+ <el-table-column label="鏍囩" prop="tagNames" align="center">
<template slot-scope="{row}">
- <el-tag style="margin: 5px;" v-for="(item,index) in row.tagNames" :key="index">{{ item }}</el-tag>
+ <el-tag v-for="(item, index) in row.tagNames" :key="index">{{ item }}</el-tag>
</template>
</el-table-column>
<el-table-column label="浜哄憳鐘舵��" prop="condition" align="center" width="100px">
@@ -40,8 +47,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="conditionDetail" label="鍏蜂綋鎯呭喌" show-overflow-tooltip="true"/>
- <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">
@@ -51,20 +57,20 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column width="400px" label="鎿嶄綔" fixed="right" align="center">
+ <el-table-column :width="deptAdmin() ? '310px' : '350px'" label="鎿嶄綔" fixed="right" align="center">
<template slot-scope="{row}">
- <el-button size="mini" @click="changeStatus(row)" class="link-left">
+ <el-button size="mini" v-if="!deptAdmin()" @click="changeStatus(row)" class="link-left">
{{ statusBtnFormatter(row.status) }}
</el-button>
- <router-link :to="{path:'/user/student/edit', query:{id:row.id}}" class="link-left">
- <el-button size="mini" >缂栬緫</el-button>
- </router-link>
- <router-link :to="{path:'/log/user/list', query:{userId:row.id}}" class="link-left">
+ <el-button size="mini" @click="handleEdit(row.id)">缂栬緫</el-button>
+ <!-- <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="move(row)" class="link-left">璋冨姩</el-button>
- <el-button size="mini" type="danger" @click="deleteUser(row)" class="link-left">鍒犻櫎</el-button>
+ </router-link> -->
+ <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>
+ </el-popconfirm>
</template>
</el-table-column>
</el-table>
@@ -72,17 +78,96 @@
@pagination="search"/>
<!-- 鐘舵�佸脊绐� -->
- <el-dialog :visible.sync="statusVisible" append-to-body :close-on-click-modal="false" :show-close="false" center width="400px">
- <el-radio-group v-model="user.condition">
+ <el-dialog :visible.sync="statusVisible" append-to-body :show-close="false" center width="400px">
+ <el-radio-group v-model="conditionExamine.targetCondition">
<el-radio label="姝ｅ父">姝ｅ父</el-radio>
<el-radio label="鐥呭亣">鐥呭亣</el-radio>
<el-radio label="鍑哄樊">鍑哄樊</el-radio>
<el-radio label="鍏朵粬">鍏朵粬</el-radio>
</el-radio-group>
- <el-input type="textarea" maxlength="100" show-word-limit :autosize="{ minRows: 4}" :rows="2" v-model="user.conditionDetail" placeholder="璇疯緭鍏ヨ缁嗘儏鍐�" style="margin-top: 30px;"></el-input>
+ <el-input type="textarea" maxlength="100" show-word-limit :autosize="{ minRows: 4}" :rows="2" v-model="conditionExamine.reason" placeholder="璇疯緭鍏ヨ缁嗘儏鍐�" style="margin-top: 30px;"></el-input>
+ <upload :fileUrl="conditionExamine.contentUrl" :fileSizeLimitM="1024" :uploadNum="1" @getUploadUrl="getConditionUploadAttachmentUrl" @removeFile="removeConditionAttachmentFile" style="margin-top: 30px;"/>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="statusConfirm">纭� 瀹�</el-button>
<el-button @click="statusVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
+
+ <el-dialog
+ title="缂栬緫"
+ :visible.sync="editShow"
+ width="800px"
+ :before-close="handleClose">
+ <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
+ <el-form-item label="鐢ㄦ埛鍚嶏細" prop="userName" required>
+ <el-input v-model="form.userName"></el-input>
+ </el-form-item>
+ <el-form-item label="瀵嗙爜锛�" required>
+ <el-input v-model="form.password" type="password"></el-input>
+ </el-form-item>
+ <el-form-item label="鐪熷疄濮撳悕锛�" prop="realName" required>
+ <el-input v-model="form.realName"></el-input>
+ </el-form-item>
+ <el-form-item label="骞撮緞锛�">
+ <el-input v-model="form.age"></el-input>
+ </el-form-item>
+ <el-form-item label="鎬у埆锛�">
+ <el-select v-model="form.sex" placeholder="鎬у埆" clearable>
+ <el-option v-for="item in sexEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍑虹敓鏃ユ湡锛�" prop="birthDay">
+ <el-date-picker v-model="form.birthDay" required type="date" value-format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" />
+ </el-form-item>
+ <el-form-item label="鎵嬫満锛�">
+ <el-input v-model="form.phone"></el-input>
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬锛�" prop="deptIds" required>
+ <!-- <el-select v-model="form.deptIds" multiple collapse-tags placeholder="閮ㄩ棬" :disabled="this.$route.query.id">
+ <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select> -->
+ <el-cascader
+ clearable
+ :disabled="this.$route.query.id"
+ v-model="form.deptIds"
+ :options="depts"
+ :props="{ emitPath: false, multiple: true, value: 'id', label: 'name', checkStrictly: true }"
+ ></el-cascader>
+ </el-form-item>
+ <el-form-item label="鏍囩锛�" prop="tagIds">
+ <el-select v-model="form.tagIds" multiple collapse-tags placeholder="鏍囩">
+ <el-option v-for="item in tags" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐘舵�侊細" required>
+ <el-select v-model="form.status" placeholder="鐘舵��">
+ <el-option v-for="item in statusEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="handleClose">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitEdit">鎻� 浜�</el-button>
+ </span>
+ </el-dialog>
+
+ <!-- 璋冨姩寮圭獥 -->
+ <el-dialog
+ :title="title"
+ :visible.sync="dialogVisible"
+ width="400px">
+ <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">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitExamine">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -92,40 +177,179 @@
import { mapGetters, mapState } from 'vuex'
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 {
- components: { Pagination },
+ components: { Pagination, Upload },
+ computed: {
+ fileContentUrl: () => {
+ return this.form ? this.form.contentUrl ? [this.form.contentUrl] : [] : [];
+ }
+ },
data () {
return {
+ editShow: false,
+ depts: [],
+ tags: [],
+ value2:[],
+ form: {
+ id: null,
+ userName: '',
+ password: '',
+ realName: '',
+ role: 1,
+ status: 1,
+ age: '',
+ sex: '',
+ birthDay: null,
+ phone: null,
+ deptIds: [],
+ tagIds: []
+ },
+ formLoading: false,
+ rules: {
+ userName: [
+ { required: true, message: '璇疯緭鍏ョ敤鎴峰悕', trigger: 'blur' }
+ ],
+ realName: [
+ { required: true, message: '璇疯緭鍏ョ湡瀹炲鍚�', trigger: 'blur' }
+ ],
+ deptIds: [
+ { required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'change' }
+ ]
+ },
user:{},
statusVisible: false,
upLoadUrl:'/api/admin/user/import',
fileList:[],
queryParam: {
userName: '',
- role: 1,
+ departmentId: [],
+ roles: [1],
pageIndex: 1,
pageSize: 10
},
listLoading: true,
tableData: [],
- total: 0
+ total: 0,
+ examine: {
+ userId: '',
+ departmentId: [],
+ departmentIds: '',
+ nowDepartmentIds: '',
+ contentUrl: [],
+ attachment: ''
+ },
+ conditionExamine: {
+ userId: '',
+ targetCondition: '',
+ sourceCondition: '',
+ reason: '',
+ result: 0,
+ contentUrl: [],
+ attachment: ''
+ },
+ title: '閮ㄩ棬璋冨姩',
+ dialogVisible: false,
+ deptList: []
}
},
created () {
- this.search()
+ this.search();
+ this.getTags();
+ department.getDeptAdmins().then(res => {
+ this.depts = res.response;
+ })
},
methods: {
+ handleClose() {
+ this.form = {
+ id: null,
+ userName: '',
+ password: '',
+ realName: '',
+ role: 1,
+ status: 1,
+ age: '',
+ sex: '',
+ birthDay: null,
+ phone: null,
+ deptIds: [],
+ tagIds: []
+ }
+ this.editShow = false
+ this.search()
+ },
+ getTags () {
+ userApi.tagList(null).then(data => {
+ this.tags = data.response
+ })
+ },
+ deptAdmin() {
+ return sessionStorage.getItem('deptAdmin') === '1'
+ },
+ removeAttachmentFile(fileList, fileName) {
+ this.examine.attachment = JSON.stringify(fileList.filter(item => item.name !== fileName));
+ this.examine.contentUrl = fileList.filter(item => item.name !== fileName);
+ },
+ getUploadAttachmentUrl(uploadData) {
+ this.examine.attachment = JSON.stringify(uploadData);
+ this.examine.contentUrl = uploadData;
+ },
+ removeConditionAttachmentFile(fileList, fileName) {
+ this.conditionExamine.attachment = JSON.stringify(fileList.filter(item => item.name !== fileName));
+ this.conditionExamine.contentUrl = fileList.filter(item => item.name !== fileName);
+ },
+ getConditionUploadAttachmentUrl(uploadData) {
+ this.conditionExamine.attachment = JSON.stringify(uploadData);
+ this.conditionExamine.contentUrl = uploadData;
+ },
+ submitExamine() {
+ this.examine.departmentIds = this.examine.departmentId.join(',')
+ departmentExamineApi.save(this.examine).then(res => {
+ if (res.code === 1) {
+ this.$message.success("鎻愪氦鎴愬姛锛屽鏍稿悗鐢熸晥")
+ this.dialogVisible = false
+ this.search()
+ } else {
+ this.$message.error("鎿嶄綔澶辫触")
+ }
+ })
+ },
+ 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(',')
+ department.getDeptAdmins().then(res => {
+ if (res.code === 1) {
+ this.deptList = res.response
+ this.dialogVisible = true
+ } else {
+ this.$message.error(res.message)
+ }
+ })
+ },
status(user) {
+ if (user.conditionExamineResult) {
+ this.$message.warning("璇ョ敤鎴风姸鎬佸緟瀹℃牳");
+ return
+ }
this.statusVisible = true;
- this.user = { ...user };
+ this.conditionExamine.sourceCondition = user.condition ? user.condition : '0';
+ this.conditionExamine.userId = user.id
},
statusConfirm() {
- if (this.user.condition === null) {
+ if (this.conditionExamine.targetCondition === null) {
this.$message.error("璇烽�夋嫨鐘舵��")
return
}
- userApi.setStatus(this.user).then(res => {
+ userApi.setStatus(this.conditionExamine).then(res => {
if (res.code === 1) {
this.$message.success("鎿嶄綔鎴愬姛")
this.statusVisible = false;
@@ -154,17 +378,6 @@
this.$message.warning('鏂囦欢鏍煎紡涓嶅锛屼粎闄恱ls鍜寈lsx')
return false
}
- // console.log(file)
- // const isJPG = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
- // // const isLt2M = file.size / 1024 / 1024 < 2;
- //
- // if (!isJPG) {
- // this.$message.error('涓婁紶鏂囦欢鍙兘鏄疎xcel!');
- // }
- // // if (!isLt2M) {
- // // this.$message.error('涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!');
- // // }
- // return isJPG ;
},
search () {
this.listLoading = true
@@ -174,6 +387,20 @@
this.total = re.total
this.queryParam.pageIndex = re.pageNum
this.listLoading = false
+ })
+ },
+ handleEdit(id) {
+ this.formLoading = true
+ userApi.selectUser(id).then(re => {
+ this.form = re.response
+ this.formLoading = false
+ const isEmpty = re.response.deptIds.trim().length === 0;
+ if (isEmpty){
+ this.form.deptIds = []
+ }else {
+ this.form.deptIds = re.response.deptIds.split(',').map(Number)
+ }
+ this.editShow = true
})
},
changeStatus (row) {
@@ -198,6 +425,26 @@
}
})
},
+ submitEdit () {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.formLoading = true
+ userApi.createUser(this.form).then(data => {
+ if (data.code === 1) {
+ this.$message.success(data.message)
+ this.handleClose()
+ } else {
+ this.$message.error(data.message)
+ this.formLoading = false
+ }
+ }).catch(e => {
+ this.formLoading = false
+ })
+ } else {
+ return false
+ }
+ })
+ },
submitForm () {
this.queryParam.pageIndex = 1
this.search()
--
Gitblit v1.8.0