From 53141264399705fed1e4465ba0b95c4f75632649 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 31 May 2022 09:17:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/xiangmu/cpts/project-info.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 6707e7e0..a4e2323a 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -113,7 +113,7 @@
               <el-popover
                 v-if="projectInfo.projectStatus == 'pending'"
                 placement="bottom"
-                width="400"
+                width="450"
                 height="400"
                 v-model="visibleTagPanel"
               >
@@ -126,6 +126,8 @@
                     filterable
                     placeholder="请选择"
                     @change="handleTagChange"
+                    size="medium"
+                    style="width: 350px;"
                   >
                     <el-option-group label="自定义标签">
                       <el-option

From 07f7d3309d985f6b2345ebad92d5b0c18b4655b9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 31 May 2022 09:57:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9bug2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/sqzzz/cpts/edit.vue      | 47 ++++++++++++++-----
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index df7741c2..2be14c87 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -30,12 +30,17 @@
           label-width="150px"
           style="display: block"
         >
-          <el-select v-model="dataForm.categoryCode" placeholder="请选择" clearable>
+          <el-select
+            v-model="dataForm.categoryCode"
+            placeholder="请选择"
+            clearable
+          >
             <el-option
               v-for="item in categoryList"
               :key="item.value"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -259,7 +264,7 @@ export default {
       orgId: "",
       dataForm: {
         organizationName: "",
-        categoryCode: '',
+        categoryCode: "",
         serviceItem: "",
         organizationPersonCount: "",
         principalName: "",
@@ -271,8 +276,8 @@ export default {
         latitude: "",
         organizationPersonnel: [],
       },
-      categoryList: []
-    }
+      categoryList: [],
+    };
   },
   components: {},
   computed: {
@@ -312,23 +317,23 @@ export default {
   watch: {},
 
   async created() {
-    this.getCategoryList()
+    this.getCategoryList();
   },
   async mounted() {
-    this.initMap()
+    this.initMap();
   },
 
   methods: {
     async getCategoryList() {
-      const url = '/sys/dict/data/dictlist'
+      const url = "/sys/dict/data/dictlist";
       const params = {
-        dictType: 'self_org_category'
-      }
-      const { data, code, msg } = await requestPost(url, params)
+        dictType: "self_org_category",
+      };
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-        this.categoryList = data
+        this.categoryList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     handleAddStaff() {
@@ -449,6 +454,22 @@ export default {
               message: "手机号格式有误",
             });
           }
+          const {
+            dataForm: { organizationPersonnel },
+          } = this;
+          let vlt = organizationPersonnel.every((item) => {
+            return (
+              item.personName &&
+              item.personPhone &&
+              formVltHelper.userOrMobile(item.personPhone)
+            );
+          });
+          if (!vlt) {
+            return this.$message({
+              type: "error",
+              message: "成员姓名/手机号为空或格式有误",
+            });
+          }
           this.submit();
         }
       });

From 428665c5c3a17fca72abddfffb92185039ae4e66 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 May 2022 10:40:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3orgId=E5=92=8CorgType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
index 970060f7..337b8d78 100644
--- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -104,6 +104,8 @@
     </div>
     <event-info v-if="showProject"
                 :eventId="eventId"
+                :orgId="tableOrgId ? tableOrgId : orgId"
+                :orgType="tableOrgType ? tableOrgType : orgType"
                 @close="showProject = false" />
   </cpt-card>
 </template>