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

This commit is contained in:
aixianling
2022-03-08 10:11:07 +08:00

View File

@@ -63,8 +63,13 @@
<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'">{{ $dict.getLabel(field.dictionaryCode, field.fieldValue) || '-' }}</span>
<span v-if="field.dictionaryCode && field.fieldDataType === '5'">{{ getDictValue(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' && 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>
</div>
</div>
</div>