From c7785d1dbcc6a3e19e9a138134442fbc7038cbdf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 05 八月 2020 09:42:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/system/dept/index.vue | 80 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
index c4f4e37..5499af7 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
- <el-form :inline="true">
- <el-form-item label="閮ㄩ棬鍚嶇О">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+ <el-form-item label="閮ㄩ棬鍚嶇О" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
@@ -10,7 +10,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鐘舵��">
+ <el-form-item label="鐘舵��" prop="status">
<el-select v-model="queryParams.status" placeholder="閮ㄩ棬鐘舵��" clearable size="small">
<el-option
v-for="dict in statusOptions"
@@ -21,23 +21,30 @@
</el-select>
</el-form-item>
<el-form-item>
+ <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
<el-button
- class="filter-item"
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button>
- <el-button
- class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:dept:add']"
>鏂板</el-button>
- </el-form-item>
- </el-form>
+ </el-col>
+ <div class="top-right-btn">
+ <el-tooltip class="item" effect="dark" content="鍒锋柊" placement="top">
+ <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" :content="showSearch ? '闅愯棌鎼滅储' : '鏄剧ず鎼滅储'" placement="top">
+ <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
+ </el-tooltip>
+ </div>
+ </el-row>
<el-table
v-loading="loading"
@@ -56,17 +63,17 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']"
>淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-plus"
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:dept:add']"
>鏂板</el-button>
@@ -83,7 +90,7 @@
</el-table>
<!-- 娣诲姞鎴栦慨鏀归儴闂ㄥ璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="600px">
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
@@ -138,7 +145,7 @@
</template>
<script>
-import { listDept, getDept, delDept, addDept, updateDept } from "@/api/system/dept";
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -149,6 +156,8 @@
return {
// 閬僵灞�
loading: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
// 琛ㄦ牸鏍戞暟鎹�
deptList: [],
// 閮ㄩ棬鏍戦�夐」
@@ -220,12 +229,6 @@
children: node.children
};
},
- /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
- getTreeselect() {
- listDept().then(response => {
- this.deptOptions = this.handleTree(response.data, "deptId");
- });
- },
// 瀛楀吀鐘舵�佸瓧鍏哥炕璇�
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status);
@@ -253,24 +256,33 @@
handleQuery() {
this.getList();
},
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(row) {
this.reset();
- this.getTreeselect();
if (row != undefined) {
this.form.parentId = row.deptId;
}
this.open = true;
this.title = "娣诲姞閮ㄩ棬";
+ listDept().then(response => {
+ this.deptOptions = this.handleTree(response.data, "deptId");
+ });
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
- this.getTreeselect();
getDept(row.deptId).then(response => {
this.form = response.data;
this.open = true;
this.title = "淇敼閮ㄩ棬";
+ });
+ listDeptExcludeChild(row.deptId).then(response => {
+ this.deptOptions = this.handleTree(response.data, "deptId");
});
},
/** 鎻愪氦鎸夐挳 */
@@ -283,8 +295,6 @@
this.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
} else {
@@ -293,8 +303,6 @@
this.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
}
@@ -316,4 +324,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3