From 82c18ed388046d9abdc4d6ccd288561be8d56067 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 28 Nov 2023 14:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BE=E4=BA=BA=E6=9C=8D=E5=8A=A1=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/fuwuzhaoren/addForm.vue     | 9 ++++-----
 .../modules/communityService/gangweizhaoren/addForm.vue  | 4 ++--
 .../modules/communityService/jinengzhaoren/addForm.vue   | 4 ++--
 .../modules/communityService/wennuanzhaoren/addForm.vue  | 4 ++--
 .../modules/shequzhili/eventOld/cpts/event-detail.vue    | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue
index 34f8846fa..624e1d787 100644
--- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue
@@ -112,8 +112,8 @@
             <el-option
               v-for="item in serviceOptiondList"
               :key="item.id"
-              :label="item.name"
-              :value="item.label"
+              :label="item.label"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -534,7 +534,7 @@ export default {
     if (this.formType === "add") {
       this.$refs.ref_form.resetFields();
     } else if (this.formType == "edit") {
-      this.loadInfo();
+     await this.loadInfo();
     }
     await this.getDemandOptions()
     await this.iniDefaultData();
@@ -623,8 +623,7 @@ export default {
         }
         this.scopeIdArray = data.gridIdList.map(i => i.objectId);
         this.feedbackFormData = { ...data.feedback };
-        await this.getServiceuserList(data.serviceOrgType);
-
+        await this.getServiceuserList(this.formData.serviceOrgType);
         await this.getTagName();
         // this.fileList = []
         // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue
index 99aa8fc94..4e4936a87 100644
--- a/src/views/modules/communityService/gangweizhaoren/addForm.vue
+++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue
@@ -128,8 +128,8 @@
             <el-option
               v-for="item in serviceOptiondList"
               :key="item.id"
-              :label="item.name"
-              :value="item.label"
+              :label="item.label"
+              :value="item.id"
             >
             </el-option>
           </el-select>
diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue
index 290163dbb..b2b2eba67 100644
--- a/src/views/modules/communityService/jinengzhaoren/addForm.vue
+++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue
@@ -128,8 +128,8 @@
             <el-option
               v-for="item in serviceOptiondList"
               :key="item.id"
-              :label="item.name"
-              :value="item.label"
+              :label="item.label"
+              :value="item.id"
             >
             </el-option>
           </el-select>
diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
index fe1bc92a1..bc6cbeb1a 100644
--- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
@@ -128,8 +128,8 @@
             <el-option
               v-for="item in serviceOptiondList"
               :key="item.id"
-              :label="item.name"
-              :value="item.label"
+              :label="item.label"
+              :value="item.id"
             >
             </el-option>
           </el-select>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
index 1100090e5..d23be1520 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
@@ -17,7 +17,7 @@
                             </el-select>
                         </template>
                         <template v-else>
-                            <span>{{ info.gridName }}</span>
+                            <span>{{ info.gridName|| info.agencyName }}</span>
                         </template>
                     </div>
                     <div :class="[