Commit ac181cc8 authored by xioln's avatar xioln

【5233】 配置流程页表单未显示在流程页

parent 07eccc7c
......@@ -21,14 +21,41 @@
<dee-tools :tools="tools" mode="normal" :collapse="false" />
</div>
<task-detail-basicInfo :basic-data="basicData" />
<!-- <div v-if="approvalObject.length">
<div v-if="approvalObject.length">
<div class="sub-title" style="padding-bottom:12px">审批对象</div>
<div v-for="(x,index) in approvalObject" :key="index">
<dee-dynamic-com v-if="x.type==='customComponent'" :ref="name.configName" :com-item="name" :basic-data="basicData" :participant-data="participantData" />
<component :is="x.comName" v-else-if="x.comName" :ref="x.configName" :lay-info="x" :basic-data="basicData.businessObject" @to-detail="toDetail" />
<component :is="x.configName" v-else :ref="x.configName" :lay-info="x" :basic-data="basicData.businessObject" @to-detail="toDetail" />
<div v-for="(name,index) in approvalObject" :key="index">
<!-- 高级组件: globalComponents -->
<component :is="name.configName" v-if="name && name.type && name.type === 'globalComponents'" :ref="name.refKey" :com-item="name" :basic-data="basicData" :participant-data="participantData" />
<!-- 自定义组件: privateComponent -->
<dee-as-com
v-else-if="name && name.type && name.type === 'privateComponent'"
:ref="name.refKey"
:component-prop="{...name, selfComponentPath: name.selfComponentPath}"
:lay-config="{
component: {
registrationType: 'custom',
codeApp: name.webServerName,
codePath: name.selfComponentPath
}
}"
:basic-data="basicData"
:participant-data="participantData"
@saveStatusChangeEvent="onSaveStatusChangeEvent"
/>
<!-- 表单配置: formConfig -->
<dee-as-com
v-else-if="name && name.type && name.type === 'formConfig'"
:ref="name.refKey"
:lay-config="{
typeName: name.modelName,
layKey: name.keyName
}"
editor-immediately
:basic-data="basicData"
:participant-data="participantData"
/>
</div>
</div> -->
</div>
<div v-if="basicData && basicData.basicInfo && !basicData.basicInfo.forwardFlag">
<div class="sub-title" style="padding-bottom:12px">任务处理</div>
<div v-for="(name,index) in dynamicComponents" :key="index">
......@@ -531,7 +558,13 @@ export default {
el.comName = el.configName
}
})
this.approvalObject = res.items.approvalObject.filter(r => r.isShow)
this.approvalObject = res.items.approvalObject.filter(r => r.isShow).map(m => {
return {
...m,
// 设置组件引用key
refKey: this.$utils.guid()
}
})
}
this.participantData = {
......@@ -714,6 +747,19 @@ export default {
finishTask(flag, params, callback, errCallBack) {
this.$nextTick(function() {
const validateArray = []
// 审批对象表单
this.approvalObject.forEach(item => {
const vm = this.$refs[item.refKey][0]
if (!vm) return
if (vm.hasOwnProperty('validate')) {
validateArray.push(vm.validate())
} else if (vm.$refs.asCom && vm.$refs.asCom.hasOwnProperty('validate')) {
validateArray.push(vm.$refs.asCom.validate())
} else if (vm.$refs.asCom.$refs && vm.$refs.asCom.$refs.deeForm && vm.$refs.asCom.$refs.deeForm.hasOwnProperty('validate')) {
validateArray.push(vm.$refs.asCom.$refs.deeForm.validate())
}
})
// 任务处理
this.dynamicComponents.forEach(item => {
if (this.$refs.hasOwnProperty(item.configName)) {
if (this.$refs[item.configName][0].hasOwnProperty('validate')) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment