From bad694e75faa225a545aee7baa31198a9b1bbba5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 17:35:03 +0800
Subject: [PATCH 1/2] BUG 26001

---
 src/apps/AppBuilding/add.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/apps/AppBuilding/add.vue b/src/apps/AppBuilding/add.vue
index 6174eba5..301ca666 100644
--- a/src/apps/AppBuilding/add.vue
+++ b/src/apps/AppBuilding/add.vue
@@ -150,7 +150,7 @@ export default {
     })
   },
   onShow() {
-    document.title = '房屋信息' 
+    document.title = '房屋信息'
   },
 
   methods: {
@@ -176,11 +176,12 @@ export default {
     },
     submit() {
       this.$http.post(`app/appcommunityhouseinfo/update`, this.houseInfo).then(res => {
-        if (res.code == 0) {
-          this.$u.toast('提交成功')
-          setTimeout(() => {
-            uni.navigateBack({})
-          }, 600)
+        if (res?.code == 0) {
+          uni.navigateBack({
+            success: () => {
+              this.$u.toast('提交成功')
+            }
+          })
         }
       })
     },

From 15e60c3175c404e79f4a8e819024a22b420b3cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 24 Dec 2021 17:35:18 +0800
Subject: [PATCH 2/2] 25757

---
 src/apps/AppWorkonline/Detail.vue  | 4 ++--
 src/apps/AppWorkonline/Opinion.vue | 6 +++---
 src/apps/AppWorkonline/detail.vue  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/apps/AppWorkonline/Detail.vue b/src/apps/AppWorkonline/Detail.vue
index f70d4534..f5f145a6 100644
--- a/src/apps/AppWorkonline/Detail.vue
+++ b/src/apps/AppWorkonline/Detail.vue
@@ -162,10 +162,10 @@
                   </div>
                 </div>
 
-                <!-- <div v-if="item.candidateFieldInfos" v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2">
+                <div v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2" v-if="item.candidateFieldInfos">
                   <span>{{ item2.fieldName }}&nbsp;:&nbsp;</span>
                   <span>{{ item2.fieldValue }}</span>
-                </div> -->
+                </div>
 
                 <!-- <div v-for="(item4, indexsss) in stepList" :key="indexsss">
                   <span>{{ item4.fieldName }}&nbsp;:&nbsp;</span>
diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue
index 4448274e..0f1b4c41 100644
--- a/src/apps/AppWorkonline/Opinion.vue
+++ b/src/apps/AppWorkonline/Opinion.vue
@@ -21,7 +21,7 @@
         <!-- 同意意见 -->
         <div v-if="type == 1">
           <div class="list" v-for="(item, index) in list" :key="index">
-            <div class="textarea_msgfont" v-if="item.fieldDataType == 1">
+            <div class="textarea_msgfont" v-if="item.fieldType == 3">
               <span class="msgfont">
                 <span class="icon" v-if="item.mustFill == 1">*</span>
                 <span> {{ item.fieldName }}:</span>
@@ -29,14 +29,14 @@
               <textarea :maxlength="150" placeholder="请输入审批意见" v-model="item.fieldValue" class="textarea" clearable="false"> </textarea>
               <div class="clearns" @click="clearn">清空内容</div>
               <div class="msg_length">
-                <span class="font">{{ item.fieldValue.length }}</span>
+                <span class="font">{{ item.fieldValue && item.fieldValue.length }}</span>
                 <span>/{{ item.fieldLength }}</span>
               </div>
             </div>
 
             <!-- 入户调查时间 -->
             <!-- v-if="item.fieldType == 3 && item.fieldDataType == 8" .-->
-            <div class="calendar" v-if="item.fieldDataType == 8">
+            <div class="calendar" v-if="item.fieldType == 5">
               <div class="left">
                 <span class="icon" v-if="item.mustFill == 1">*</span>
                 <span> {{ item.fieldName }}:</span>
diff --git a/src/apps/AppWorkonline/detail.vue b/src/apps/AppWorkonline/detail.vue
index f70d4534..f5f145a6 100644
--- a/src/apps/AppWorkonline/detail.vue
+++ b/src/apps/AppWorkonline/detail.vue
@@ -162,10 +162,10 @@
                   </div>
                 </div>
 
-                <!-- <div v-if="item.candidateFieldInfos" v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2">
+                <div v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2" v-if="item.candidateFieldInfos">
                   <span>{{ item2.fieldName }}&nbsp;:&nbsp;</span>
                   <span>{{ item2.fieldValue }}</span>
-                </div> -->
+                </div>
 
                 <!-- <div v-for="(item4, indexsss) in stepList" :key="indexsss">
                   <span>{{ item4.fieldName }}&nbsp;:&nbsp;</span>