From fe38742ce050e5f4f200bc1a09c6960a9fa91bca Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 27 Oct 2023 17:46:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E7=B1=BB=E5=88=AB,=E6=B8=A9?=
 =?UTF-8?q?=E6=9A=96=E6=89=BE=E4=BA=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jinengzhaoren/addForm.vue                 |  1 -
 .../wennuanzhaoren/addForm.vue                |  6 +--
 .../modules/portrayal/fangwu/cpts/leftTop.vue | 44 +++++++++++++++----
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue
index 3b60b3f0c..8743a16a8 100644
--- a/src/views/modules/communityService/jinengzhaoren/addForm.vue
+++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue
@@ -722,7 +722,6 @@ export default {
       this.formData.resiSearchTagName = "";
     },
     getLastItem(list, vals, key) {
-      console.log(list, vals, key);
       let LIST = list || [];
       for (let item of LIST) {
         for (let i of vals) {
diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
index 1b5631265..7c7066c0b 100644
--- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
@@ -454,6 +454,7 @@ export default {
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd
         serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+        dataCategoryCode:"warm",
         remark: "", //
       },
       feedbackFormData: {
@@ -721,7 +722,6 @@ export default {
       this.formData.resiSearchTagName = "";
     },
     getLastItem(list, vals, key) {
-      console.log(list, vals, key);
       let LIST = list || [];
       for (let item of LIST) {
         for (let i of vals) {
@@ -962,14 +962,14 @@ export default {
         ...this.feedbackFormData,
       };
 
-      const { data, code, msg } = await requestPost(url, params);
+      const { data, code, msg ,internalMsg} = await requestPost(url, params);
 
       if (code === 0) {
         this.$message.success("反馈成功");
         this.resetData();
         this.$emit("handleOk");
       } else {
-        this.$message.error(msg);
+        this.$message.error(internalMsg);
       }
     },
     async addFuwu() {
diff --git a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
index 95fb3f613..4c9af268c 100644
--- a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
+++ b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
@@ -1,26 +1,26 @@
 <template>
     <div class=''>
         <div class="item f-font14">
-            <span class="label gray">房主姓名：</span><span class="value">{{ houseInfo.ownerName||"--" }}</span>
+            <span class="label gray">房主姓名：</span><span class="value">{{ houseInfo.ownerName || "--" }}</span>
         </div>
         <div class="item f-font14">
-            <span class="label gray">联系电话：</span><span class="value">{{ houseInfo.ownerPhone||"--" }}</span>
+            <span class="label gray">联系电话：</span><span class="value">{{ houseInfo.ownerPhone || "--" }}</span>
         </div>
         <div class="item f-font14">
-            <span class="label gray">房屋类型：</span><span class="value">{{ houseInfo.houseTypeName||"--" }}</span>
+            <span class="label gray">房屋类型：</span><span class="value">{{ houseInfo.houseTypeName || "--" }}</span>
         </div>
         <div class="item f-font14">
-            <span class="label gray">用途：</span><span class="value">{{ houseInfo.purposeName||"--" }}</span>
+            <span class="label gray">用途：</span><span class="value">{{ houseInfo.purposeName || "--" }}</span>
         </div>
         <div class="item f-font14">
-            <span class="label gray">家庭类别：</span><span class="value">{{ houseInfo.resideSituation || "--" }}</span>
+            <span class="label gray">家庭类别：</span><span class="value">{{ familyTagsStr || "--" }}</span>
         </div>
         <div class="item f-font14">
-            <span class="label gray">房屋状态：</span><span class="value">{{ houseInfo.rentName||"--" }}</span>
+            <span class="label gray">房屋状态：</span><span class="value">{{ houseInfo.rentName || "--" }}</span>
         </div>
         <div class="item f-font14">
             <span class="label gray">家庭预警：</span>
-            <span class="value">{{houseInfo.riskFlag === '1' ? '满意度风险家庭' : '--'}}</span>
+            <span class="value">{{ houseInfo.riskFlag === '1' ? '满意度风险家庭' : '--' }}</span>
         </div>
     </div>
 </template>
@@ -31,11 +31,14 @@ export default {
     //数据
     data() {
         return {
-            houseInfo: {}
+            houseInfo: {},
+            family_tag: [],
+            familyTagsStr:''
         };
     },
     //创建前
     created() {
+        this.getDictOptions()
     },
     mounted() {
         this.getPersonalFile()
@@ -60,6 +63,31 @@ export default {
             let { code, data, msg } = await requestPost(url)
             if (code == 0) {
                 this.houseInfo = data
+
+                const valuesToMatch = this.houseInfo.familyTags;
+                console.log(valuesToMatch);
+                const result = this.family_tag
+                    .filter(item => valuesToMatch.includes(item.value))
+                    .map(item => item.label)
+                    .join(',');
+                this.familyTagsStr = result
+                console.log(result);
+
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        async getDictOptions() {
+            const url = "/sys/dict/data/dictlist"
+
+            let params = {
+                dictType: 'family_tag'
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.family_tag = data;
             } else {
                 this.$message.error(msg)
             }