From 6588d5953d21ea47ef0249188ab45f06c896fbd1 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sun, 8 Dec 2019 19:07:18 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A6=E6=A0=91=E5=8F=B3=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js       |   6 +-
 src/const/system/dict.js     |   1 +
 src/const/system/dictbiz.js  |   1 +
 src/const/user/info.js       |   2 +-
 src/views/system/dict.vue    | 192 +++++++++++++++++------------------
 src/views/system/dictbiz.vue | 192 +++++++++++++++++------------------
 src/views/system/param.vue   |   8 +-
 src/views/system/user.vue    | 155 ++++++++++++++++++----------
 8 files changed, 301 insertions(+), 256 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index da6a09b..2d35d0b 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,16 +1,18 @@
 import request from '@/router/axios';
 
-export const getList = (current, size, params) => {
+export const getList = (current, size, params, deptId) => {
   return request({
-    url: '/api/blade-user/list',
+    url: '/api/blade-user/page',
     method: 'get',
     params: {
       ...params,
       current,
       size,
+      deptId,
     }
   })
 }
+
 export const remove = (ids) => {
   return request({
     url: '/api/blade-user/remove',
diff --git a/src/const/system/dict.js b/src/const/system/dict.js
index 531ab9e..adf46ce 100644
--- a/src/const/system/dict.js
+++ b/src/const/system/dict.js
@@ -44,6 +44,7 @@ export const optionParent = {
       type: "number",
       align: "right",
       width: 80,
+      hide: true,
       rules: [
         {
           required: true,
diff --git a/src/const/system/dictbiz.js b/src/const/system/dictbiz.js
index 531ab9e..adf46ce 100644
--- a/src/const/system/dictbiz.js
+++ b/src/const/system/dictbiz.js
@@ -44,6 +44,7 @@ export const optionParent = {
       type: "number",
       align: "right",
       width: 80,
+      hide: true,
       rules: [
         {
           required: true,
diff --git a/src/const/user/info.js b/src/const/user/info.js
index a9df9a6..18060ff 100644
--- a/src/const/user/info.js
+++ b/src/const/user/info.js
@@ -13,7 +13,7 @@ export default {
           url: 'link',
         },
         canvasOption: {
-          text: '',
+          text: ' ',
           ratio: 0.1
         },
         action: '/api/blade-resource/oss/endpoint/put-file',
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index a1b2b56..87f28f7 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -1,101 +1,99 @@
 <template>
-  <div>
-    <el-row>
-      <el-col :span="11">
-        <basic-container>
-          <el-card class="box-card">
-            <div slot="header" class="clearfix">
-              <span>字典列表</span>
-            </div>
-            <div class="clearfix">
-              <avue-crud
-                :option="optionParent"
-                :table-loading="loading"
-                :data="dataParent"
-                :page="pageParent"
-                ref="crud"
-                v-model="formParent"
-                :permission="permissionList"
-                :before-open="beforeOpen"
-                @row-del="rowDel"
-                @row-update="rowUpdate"
-                @row-save="rowSave"
-                @row-click="handleRowClick"
-                @search-change="searchChange"
-                @search-reset="searchReset"
-                @selection-change="selectionChange"
-                @current-change="currentChange"
-                @size-change="sizeChange"
-                @refresh-change="refreshChange"
-                @on-load="onLoadParent"
-              >
-                <template slot="menuLeft">
-                  <el-button
-                    type="danger"
-                    size="small"
-                    icon="el-icon-delete"
-                    v-if="permission.dict_delete"
-                    plain
-                    @click="handleDelete"
-                  >删 除
-                  </el-button>
-                </template>
-                <template slot-scope="{row}" slot="isSealed">
-                  <el-tag>{{row.isSealed===0?'否':'是'}}</el-tag>
-                </template>
-              </avue-crud>
-            </div>
-          </el-card>
-        </basic-container>
-      </el-col>
-      <el-col :span="13">
-        <basic-container>
-          <el-card class="box-card">
-            <div slot="header" class="clearfix">
-              <span>[{{dictValue}}] 字典详情</span>
-            </div>
-            <div class="clearfix">
-              <avue-crud
-                :option="optionChild"
-                :table-loading="loading"
-                :data="dataChild"
-                :page="pageChild"
-                ref="crudChild"
-                v-model="formChild"
-                :permission="permissionList"
-                :before-open="beforeOpenChild"
-                @row-del="rowDelChild"
-                @row-update="rowUpdateChild"
-                @row-save="rowSaveChild"
-                @search-change="searchChangeChild"
-                @search-reset="searchResetChild"
-                @selection-change="selectionChangeChild"
-                @current-change="currentChangeChild"
-                @size-change="sizeChangeChild"
-                @refresh-change="refreshChangeChild"
-                @on-load="onLoadChild"
-              >
-                <template slot="menuLeft">
-                  <el-button
-                    type="danger"
-                    size="small"
-                    icon="el-icon-delete"
-                    v-if="permission.dict_delete"
-                    plain
-                    @click="handleDelete"
-                  >删 除
-                  </el-button>
-                </template>
-                <template slot-scope="{row}" slot="isSealed">
-                  <el-tag>{{row.isSealed===0?'否':'是'}}</el-tag>
-                </template>
-              </avue-crud>
-            </div>
-          </el-card>
-        </basic-container>
-      </el-col>
-    </el-row>
-  </div>
+  <el-row>
+    <el-col :span="11">
+      <basic-container>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>字典列表</span>
+          </div>
+          <div class="clearfix">
+            <avue-crud
+              :option="optionParent"
+              :table-loading="loading"
+              :data="dataParent"
+              :page="pageParent"
+              ref="crud"
+              v-model="formParent"
+              :permission="permissionList"
+              :before-open="beforeOpen"
+              @row-del="rowDel"
+              @row-update="rowUpdate"
+              @row-save="rowSave"
+              @row-click="handleRowClick"
+              @search-change="searchChange"
+              @search-reset="searchReset"
+              @selection-change="selectionChange"
+              @current-change="currentChange"
+              @size-change="sizeChange"
+              @refresh-change="refreshChange"
+              @on-load="onLoadParent"
+            >
+              <template slot="menuLeft">
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  v-if="permission.dict_delete"
+                  plain
+                  @click="handleDelete"
+                >删 除
+                </el-button>
+              </template>
+              <template slot-scope="{row}" slot="isSealed">
+                <el-tag>{{row.isSealed===0?'否':'是'}}</el-tag>
+              </template>
+            </avue-crud>
+          </div>
+        </el-card>
+      </basic-container>
+    </el-col>
+    <el-col :span="13">
+      <basic-container>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>[{{dictValue}}] 字典详情</span>
+          </div>
+          <div class="clearfix">
+            <avue-crud
+              :option="optionChild"
+              :table-loading="loading"
+              :data="dataChild"
+              :page="pageChild"
+              ref="crudChild"
+              v-model="formChild"
+              :permission="permissionList"
+              :before-open="beforeOpenChild"
+              @row-del="rowDelChild"
+              @row-update="rowUpdateChild"
+              @row-save="rowSaveChild"
+              @search-change="searchChangeChild"
+              @search-reset="searchResetChild"
+              @selection-change="selectionChangeChild"
+              @current-change="currentChangeChild"
+              @size-change="sizeChangeChild"
+              @refresh-change="refreshChangeChild"
+              @on-load="onLoadChild"
+            >
+              <template slot="menuLeft">
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  v-if="permission.dict_delete"
+                  plain
+                  @click="handleDelete"
+                >删 除
+                </el-button>
+              </template>
+              <template slot-scope="{row}" slot="isSealed">
+                <el-tag>{{row.isSealed===0?'否':'是'}}</el-tag>
+              </template>
+            </avue-crud>
+          </div>
+        </el-card>
+      </basic-container>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
diff --git a/src/views/system/dictbiz.vue b/src/views/system/dictbiz.vue
index 419a87e..c0430de 100644
--- a/src/views/system/dictbiz.vue
+++ b/src/views/system/dictbiz.vue
@@ -1,101 +1,99 @@
 <template>
-  <div>
-    <el-row>
-      <el-col :span="11">
-        <basic-container>
-          <el-card class="box-card">
-            <div slot="header" class="clearfix">
-              <span>业务字典列表</span>
-            </div>
-            <div class="clearfix">
-              <avue-crud
-                :option="optionParent"
-                :table-loading="loading"
-                :data="dataParent"
-                :page="pageParent"
-                ref="crud"
-                v-model="formParent"
-                :permission="permissionList"
-                :before-open="beforeOpen"
-                @row-del="rowDel"
-                @row-update="rowUpdate"
-                @row-save="rowSave"
-                @row-click="handleRowClick"
-                @search-change="searchChange"
-                @search-reset="searchReset"
-                @selection-change="selectionChange"
-                @current-change="currentChange"
-                @size-change="sizeChange"
-                @refresh-change="refreshChange"
-                @on-load="onLoadParent"
-              >
-                <template slot="menuLeft">
-                  <el-button
-                    type="danger"
-                    size="small"
-                    icon="el-icon-delete"
-                    v-if="permission.dict_delete"
-                    plain
-                    @click="handleDelete"
-                  >删 除
-                  </el-button>
-                </template>
-                <template slot-scope="{row}" slot="isSealed">
-                  <el-tag>{{row.isSealed===0?'否':'是'}}</el-tag>
-                </template>
-              </avue-crud>
-            </div>
-          </el-card>
-        </basic-container>
-      </el-col>
-      <el-col :span="13">
-        <basic-container>
-          <el-card class="box-card">
-            <div slot="header" class="clearfix">
-              <span>[{{dictValue}}] 业务字典详情</span>
-            </div>
-            <div class="clearfix">
-              <avue-crud
-                :option="optionChild"
-                :table-loading="loading"
-                :data="dataChild"
-                :page="pageChild"
-                ref="crudChild"
-                v-model="formChild"
-                :permission="permissionList"
-                :before-open="beforeOpenChild"
-                @row-del="rowDelChild"
-                @row-update="rowUpdateChild"
-                @row-save="rowSaveChild"
-                @search-change="searchChangeChild"
-                @search-reset="searchResetChild"
-                @selection-change="selectionChangeChild"
-                @current-change="currentChangeChild"
-                @size-change="sizeChangeChild"
-                @refresh-change="refreshChangeChild"
-                @on-load="onLoadChild"
-              >
-                <template slot="menuLeft">
-                  <el-button
-                    type="danger"
-                    size="small"
-                    icon="el-icon-delete"
-                    v-if="permission.dict_delete"
-                    plain
-                    @click="handleDelete"
-                  >删 除
-                  </el-button>
-                </template>
-                <template slot-scope="{row}" slot="isSealed">
-                  <el-tag>{{row.isSealed===0?'否':'是'}}</el-tag>
-                </template>
-              </avue-crud>
-            </div>
-          </el-card>
-        </basic-container>
-      </el-col>
-    </el-row>
-  </div>
+  <el-row>
+    <el-col :span="11">
+      <basic-container>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>业务字典列表</span>
+          </div>
+          <div class="clearfix">
+            <avue-crud
+              :option="optionParent"
+              :table-loading="loading"
+              :data="dataParent"
+              :page="pageParent"
+              ref="crud"
+              v-model="formParent"
+              :permission="permissionList"
+              :before-open="beforeOpen"
+              @row-del="rowDel"
+              @row-update="rowUpdate"
+              @row-save="rowSave"
+              @row-click="handleRowClick"
+              @search-change="searchChange"
+              @search-reset="searchReset"
+              @selection-change="selectionChange"
+              @current-change="currentChange"
+              @size-change="sizeChange"
+              @refresh-change="refreshChange"
+              @on-load="onLoadParent"
+            >
+              <template slot="menuLeft">
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  v-if="permission.dict_delete"
+                  plain
+                  @click="handleDelete"
+                >删 除
+                </el-button>
+              </template>
+              <template slot-scope="{row}" slot="isSealed">
+                <el-tag>{{row.isSealed===0?'否':'是'}}</el-tag>
+              </template>
+            </avue-crud>
+          </div>
+        </el-card>
+      </basic-container>
+    </el-col>
+    <el-col :span="13">
+      <basic-container>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>[{{dictValue}}] 业务字典详情</span>
+          </div>
+          <div class="clearfix">
+            <avue-crud
+              :option="optionChild"
+              :table-loading="loading"
+              :data="dataChild"
+              :page="pageChild"
+              ref="crudChild"
+              v-model="formChild"
+              :permission="permissionList"
+              :before-open="beforeOpenChild"
+              @row-del="rowDelChild"
+              @row-update="rowUpdateChild"
+              @row-save="rowSaveChild"
+              @search-change="searchChangeChild"
+              @search-reset="searchResetChild"
+              @selection-change="selectionChangeChild"
+              @current-change="currentChangeChild"
+              @size-change="sizeChangeChild"
+              @refresh-change="refreshChangeChild"
+              @on-load="onLoadChild"
+            >
+              <template slot="menuLeft">
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  v-if="permission.dict_delete"
+                  plain
+                  @click="handleDelete"
+                >删 除
+                </el-button>
+              </template>
+              <template slot-scope="{row}" slot="isSealed">
+                <el-tag>{{row.isSealed===0?'否':'是'}}</el-tag>
+              </template>
+            </avue-crud>
+          </div>
+        </el-card>
+      </basic-container>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
diff --git a/src/views/system/param.vue b/src/views/system/param.vue
index 604eaab..5d312d4 100644
--- a/src/views/system/param.vue
+++ b/src/views/system/param.vue
@@ -47,8 +47,8 @@
           total: 0
         },
         option: {
-          height:'auto',
-          calcHeight:350,
+          height: 'auto',
+          calcHeight: 350,
           tip: false,
           border: true,
           index: true,
@@ -189,10 +189,10 @@
             this.$refs.crud.toggleSelection();
           });
       },
-      currentChange(currentPage){
+      currentChange(currentPage) {
         this.page.currentPage = currentPage;
       },
-      sizeChange(pageSize){
+      sizeChange(pageSize) {
         this.page.pageSize = pageSize;
       },
       refreshChange() {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 6ccaffc..f503c6f 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1,49 +1,58 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :permission="permissionList"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               :before-open="beforeOpen"
-               :page="page"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.user_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-        <el-button type="primary"
-                   size="small"
-                   plain
-                   v-if="permission.user_reset"
-                   icon="el-icon-refresh"
-                   @click="handleReset">密码重置
-        </el-button>
-      </template>
-      <template slot-scope="{row}"
-                slot="roleId">
-        <el-tag>{{row.roleName}}</el-tag>
-      </template>
-      <template slot-scope="{row}"
-                slot="deptId">
-        <el-tag>{{row.deptName}}</el-tag>
-      </template>
-    </avue-crud>
-  </basic-container>
+  <el-row>
+    <el-col :span="5">
+      <basic-container>
+        <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+      </basic-container>
+    </el-col>
+    <el-col :span="19">
+      <basic-container>
+        <avue-crud :option="option"
+                   :table-loading="loading"
+                   :data="data"
+                   ref="crud"
+                   v-model="form"
+                   :permission="permissionList"
+                   @row-del="rowDel"
+                   @row-update="rowUpdate"
+                   @row-save="rowSave"
+                   :before-open="beforeOpen"
+                   :page="page"
+                   @search-change="searchChange"
+                   @search-reset="searchReset"
+                   @selection-change="selectionChange"
+                   @current-change="currentChange"
+                   @size-change="sizeChange"
+                   @refresh-change="refreshChange"
+                   @on-load="onLoad">
+          <template slot="menuLeft">
+            <el-button type="danger"
+                       size="small"
+                       icon="el-icon-delete"
+                       plain
+                       v-if="permission.user_delete"
+                       @click="handleDelete">删 除
+            </el-button>
+            <el-button type="primary"
+                       size="small"
+                       plain
+                       v-if="permission.user_reset"
+                       icon="el-icon-refresh"
+                       @click="handleReset">密码重置
+            </el-button>
+          </template>
+          <template slot-scope="{row}"
+                    slot="roleId">
+            <el-tag>{{row.roleName}}</el-tag>
+          </template>
+          <template slot-scope="{row}"
+                    slot="deptId">
+            <el-tag>{{row.deptName}}</el-tag>
+          </template>
+        </avue-crud>
+      </basic-container>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
@@ -92,6 +101,27 @@
           roleTree: [],
           deptTree: [],
         },
+        treeDeptId: '',
+        treeData: [],
+        treeOption: {
+          nodeKey: 'id',
+          addBtn: false,
+          menu: false,
+          size: 'small',
+          formOption: {
+            labelWidth: 100,
+            column: [{
+              label: '自定义项',
+              prop: 'test'
+            }],
+          },
+          props: {
+            labelText: '标题',
+            label: 'title',
+            value: 'value',
+            children: 'children'
+          }
+        },
         option: {
           height: 'auto',
           calcHeight: 350,
@@ -153,7 +183,7 @@
             {
               label: "用户昵称",
               prop: "name",
-              search: true,
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入用户昵称",
@@ -163,6 +193,7 @@
             {
               label: "用户姓名",
               prop: "realName",
+              search: true,
               rules: [{
                 required: true,
                 message: "请输入用户姓名",
@@ -287,7 +318,28 @@
         return ids.join(",");
       },
     },
+    created() {
+      this.initData();
+    },
     methods: {
+      nodeClick(data) {
+        this.treeDeptId = data.id;
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+      },
+      initData() {
+        getDeptTree().then(res => {
+          this.treeData = res.data.data;
+        });
+        getDeptTree(this.form.tenantId).then(res => {
+          const index = this.$refs.crud.findColumnIndex("deptId");
+          this.option.column[index].dicData = res.data.data;
+        });
+        getRoleTree(this.form.tenantId).then(res => {
+          const index = this.$refs.crud.findColumnIndex("roleId");
+          this.option.column[index].dicData = res.data.data;
+        });
+      },
       rowSave(row, loading, done) {
         row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
@@ -337,6 +389,7 @@
       },
       searchReset() {
         this.query = {};
+        this.treeDeptId = '';
         this.onLoad(this.page);
       },
       searchChange(params) {
@@ -421,21 +474,13 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;
           this.selectionClear();
         });
-        getDeptTree(this.form.tenantId).then(res => {
-          const index = this.$refs.crud.findColumnIndex("deptId");
-          this.option.column[index].dicData = res.data.data;
-        });
-        getRoleTree(this.form.tenantId).then(res => {
-          const index = this.$refs.crud.findColumnIndex("roleId");
-          this.option.column[index].dicData = res.data.data;
-        });
       }
     }
   };