From dde18b9bfa2df0accaeaeffa6d8b69a3e252f574 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Sat, 18 Nov 2023 16:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E6=80=A7=E6=9C=8D=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/detail.vue  |  2 +-
 src/views/modules/communityService/measure/index.vue   | 10 +++-------
 .../modules/communityService/policy/addPolicy.vue      |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/communityService/measure/detail.vue b/src/views/modules/communityService/measure/detail.vue
index 52d28dabd..5170281aa 100644
--- a/src/views/modules/communityService/measure/detail.vue
+++ b/src/views/modules/communityService/measure/detail.vue
@@ -15,7 +15,7 @@
 
         <div class="m-info-prop">
           <span class="u-info-title-3">需求类型：</span>
-          <span>{{ dataForm.categoryName ?dataForm.categoryName :'--' }}</span>
+          <span>{{ dataForm.categoryAllName ?dataForm.categoryAllName :'--' }}</span>
         </div>
 
         <div class="m-info-prop">
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index b0d5f0a60..91cff4653 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -350,7 +350,7 @@
           ></el-input>
           <el-cascader
             v-else
-            v-model="form.parentCode"
+            v-model="form.categoryCode"
             :options="demandOptions"
             :props="{label: 'categoryName',value: 'categoryCode',children: 'childCateList'}"
             :disabled="disabled"
@@ -743,7 +743,7 @@ export default {
         },
         {
           label: "需求类型",
-          columnName: "categoryName",
+          columnName: "categoryAllName",
           align: "center",
           width: "",
           options: [],
@@ -1062,10 +1062,7 @@ export default {
       }
       if (addType == "edit") {
         await this.getDemandUserList();
-        this.demandOptions.forEach((item) => {
-          if (item.value === row.categoryCode)
-            this.form.categoryCode = [row.categoryCode];
-        });
+        this.form.categoryCode = [row.parentCode,row.categoryCode];
         this.demandUserList.forEach((item) => {
           if (item.demandUserId == row.demandUserId)
             this.selectDemandUser = item.label;
@@ -1076,7 +1073,6 @@ export default {
     },
     async handleLook(row, type) {
       this.detailShow = true;
-      console.log("row", row);
       this.$nextTick(() => {
         this.$refs.ref_form_detail.initForm(row);
       });
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 585646186..093c6faba 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -432,7 +432,7 @@ export default {
     await this.startLoading();
     await this.getServiceTypeDictOptions();
     await this.getDictOptions();
-    // await this.loadScopeTree();
+    await this.loadScopeTree();
     await this.loadDemandoption();
     await this.getDemandOptions();
     if (this.formType === "add") {