From b62c6c9ab29e933fd0333ac183ef837d00aba5d2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 18:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/education/department/edit.vue | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/views/education/department/edit.vue b/src/views/education/department/edit.vue
index ea06fa2..ab7efb8 100644
--- a/src/views/education/department/edit.vue
+++ b/src/views/education/department/edit.vue
@@ -5,12 +5,20 @@
<el-form-item label="閮ㄩ棬锛�" required>
<el-input v-model="form.name"></el-input>
</el-form-item>
+ <el-form-item label="涓婄骇閮ㄩ棬锛�">
+ <el-cascader
+ clearable
+ v-model="form.parentId"
+ :options="cascaderList"
+ :props="{ checkStrictly: true }"
+ ></el-cascader>
+ </el-form-item>
<!-- <el-form-item label="閮ㄩ棬锛�" required>-->
<!-- <el-select v-model="form.level" placeholder="閮ㄩ棬">-->
<!-- <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
- <el-form-item label="绠＄悊鍛橈細" required>
+ <el-form-item v-if="fig === 0" label="绠＄悊鍛橈細">
<el-select v-model="form.adminId" filterable placeholder="閫夋嫨绠＄悊鍛�">
<el-option
v-for="item in deptUserList"
@@ -34,12 +42,15 @@
export default {
data () {
return {
+ // 閮ㄩ棬绾ц仈涓嬫媺
+ cascaderList: [],
// 閮ㄩ棬浜哄憳
deptUserList: [],
depart: [],
form: {
id: null,
name: '',
+ parentId: null,
adminId: null
// level: 1,
// levelName: ''
@@ -54,6 +65,7 @@
if (id && parseInt(id) !== 0) {
_this.formLoading = true
departmentApi.select(id).then(re => {
+ re.response.parentId = re.response.parentIds
_this.form = re.response
_this.formLoading = false
})
@@ -66,7 +78,15 @@
_this.fig = 0 // 鏄紪杈�
}
},
+ mounted() {
+ this.getCascaderList()
+ },
methods: {
+ getCascaderList() {
+ departmentApi.cascaderList().then(res => {
+ this.cascaderList = res.response
+ })
+ },
getUserSelect (id) {
departmentApi.getDeptUserList(id).then(res => {
this.deptUserList = res.response
@@ -79,8 +99,11 @@
// let obj = {
// name: this.form.name
// }
+ if (_this.form.parentId) {
+ _this.form.parentId = _this.form.parentId[_this.form.parentId.length - 1];
+ }
if (_this.fig === 1) {
- departmentApi.addData(this.form.name).then(res => {
+ departmentApi.addData(this.form).then(res => {
console.log(res)
if (res.code === 1) {
_this.$message.success(res.message)
@@ -125,6 +148,7 @@
id: null,
name: '',
level: 1,
+ parentId: null,
levelName: ''
}
this.form.id = lastId
--
Gitblit v1.8.0