kubbo/dvcp_v2_wechat_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-03-08 13:50:44 +08:00
parent 65aca68012 dba4841906
commit b316ea7661
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mods/AppIntegralApply/detail.vue
View File

@@ -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>

14
src/mods/AppMyPlan/progressDetail.vue
View File

@@ -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>
@@ -111,15 +107,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>

6
src/mods/AppServiceOnlineNew/form.vue
View File

@@ -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)