|
|
@@ -2,21 +2,12 @@
|
|
2
|
2
|
<div class="app-container">
|
|
3
|
3
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
|
4
|
4
|
<el-form-item label="部门名称" prop="deptName">
|
|
5
|
|
- <el-input
|
|
6
|
|
- v-model="queryParams.deptName"
|
|
7
|
|
- placeholder="请输入部门名称"
|
|
8
|
|
- clearable
|
|
9
|
|
- @keyup.enter.native="handleQuery"
|
|
10
|
|
- />
|
|
|
5
|
+ <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery" />
|
|
11
|
6
|
</el-form-item>
|
|
12
|
7
|
<el-form-item label="状态" prop="status">
|
|
13
|
8
|
<el-select v-model="queryParams.status" placeholder="部门状态" clearable>
|
|
14
|
|
- <el-option
|
|
15
|
|
- v-for="dict in dict.type.sys_normal_disable"
|
|
16
|
|
- :key="dict.value"
|
|
17
|
|
- :label="dict.label"
|
|
18
|
|
- :value="dict.value"
|
|
19
|
|
- />
|
|
|
9
|
+ <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
|
|
|
10
|
+ :value="dict.value" />
|
|
20
|
11
|
</el-select>
|
|
21
|
12
|
</el-form-item>
|
|
22
|
13
|
<el-form-item>
|
|
|
@@ -27,40 +18,22 @@
|
|
27
|
18
|
|
|
28
|
19
|
<el-row :gutter="10" class="mb8">
|
|
29
|
20
|
<el-col :span="1.5">
|
|
30
|
|
- <el-button
|
|
31
|
|
- type="primary"
|
|
32
|
|
- plain
|
|
33
|
|
- icon="el-icon-plus"
|
|
34
|
|
- size="mini"
|
|
35
|
|
- @click="handleAdd"
|
|
36
|
|
- v-hasPermi="['system:dept:add']"
|
|
37
|
|
- >新增</el-button>
|
|
|
21
|
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd(1)"
|
|
|
22
|
+ v-hasPermi="['system:dept:add']">新增</el-button>
|
|
38
|
23
|
</el-col>
|
|
39
|
24
|
<el-col :span="1.5">
|
|
40
|
|
- <el-button
|
|
41
|
|
- type="info"
|
|
42
|
|
- plain
|
|
43
|
|
- icon="el-icon-sort"
|
|
44
|
|
- size="mini"
|
|
45
|
|
- @click="toggleExpandAll"
|
|
46
|
|
- >展开/折叠</el-button>
|
|
|
25
|
+ <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
|
|
47
|
26
|
</el-col>
|
|
48
|
27
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
49
|
28
|
</el-row>
|
|
50
|
29
|
|
|
51
|
|
- <el-table
|
|
52
|
|
- v-if="refreshTable"
|
|
53
|
|
- v-loading="loading"
|
|
54
|
|
- :data="deptList"
|
|
55
|
|
- row-key="deptId"
|
|
56
|
|
- :default-expand-all="isExpandAll"
|
|
57
|
|
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
|
58
|
|
- >
|
|
|
30
|
+ <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll"
|
|
|
31
|
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
|
|
59
|
32
|
<el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
|
|
60
|
33
|
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
|
|
61
|
34
|
<el-table-column prop="status" label="状态" width="100">
|
|
62
|
35
|
<template slot-scope="scope">
|
|
63
|
|
- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
|
|
36
|
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
|
|
64
|
37
|
</template>
|
|
65
|
38
|
</el-table-column>
|
|
66
|
39
|
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
|
|
|
@@ -70,28 +43,12 @@
|
|
70
|
43
|
</el-table-column>
|
|
71
|
44
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
72
|
45
|
<template slot-scope="scope">
|
|
73
|
|
- <el-button
|
|
74
|
|
- size="mini"
|
|
75
|
|
- type="text"
|
|
76
|
|
- icon="el-icon-edit"
|
|
77
|
|
- @click="handleUpdate(scope.row)"
|
|
78
|
|
- v-hasPermi="['system:dept:edit']"
|
|
79
|
|
- >修改</el-button>
|
|
80
|
|
- <el-button
|
|
81
|
|
- size="mini"
|
|
82
|
|
- type="text"
|
|
83
|
|
- icon="el-icon-plus"
|
|
84
|
|
- @click="handleAdd(scope.row)"
|
|
85
|
|
- v-hasPermi="['system:dept:add']"
|
|
86
|
|
- >新增</el-button>
|
|
87
|
|
- <el-button
|
|
88
|
|
- v-if="scope.row.parentId != 0"
|
|
89
|
|
- size="mini"
|
|
90
|
|
- type="text"
|
|
91
|
|
- icon="el-icon-delete"
|
|
92
|
|
- @click="handleDelete(scope.row)"
|
|
93
|
|
- v-hasPermi="['system:dept:remove']"
|
|
94
|
|
- >删除</el-button>
|
|
|
46
|
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
|
|
47
|
+ v-hasPermi="['system:dept:edit']">修改</el-button>
|
|
|
48
|
+ <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
|
|
|
49
|
+ v-hasPermi="['system:dept:add']">新增</el-button>
|
|
|
50
|
+ <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
|
|
|
51
|
+ @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
|
|
95
|
52
|
</template>
|
|
96
|
53
|
</el-table-column>
|
|
97
|
54
|
</el-table>
|
|
|
@@ -100,7 +57,12 @@
|
|
100
|
57
|
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
|
101
|
58
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
102
|
59
|
<el-row>
|
|
103
|
|
- <el-col :span="24" v-if="form.parentId !== 0">
|
|
|
60
|
+ <!-- <el-col :span="24" v-if="form.parentId !== 0">
|
|
|
61
|
+ <el-form-item label="上级部门" prop="parentId">
|
|
|
62
|
+ <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
|
|
|
63
|
+ </el-form-item>
|
|
|
64
|
+ </el-col> -->
|
|
|
65
|
+ <el-col :span="24" v-if="flag">
|
|
104
|
66
|
<el-form-item label="上级部门" prop="parentId">
|
|
105
|
67
|
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
|
|
106
|
68
|
</el-form-item>
|
|
|
@@ -136,14 +98,18 @@
|
|
136
|
98
|
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
|
137
|
99
|
</el-form-item>
|
|
138
|
100
|
</el-col>
|
|
|
101
|
+ <!-- <el-col :span="12">
|
|
|
102
|
+ <el-form-item label="部门类型" prop="deptType">
|
|
|
103
|
+ <el-input v-model="form.deptType" placeholder="请输入部门编码" maxlength="50" />
|
|
|
104
|
+ </el-form-item>
|
|
|
105
|
+ </el-col> -->
|
|
|
106
|
+ </el-row>
|
|
|
107
|
+ <el-row>
|
|
139
|
108
|
<el-col :span="12">
|
|
140
|
109
|
<el-form-item label="部门状态">
|
|
141
|
110
|
<el-radio-group v-model="form.status">
|
|
142
|
|
- <el-radio
|
|
143
|
|
- v-for="dict in dict.type.sys_normal_disable"
|
|
144
|
|
- :key="dict.value"
|
|
145
|
|
- :label="dict.value"
|
|
146
|
|
- >{{dict.label}}</el-radio>
|
|
|
111
|
+ <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
|
|
|
112
|
+ :label="dict.value">{{ dict.label }}</el-radio>
|
|
147
|
113
|
</el-radio-group>
|
|
148
|
114
|
</el-form-item>
|
|
149
|
115
|
</el-col>
|
|
|
@@ -168,6 +134,7 @@ export default {
|
|
168
|
134
|
components: { Treeselect },
|
|
169
|
135
|
data() {
|
|
170
|
136
|
return {
|
|
|
137
|
+ flag:false,
|
|
171
|
138
|
// 遮罩层
|
|
172
|
139
|
loading: true,
|
|
173
|
140
|
// 显示搜索条件
|
|
|
@@ -199,6 +166,9 @@ export default {
|
|
199
|
166
|
deptName: [
|
|
200
|
167
|
{ required: true, message: "部门名称不能为空", trigger: "blur" }
|
|
201
|
168
|
],
|
|
|
169
|
+ deptType: [
|
|
|
170
|
+ { required: true, message: "部门类型不能为空", trigger: "blur" }
|
|
|
171
|
+ ],
|
|
202
|
172
|
orderNum: [
|
|
203
|
173
|
{ required: true, message: "显示排序不能为空", trigger: "blur" }
|
|
204
|
174
|
],
|
|
|
@@ -272,6 +242,12 @@ export default {
|
|
272
|
242
|
},
|
|
273
|
243
|
/** 新增按钮操作 */
|
|
274
|
244
|
handleAdd(row) {
|
|
|
245
|
+ console.log(row,"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL");
|
|
|
246
|
+ if(row == 1){
|
|
|
247
|
+ this.flag = false;
|
|
|
248
|
+ }else{
|
|
|
249
|
+ this.flag = true;
|
|
|
250
|
+ }
|
|
275
|
251
|
this.reset();
|
|
276
|
252
|
if (row != undefined) {
|
|
277
|
253
|
this.form.parentId = row.deptId;
|
|
|
@@ -307,7 +283,7 @@ export default {
|
|
307
|
283
|
});
|
|
308
|
284
|
},
|
|
309
|
285
|
/** 提交按钮 */
|
|
310
|
|
- submitForm: function() {
|
|
|
286
|
+ submitForm: function () {
|
|
311
|
287
|
this.$refs["form"].validate(valid => {
|
|
312
|
288
|
if (valid) {
|
|
313
|
289
|
if (this.form.deptId != undefined) {
|
|
|
@@ -328,12 +304,12 @@ export default {
|
|
328
|
304
|
},
|
|
329
|
305
|
/** 删除按钮操作 */
|
|
330
|
306
|
handleDelete(row) {
|
|
331
|
|
- this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
|
|
|
307
|
+ this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
|
|
332
|
308
|
return delDept(row.deptId);
|
|
333
|
309
|
}).then(() => {
|
|
334
|
310
|
this.getList();
|
|
335
|
311
|
this.$modal.msgSuccess("删除成功");
|
|
336
|
|
- }).catch(() => {});
|
|
|
312
|
+ }).catch(() => { });
|
|
337
|
313
|
}
|
|
338
|
314
|
}
|
|
339
|
315
|
};
|