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

BUG 29148

Browse Source
This commit is contained in:
aixianling
2022-04-18 09:30:36 +08:00
parent 99a9433c92
commit 8f01e046e0
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
View File

@@ -56,12 +56,13 @@
<el-form label-suffix="：" label-width="180px" size="small"> <el-form label-suffix="：" label-width="180px" size="small">
<div class="border-wrap"> <div class="border-wrap">
<div v-for="(item, index) in applyForm" :key="index"> <div v-for="(item, index) in applyForm" :key="index">
<ai-title :title="index"></ai-title> <ai-title :title="index"/>
<el-form-item v-for="e in item" :key="e.id" :label="[e.fieldName,e.fieldNameSuffix].join('')"> <el-form-item v-for="e in item" :key="e.id" :label="[e.fieldName,e.fieldNameSuffix].join('')">
<el-input :value="getFieldValue(e)" readonly style="width: 100%;" <el-input :value="getFieldValue(e)" readonly style="width: 100%;"
v-if="e.fieldDataType!=5 && e.fieldDataType!=10"/> v-if="e.fieldDataType!=5 && e.fieldDataType!=10"/>
<el-input :value="getAreaName(e)" readonly style="width: 100%;" v-if="e.fieldDataType==10"/> <el-input :value="getAreaName(e)" readonly style="width: 100%;"
<el-checkbox-group v-model="!e.fieldValue ? '' : String(e.fieldValue).split(',')"> v-else-if="e.fieldDataType==10"/>
<el-checkbox-group v-else v-model="!e.fieldValue ? '' : String(e.fieldValue).split(',')">
<el-checkbox :label="val.dictValue" disabled <el-checkbox :label="val.dictValue" disabled
v-for="(val,idx) in dict.getDict(e.dictionaryCode)" :key="idx">{{ val.dictName }} v-for="(val,idx) in dict.getDict(e.dictionaryCode)" :key="idx">{{ val.dictName }}
</el-checkbox> </el-checkbox>
@@ -237,28 +238,15 @@
</el-radio-group> </el-radio-group>
<el-date-picker <el-date-picker
v-if="op.fieldDataType=='8'" v-if="op.fieldDataType==3"
v-model.trim="op.fieldValue" v-model.trim="op.fieldValue"
format="yyyy年MM月dd日" format="yyyy年MM月dd日"
value-format="yyyy年MM月dd日" value-format="yyyy年MM月dd日"
type="date" type="date"
placeholder="请选择"> placeholder="请选择">
</el-date-picker> </el-date-picker>
<ai-select v-if="op.fieldDataType=='9'" v-model="op.fieldValue"
<el-select :selectList="dict.getDict(op.dictionaryCode)"/>
v-if="op.fieldDataType=='9'"
size="small"
v-model="op.fieldValue"
placeholder="请选择"
clearable>
<el-option
v-for="(k,m) in dict.getDict(op.dictionaryCode)"
:key="m"
:label="k.dictName"
:value="k.dictValue"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]" <el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]"
v-if="titleType=='审批拒绝'"> v-if="titleType=='审批拒绝'">
@@ -404,7 +392,7 @@ export default {
return e.dictionaryCode && this.dict.getLabel(e.dictionaryCode, val) return e.dictionaryCode && this.dict.getLabel(e.dictionaryCode, val)
}, },
getFieldValue(e) { getFieldValue(e) {
return e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue return !!e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue
}, },
getAreaName(e) { getAreaName(e) {
return e.areaValue return e.areaValue