From bb1340ecc6f1a6bf40ccf7eebcb58312f6c6af4d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 25 Feb 2020 19:33:29 +0800
Subject: [PATCH] 操作日志详细显示类型
---
ruoyi-ui/src/views/system/dept/index.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
index bcefdb8..cca08b2 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -88,7 +88,7 @@
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
<el-form-item label="上级部门" prop="parentId">
- <treeselect v-model="form.parentId" :options="deptOptions" placeholder="选择上级部门" />
+ <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -138,7 +138,7 @@
</template>
<script>
-import { listDept, getDept, treeselect, delDept, addDept, updateDept } from "@/api/system/dept";
+import { listDept, getDept, delDept, addDept, updateDept } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -151,8 +151,8 @@
loading: true,
// 表格树数据
deptList: [],
- // 部门部门树选项
- deptOptions: undefined,
+ // 部门树选项
+ deptOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -205,14 +205,25 @@
getList() {
this.loading = true;
listDept(this.queryParams).then(response => {
- this.deptList = response.data;
+ this.deptList = this.handleTree(response.data, "deptId");
this.loading = false;
});
},
+ /** 转换部门数据结构 */
+ normalizer(node) {
+ if (node.children && !node.children.length) {
+ delete node.children;
+ }
+ return {
+ id: node.deptId,
+ label: node.deptName,
+ children: node.children
+ };
+ },
/** 查询部门下拉树结构 */
getTreeselect() {
- treeselect().then(response => {
- this.deptOptions = response.data;
+ listDept().then(response => {
+ this.deptOptions = this.handleTree(response.data, "deptId");
});
},
// 字典状态字典翻译
@@ -228,7 +239,7 @@
reset() {
this.form = {
deptId: undefined,
- parentId: 100,
+ parentId: undefined,
deptName: undefined,
orderNum: undefined,
leader: undefined,
--
Gitblit v1.9.2