From 8abfbfa72dd31f6570034002e4b87e5e6eb63bad Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 14 Jun 2023 19:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=85=8D=E7=BD=AE=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=9C=A8=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/gxxq/detailForm.vue | 13 ++++++++-----
 .../modules/communityService/gxxq/index.vue      | 16 ++--------------
 .../communityService/labelConfig/addForm.vue     |  2 +-
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/communityService/gxxq/detailForm.vue b/src/views/modules/communityService/gxxq/detailForm.vue
index cf4efe681..a0a5c9e66 100644
--- a/src/views/modules/communityService/gxxq/detailForm.vue
+++ b/src/views/modules/communityService/gxxq/detailForm.vue
@@ -5,7 +5,7 @@
         <div class="m-info">
           <div class="info-prop">
             <span class="info-title-2">需求类别: </span>
-            <span>{{ commonServiceTypeName || "--" }}</span>
+            <span>{{ ServiceTypeName || "--" }}</span>
           </div>
 
           <!-- <div class="info-prop">
@@ -54,8 +54,8 @@
 
             <div class="info-prop">
               <span class="info-title-2">服务时间：</span>
-              <span>{{ formData.assignInfo.serviceTimeStart.substr(0,10) || "--" }}</span> 至
-              <span>{{ formData.assignInfo.serviceTimeEnd.substr(0,10) || "--" }}</span>
+              <span>{{ formData.assignInfo.serviceTimeStart|| "--" }}</span> 至
+              <span>{{ formData.assignInfo.serviceTimeEnd|| "--" }}</span>
             </div>
           </template>
         </div>
@@ -88,7 +88,7 @@ export default {
       keyWords: "",
       formData: {},
       resiSearchTagName: "",
-
+      ServiceTypeName:'',
       policyId: "",
       showPersonList: false,
       ruleList: [],
@@ -150,8 +150,11 @@ export default {
       const { data, code, msg } = await requestGet(url);
 
       if (code === 0) {
+        console.log(data);
         this.formData = { ...data };
         this.formData.gxxqId = this.gxxqId;
+        let name =  this.serviceTypesLevel1.filter(item=>item.id == data.servicePid)[0].name
+        this.ServiceTypeName = name +'-'+ this.commonServiceTypeName
         await this.getTagName();
       } else {
         this.$message.error(msg);
@@ -283,7 +286,7 @@ export default {
       type: String,
       default: "",
     },
-    statusArray: {
+    serviceTypesLevel1: {
       type: Array,
       default() {
         return [];
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index 0061395bf..6daf4ee35 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -265,6 +265,7 @@
         ref="gxxq_form"
         :commonServiceTypeName="commonServiceTypeName"
         :formType="formType"
+        :serviceTypesLevel1="serviceTypesLevel1"
         @handleClose="addFormCancle"
         @handleComfirm="addFormOk"
         :gxxq-id="gxxqId"
@@ -401,6 +402,7 @@ export default {
     handleEdit(row) {
       this.gxxqId = row.id;
       this.commonServiceTypeName = row.commonServiceTypeName;
+      this.serviceTypesLevel1 = this.serviceTypesLevel1
       this.formEditShow = true;
     },
     async handleChu() {
@@ -519,20 +521,6 @@ export default {
         },
     // 获取服务组织
     async getDictOptions() {
-      const url = "/sys/dict/data/dictlist";
-
-      let params = {
-        dictType: "user_demand_service_type",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.serviceOptions = data;
-      } else {
-        this.$message.error(msg);
-      }
-
       this.$http
         .get("/governance/commonServiceType/selectList/0")
         .then(({ data: res }) => {
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index 4313d2a0b..b29a1ad39 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -611,7 +611,7 @@ export default {
       const { data, msg, code } = await requestPost(url, params);
       if (code == 0) {
         this.$message.success("操作成功");
-        this.$emit("dialogOk");
+        this.$emit("dialogOk",{tagId:data.id,tagName:data.tagName});
       } else if (code >= 8000) {
         this.$message.error(msg);
       }