From cd37512bf3aa4035f6bea1073dd57da6122b641d Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Thu, 9 Mar 2023 14:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=96=B0=E5=A2=9E=E5=AD=90=E9=A1=B9=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E5=8E=BB=E6=8E=89=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=A0=91=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E8=AE=A1table=E5=B1=85=E5=B7=A6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/system/dict.js    | 12 ++++++------
 src/option/system/dictbiz.js | 12 ++++++------
 src/views/system/dept.vue    |  6 +++---
 src/views/system/user.vue    | 36 +++++++++++++++++++++++++++---------
 vue.config.js                |  4 ++--
 5 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/option/system/dict.js b/src/option/system/dict.js
index f90d3c3..4d8496a 100644
--- a/src/option/system/dict.js
+++ b/src/option/system/dict.js
@@ -30,7 +30,7 @@ export const optionParent = {
       label: "字典名称",
       prop: "dictValue",
       search: true,
-      align: "center",
+      // align: "center",
       rules: [
         {
           required: true,
@@ -43,7 +43,7 @@ export const optionParent = {
       label: "字典排序",
       prop: "sort",
       type: "number",
-      align: "right",
+      // align: "right",
       width: 100,
       rules: [
         {
@@ -57,7 +57,7 @@ export const optionParent = {
       label: "封存",
       prop: "isSealed",
       type: "switch",
-      align: "center",
+      // align: "center",
       width: 100,
       dicData: [
         {
@@ -121,7 +121,7 @@ export const optionChild = {
       label: "字典名称",
       prop: "dictValue",
       search: true,
-      align: "center",
+      // align: "center",
       rules: [
         {
           required: true,
@@ -165,7 +165,7 @@ export const optionChild = {
       label: "字典排序",
       prop: "sort",
       type: "number",
-      align: "right",
+      // align: "right",
       hide: true,
       rules: [
         {
@@ -179,7 +179,7 @@ export const optionChild = {
       label: "封存",
       prop: "isSealed",
       type: "switch",
-      align: "center",
+      // align: "center",
       width: 80,
       dicData: [
         {
diff --git a/src/option/system/dictbiz.js b/src/option/system/dictbiz.js
index 6d77367..1c604a7 100644
--- a/src/option/system/dictbiz.js
+++ b/src/option/system/dictbiz.js
@@ -30,7 +30,7 @@ export const optionParent = {
       label: "字典名称",
       prop: "dictValue",
       search: true,
-      align: "center",
+      // align: "center",
       rules: [
         {
           required: true,
@@ -43,7 +43,7 @@ export const optionParent = {
       label: "字典排序",
       prop: "sort",
       type: "number",
-      align: "right",
+      // align: "right",
       width: 100,
       hide: true,
       rules: [
@@ -58,7 +58,7 @@ export const optionParent = {
       label: "封存",
       prop: "isSealed",
       type: "switch",
-      align: "center",
+      // align: "center",
       width: 100,
       dicData: [
         {
@@ -123,7 +123,7 @@ export const optionChild = {
       label: "字典Value",
       prop: "dictValue",
       search: true,
-      align: "center",
+      // align: "center",
       rules: [
         {
           required: true,
@@ -168,7 +168,7 @@ export const optionChild = {
       label: "字典排序",
       prop: "sort",
       type: "number",
-      align: "right",
+      // align: "right",
       hide: true,
       rules: [
         {
@@ -182,7 +182,7 @@ export const optionChild = {
       label: "封存",
       prop: "isSealed",
       type: "switch",
-      align: "center",
+      // align: "center",
       width: 80,
       dicData: [
         {
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index ca6ad6d..3c8f799 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -10,11 +10,11 @@
           @click="handleDelete">删 除
         </el-button>
       </template>
-      <template slot-scope="scope" slot="menu">
+      <!-- <template slot-scope="scope" slot="menu">
         <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
           @click.stop="handleAdd(scope.row, scope.index)" v-if="userInfo.role_name.includes('admin')">新增子项
         </el-button>
-      </template>
+      </template> -->
       <template slot-scope="{row}" slot="imgUrl2">
         <img v-if="row.imgUrl" :src="website.filePrex + row.imgUrl" style="width:30px;height:30px;" />
         <img v-else src="@/assets/image/hospital_logo.png" style="width:30px;height:30px;" />
@@ -162,7 +162,7 @@ export default {
             label: "排序",
             prop: "sort",
             type: "number",
-            align: "right",
+            // align: "right",
             width: 80,
             rules: [{
               required: true,
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index de82708..ad3da07 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-col :span="5">
+    <!-- <el-col :span="5">
       <div class="box">
         <el-scrollbar>
           <basic-container>
@@ -8,8 +8,8 @@
           </basic-container>
         </el-scrollbar>
       </div>
-    </el-col>
-    <el-col :span="19">
+    </el-col> -->
+    <el-col :span="24">
       <basic-container>
         <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
           v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
@@ -78,16 +78,16 @@ import {
   grant,
   resetPassword, unlock
 } from "@/api/system/user";
-import { exportBlob } from "@/api/common";
+// import { exportBlob } from "@/api/common";
 import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
 import { getRoleTree } from "@/api/system/role";
 import { mapGetters } from "vuex";
 import website from '@/config/website';
-import { getToken } from '@/util/auth';
-import { dateNow } from "@/util/date";
-import NProgress from 'nprogress';
+// import { getToken } from '@/util/auth';
+// import { dateNow } from "@/util/date";
+// import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
-import func from "@/util/func";
+// import func from "@/util/func";
 
 export default {
   data() {
@@ -169,6 +169,22 @@ export default {
         dialogType: 'drawer',
         dialogClickModal: false,
         column: [
+          {
+            label: '机构名称',
+            prop: 'treeDeptId',
+            type: 'select',
+            hide: true,
+            viewDisplay: false,
+            editDisplay: false,
+            addDisplay: false,
+            props: {
+              label: 'title',
+              value: 'value'
+            },
+            slot: true,
+            dicData: [],
+            search: true
+          },
           {
             label: "机构名称",
             prop: "deptName",
@@ -506,7 +522,9 @@ export default {
       });
       getDeptTree(tenantId).then(res => {
         const column = this.findObject(this.option.column, "deptId");
+        const columnSearch = this.findObject(this.option.column, "treeDeptId");//搜索机构列表下来选项使用
         column.dicData = res.data.data;
+        columnSearch.dicData = res.data.data;
       });
     },
     submitRole() {
@@ -695,7 +713,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.query.treeDeptId).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
diff --git a/vue.config.js b/vue.config.js
index 1cfd5a3..ecc35be 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,8 +27,8 @@ module.exports = {
       "/api": {
         //本地服务接口地址
         // target: "http://www.qdscgs.com:80",//生成
-        // target: "http://192.168.1.3:8080",
-        target: "http://192.168.1.106",
+        target: "http://192.168.1.3:8080",
+        // target: "http://192.168.1.106",
         //远程演示服务地址,可用于直接启动项目
         // target: 'https://saber.bladex.vip/api',
         ws: true,