From a7c90f4a5ed7619a6682f22665338acfed22564e Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 18:07:52 +0800
Subject: [PATCH] qxtj

---
 src/views/system/user/index.vue |   59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 88539d2..90ddfc1 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -9,7 +9,7 @@
         </div>
         <div class="head-container">
           <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all  :default-expanded-keys="treeId" highlight-current
             @node-click="handleNodeClick" />
         </div>
       </el-col>
@@ -688,6 +688,7 @@
   getDeptListByDictHospId,
 } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
+import { getInfo } from "@/api/login";
 import { listHosp } from "@/api/hosp/hosp";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -715,6 +716,20 @@
   ],
   components: { Treeselect },
   data() {
+    let checkPhoneNum = (rule, value, callback) => {
+         console.log( value)
+      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+      if (value == "" && value == undefined && !value) {
+        console.log(11111)
+        return callback('');
+      }  else if(value != undefined && value != ""){
+        console.log(22222)
+        return callback();
+      }else if (!patter.test(value)) {
+        console.log(33333)
+        return callback('');
+      }
+    };
     return {
       row: [],
       flag: false,
@@ -724,6 +739,7 @@
       userInfoList: [],
       hospList: [],
       activeNames: ["1"],
+      treeId: [],
       // 閬僵灞�
       loading: true,
       // 閫変腑鏁扮粍
@@ -825,37 +841,37 @@
       // 琛ㄥ崟鏍¢獙
       rules: {
         userName: [
-          { required: true, message: "", trigger: "blur" },
+          { required: true, validator: checkPhoneNum,  trigger: "blur" },
           {
             min: 2,
             max: 20,
-            message: "",
+            validator: checkPhoneNum, 
             trigger: "blur",
           },
         ],
         nickName: [
-          { required: true, message: "", trigger: "blur" },
+          { required: true, validator: checkPhoneNum,  trigger: "blur" },
         ],
         password: [
-          { required: true, message: "", trigger: "blur" },
+          { required: true, validator: checkPhoneNum,  trigger: "blur" },
           {
             min: 5,
             max: 20,
-            message: "",
+            validator: checkPhoneNum, 
             trigger: "blur",
           },
         ],
         email: [
           {
             type: "email",
-            message: "",
+            validator: checkPhoneNum, 
             trigger: ["blur", "change"],
           },
         ],
         phonenumber: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "",
+            validator: checkPhoneNum, 
             trigger: "blur",
           },
         ],
@@ -878,6 +894,15 @@
     deptName(val) {
       this.$refs.tree.filter(val);
     },
+    treeId(newVal, oldVal) {
+      if (newVal) {
+        this.$nextTick(() => {
+          document
+            .querySelector('.el-tree-node__children .el-tree-node__content')
+            .click();
+        });
+      }
+    }
   },
   computed: {
     type() {
@@ -888,8 +913,9 @@
     }
   },
   created() {
-    this.getList();
     this.getDeptTree();
+    this.getList();
+   
     // this.getRoleList();
     // this.getConfigKey("sys.user.initPassword").then((response) => {
     //   this.initPassword = response.msg;
@@ -932,6 +958,7 @@
     getlistHosp() {
       listHosp(this.queryParams).then((response) => {
         this.hospList = response.rows;
+
         this.total = response.total;
       });
     },
@@ -944,6 +971,8 @@
     getDeptTree() {
       deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
+        this.treeId.push(this.deptOptions[0].id)
+        this.queryParams.deptId = this.deptOptions[0].id
       });
     },
     // 绛涢�夎妭鐐�
@@ -1047,6 +1076,12 @@
       this.title = "鐢ㄦ埛淇℃伅缁存姢";
       this.getPostList();
       this.getlistHosp();
+      getInfo(this.queryParams).then((response) => {
+        this.form.hospId = response.user.hospId;
+        if (this.form.hospId) {
+          this.sendhospName()
+        }
+      });
       // getUser().then((response) => {
       //   this.postOptions = response.posts;
       //   this.roleOptions = response.roles;
@@ -1068,6 +1103,7 @@
       this.title = "鐢ㄦ埛淇℃伅缁存姢";
       this.open = true;
       this.form = row;
+      this.form.hospId = Number(row.hospId)
       // listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
       //   (response) => {
       //     response.rows.forEach((item, index) => {
@@ -1090,6 +1126,9 @@
       this.getlistHosp();
       this.reset();
       this.form = row;
+      if (this.form.hospId) {
+        this.sendhospName()
+      }
       // this.form.userInfo.id = null;
       // if(this.form.userInfo != null){
       //   this.forms = this.form.userInfo;
@@ -1151,7 +1190,7 @@
             this.dialogVisible1 = false;
           }
         })
-      }else{
+      } else {
         this.$modal.msgError("鐢ㄦ埛鍚嶅瘑鐮佷笉鑳戒负绌�");
       }
 

--
Gitblit v1.8.0