From f01d0f39b21d8e70acd2618262c6d7f8e42f50b5 Mon Sep 17 00:00:00 2001
From: changjinpeng <185154740@qq.com>
Date: Tue, 8 Mar 2022 11:57:19 +0800
Subject: [PATCH 1/2] 28014

---
 src/mods/AppIntegralApply/detail.vue  | 7 ++++++-
 src/mods/AppMyPlan/progressDetail.vue | 6 +-----
 src/mods/AppServiceOnlineNew/form.vue | 6 ++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/mods/AppIntegralApply/detail.vue b/src/mods/AppIntegralApply/detail.vue
index e5aee5e..beffef8 100644
--- a/src/mods/AppIntegralApply/detail.vue
+++ b/src/mods/AppIntegralApply/detail.vue
@@ -8,6 +8,11 @@
         <div class="cards-right">{{ detail.residentName }}</div>
       </div>
 
+      <div class="cards">
+        <div class="cards-left">联系电话</div>
+        <div class="cards-right">{{ detail.residentPhone }}</div>
+      </div>
+
       <div class="cards">
         <div class="cards-left">申请时间</div>
         <div class="cards-right">
@@ -23,7 +28,7 @@
       </div>
 
       <div class="cardss">
-        <div class="cards-left">申请描述</div>
+        <div class="cards-left">事件描述</div>
         <div class="cards-right">{{ detail.description }}</div>
       </div>
 
diff --git a/src/mods/AppMyPlan/progressDetail.vue b/src/mods/AppMyPlan/progressDetail.vue
index a451e90..031aeff 100644
--- a/src/mods/AppMyPlan/progressDetail.vue
+++ b/src/mods/AppMyPlan/progressDetail.vue
@@ -111,15 +111,11 @@
                 <i style="color: #f14242"> {{ item.title2Desc }}</i>
               </div>
 
-              <div class="detail-right__subtitle" v-if="item.opinion && item.stepType === '2'" style="padding: 5px 0">
+              <div class="detail-right__subtitle" v-if="item.opinion" style="padding: 5px 0">
                 <span>审批意见：</span>
                 <i style="color: #333">{{ item.opinion }}</i>
               </div>
 
-              <div class="detail-right__subtitle" v-if="item.stepType != 2 && item.opinion" style="padding: 5px 0">
-                <i style="color: #333">{{ item.opinion }}</i>
-              </div>
-
               <div class="detail-right__subtitle detail-right__text" style="display: block" v-if="item.candidateFieldInfos && item.candidateFieldInfos.length" v-for="(candidateField, z) in item.candidateFieldInfos" :key="z">
                 <span>{{ candidateField.fieldName }}</span>
                 <i style="color: #343d65; display: contents">{{ candidateField.dictionaryCode ? $dict.getLabel(candidateField.dictionaryCode, candidateField.fieldValue) || '-' : candidateField.fieldValue || '-' }}</i>
diff --git a/src/mods/AppServiceOnlineNew/form.vue b/src/mods/AppServiceOnlineNew/form.vue
index 40cc3e1..1cd516c 100644
--- a/src/mods/AppServiceOnlineNew/form.vue
+++ b/src/mods/AppServiceOnlineNew/form.vue
@@ -402,12 +402,14 @@ export default {
     },
 
     onPickerChange(e) {
+      console.log(e)
       const index = e.target.dataset.index
       const i = e.target.dataset.i
       const dict = e.target.dataset.dict
-      const value = e.detail.value
+      // const value = e.detail.value
       // const key = this.$dict.getLabel(dict, value)
-      const key = this.$dict.getDict(dict)[value].dictName
+      const value = this.$dict.getDict(dict)[0].dictValue
+      const key = this.$dict.getDict(dict)[0].dictName
 
       this.$set(this.tableForm[index][i], 'fieldValue', value)
       this.$set(this.tableForm[index][i], 'fieldDictName', key)

From dba4841906620b80f8cf860dc3289a9383870bc6 Mon Sep 17 00:00:00 2001
From: changjinpeng <185154740@qq.com>
Date: Tue, 8 Mar 2022 13:46:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?28014=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/AppMyPlan/progressDetail.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mods/AppMyPlan/progressDetail.vue b/src/mods/AppMyPlan/progressDetail.vue
index 031aeff..d17db8a 100644
--- a/src/mods/AppMyPlan/progressDetail.vue
+++ b/src/mods/AppMyPlan/progressDetail.vue
@@ -63,13 +63,9 @@
             <div class="detail-form__item--info" v-for="(field, i) in item" :key="i">
               <h2>{{ field.fieldName }}{{ field.fieldNameSuffix || '' }}</h2>
               <span v-if="!field.dictionaryCode">{{ field.fieldValue || '-' }}</span>
-              <span v-if="field.dictionaryCode && field.fieldDataType !== '5' && field.fieldDataType != 9">{{ $dict.getLabel(field.dictionaryCode, field.fieldValue) || '-' }}</span>
+              <span v-if="field.dictionaryCode && field.fieldDataType !== '5'">{{ $dict.getLabel(field.dictionaryCode, field.fieldValue) || '-' }}</span>
 
-              <span v-if="field.dictionaryCode && field.fieldDataType === '5' && field.fieldDataType != 9">{{ getDictValue(field.dictionaryCode, field.fieldValue) }}</span>
-
-              <span v-if="field.fieldDataType == 9">
-                {{ $dict.getDict(field.dictionaryCode, field.fieldValue)[$dict.getLabel(field.dictionaryCode, field.fieldValue)].dictName || '-' }}
-              </span>
+              <span v-if="field.dictionaryCode && field.fieldDataType === '5'">{{ getDictValue(field.dictionaryCode, field.fieldValue) }}</span>
             </div>
           </div>
         </div>