Merge remote-tracking branch 'origin/dev' into dev

src/views/modules/communityService/gxxq/detailForm.vue

@@ -40,7 +40,7 @@
             </div>
             <div class="info-prop" v-if="formData.assignFlag == 1">
               <span class="info-title-2">服务组织：</span>
-                <span>{{ serverOrgType }} - {{serverOrgName}}</span>
+                <span>{{ formData.parentCategoryName }} -  {{formData.categoryName}}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">服务范围：</span>
@@ -102,7 +102,7 @@ export default {
     await this.getPolicyList();
     await this.loadInfo();
     await this.getDictOptions()
-    await this.getServiceuserList()
+    // await this.getServiceuserList()
     // if (this.gxxqId) {//详情
     this.initLoading = true;
   },