From 02911e02552c5edbb86b48dbd95a9346346ba1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 28 Mar 2024 11:13:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/agency/index.vue     | 18 ++++++++++++------
 src/views/system/department/index.vue | 21 ++++++++++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue
index c52dd56..fa71665 100644
--- a/src/views/system/agency/index.vue
+++ b/src/views/system/agency/index.vue
@@ -318,7 +318,7 @@
             ></el-option>
           </el-select>
           <el-select
-            v-model="form.communityName"
+            v-model="form.areaCode"
             clearable
             placeholder="请选择社区"
             style="width: 129px; margin-left: 10px"
@@ -720,9 +720,9 @@ export default {
         agencyName: [
           { required: true, message: "机构名称不能为空", trigger: "blur" },
         ],
-        areaCode: [
-          { required: true, message: "行政区划不能为空", trigger: "blur" },
-        ],
+        // areaCode: [
+        //   { required: true, message: "行政区划不能为空", trigger: "blur" },
+        // ],
         agencyPhone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -838,7 +838,10 @@ export default {
     },
     // 点击社区
     clickstreetlist(item) {
+      console.log(item,'555555')
       this.form.areaCode = item.areaCode;
+      this.form.communityName = item.areaName;
+
     },
     //点击区县城
     clickarea(item) {
@@ -885,7 +888,7 @@ export default {
       this.form.communityCode = "";
 
       this.form.regionName = "";
-      // this.form.areaCode = "";
+      this.form.areaCode = "";
       // this.form.streetCode = "";
       getSecondaryLevelInfo(item.id).then((res) => {
         this.citylist = res.data;
@@ -936,7 +939,10 @@ export default {
       }
     },
     changeagencyCategoryId(e) {
-      this.form.agencyCategoryId = e[e.length - 1];
+      if(e){
+        this.form.agencyCategoryId = e[e.length - 1];
+
+      }
     },
     // // 节点单击事件
     // handleNodeClick(data) {
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
index 6a8502d..967c793 100644
--- a/src/views/system/department/index.vue
+++ b/src/views/system/department/index.vue
@@ -727,7 +727,7 @@ export default {
         departmentPhone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机码",
+            message: "请输入正确的科室电话",
             trigger: "blur",
           },
         ],
@@ -735,8 +735,8 @@ export default {
           {
             type: "email",
             message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
+            trigger: ["blur", "change"],
+          },
         ],
       },
     };
@@ -803,10 +803,17 @@ export default {
     // 所属机构
     change(e) {
       console.log(e, "78");
-      this.form.agencyId = e[e.length - 1];
-      const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels;
-      this.form.agencyName = arr.slice(-1).join(",");
-      console.log(this.form.agencyName);
+      if (e) {
+        this.form.agencyId = e[e.length - 1];
+        if (this.form.agencyId) {
+          const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels;
+          // console.log(arr, "5555555");
+          this.form.agencyName = arr.slice(-1).join(",");
+          // console.log(this.form.agencyName);
+        } else {
+          this.form.agencyName = "";
+        }
+      }
     },
 
     // changeagencyCategoryId(e) {