Merge branch 'dev_shequzhili' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev_shequzhili

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'
+        dictType: "self_org_category",
-      }
+      };
-      const { data, code, msg } = await requestPost(url, params)
+      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();
         }
       });

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

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>