From f7a2f13a266861c36c6c514ae67191b029f345b1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/api/department.js | 2 ++
src/views/user/admin/list.vue | 5 +++++
src/views/exam/personalRandomTemplate/edit.vue | 5 +++++
src/views/education/department/list.vue | 5 +++++
src/views/exam/paper/edit.vue | 5 +++++
src/views/user/admin/edit.vue | 13 +++++++++++++
6 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/api/department.js b/src/api/department.js
index 6f52034..08fbe86 100644
--- a/src/api/department.js
+++ b/src/api/department.js
@@ -15,6 +15,8 @@
getDeptUserList: id => get('/api/admin/department/' + id + '/user-list'),
// 鑾峰彇褰撳墠鐢ㄦ埛绠＄悊鐨勯儴闂�
getDeptAdmins: id => get('/api/admin/department/getDeptAdmins'),
+ // 鑾峰彇褰撳墠鐢ㄦ埛绠＄悊鐨勯儴闂紙涓嶅垎灞傜骇鍏崇郴锛�
+ getCurrentDeptId: id => get('/api/admin/department/getCurrentDeptId'),
// 淇敼閮ㄩ棬绠＄悊鍛�
updateDeptAdmin: data => post('/api/admin/department/update-admin', data),
cascaderList: () => get('/api/admin/department/cascader')
diff --git a/src/views/education/department/list.vue b/src/views/education/department/list.vue
index 66a9595..884a261 100644
--- a/src/views/education/department/list.vue
+++ b/src/views/education/department/list.vue
@@ -25,6 +25,11 @@
>
<el-table-column prop="name" label="閮ㄩ棬"/>
<el-table-column prop="adminNames" label="閮ㄩ棬璐熻矗浜�"/>
+ <el-table-column prop="special" label="鏄惁绠＄悊涓夌骇閮ㄩ棬">
+ <template slot-scope="{row}">
+ <el-tag :type="row.special === '1' ? 'success' : 'danger'">{{ row.special === '1' ? '鏄�' : '鍚�' }}</el-tag>
+ </template>
+ </el-table-column>
<!-- <el-table-column prop="levelName" label="閮ㄩ棬" />-->
<el-table-column width="400px" label="鎿嶄綔" align="center">
<template slot-scope="{row}">
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index b9c2e96..d65df94 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -282,6 +282,11 @@
};
},
created() {
+ departmentApi.getCurrentDeptId().then(res => {
+ if (res.response && res.response[0]) {
+ this.form.deptId = res.response[0];
+ }
+ });
let id = this.$route.query.id;
let _this = this;
this.initSubject(function () {
diff --git a/src/views/exam/personalRandomTemplate/edit.vue b/src/views/exam/personalRandomTemplate/edit.vue
index dc1b61b..5a0eb7a 100644
--- a/src/views/exam/personalRandomTemplate/edit.vue
+++ b/src/views/exam/personalRandomTemplate/edit.vue
@@ -309,6 +309,11 @@
});
},
async mounted() {
+ departmentApi.getCurrentDeptId().then(res => {
+ if (res.response && res.response[0]) {
+ this.form.deptId = res.response[0];
+ }
+ });
let id = this.$route.query.id;
let _this = this;
diff --git a/src/views/user/admin/edit.vue b/src/views/user/admin/edit.vue
index cc5f41e..8515cbb 100644
--- a/src/views/user/admin/edit.vue
+++ b/src/views/user/admin/edit.vue
@@ -25,6 +25,11 @@
<el-form-item label="鎵嬫満锛�">
<el-input v-model="form.phone"></el-input>
</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>
@@ -45,6 +50,7 @@
export default {
data () {
return {
+ tags: [],
form: {
id: null,
userName: '',
@@ -69,6 +75,7 @@
}
},
created () {
+ this.getTags();
let id = this.$route.query.id
let _this = this
if (id && parseInt(id) !== 0) {
@@ -80,11 +87,17 @@
}
},
methods: {
+ getTags () {
+ userApi.tagList(null).then(data => {
+ this.tags = data.response
+ })
+ },
submitForm () {
let _this = this
this.$refs.form.validate((valid) => {
if (valid) {
this.formLoading = true
+ this.form.deptIds = null;
userApi.createUser(this.form).then(data => {
if (data.code === 1) {
_this.$message.success(data.message)
diff --git a/src/views/user/admin/list.vue b/src/views/user/admin/list.vue
index d25dcbf..553df5e 100644
--- a/src/views/user/admin/list.vue
+++ b/src/views/user/admin/list.vue
@@ -15,6 +15,11 @@
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" />
+ <el-table-column label="鏍囩" prop="tagNames" align="center">
+ <template slot-scope="{row}">
+ <el-tag class="link-left" v-for="item, index in row.tagNames" :key="index">{{ item }}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
<el-table-column prop="phone" label="鎵嬫満鍙�"/>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
--
Gitblit v1.8.0