Commit 52691fb6 authored by jingnan's avatar jingnan 👀

合并产品代码【9933】【10118】【9903】【10100】

parent 0d13ae37
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -127,7 +127,7 @@ export default {
immediate: true,
handler(newV, oldV) {
if (newV) {
this.$set(this.propForm, 'description', '')
this.$set(this.propForm, 'description', newV.description)
this.newParticipantData = newV
}
},
......
......@@ -81,7 +81,7 @@ export default {
{ label: '执行期限:', value: basicInfo.costTimeInMillis ? `${basicInfo.costTimeInMillis / 3600 / 1000 / 24}天` : '/' },
{ label: '说明:', value: basicInfo.description },
{ label: '指示:', value: basicInfo.instruction },
{ label: '备注:', value: basicInfo.lastComments && basicInfo.lastComments.length ? basicInfo.lastComments.join(',') : '' }
{ label: '备注:', value: basicInfo.comments && basicInfo.comments.length ? basicInfo.comments.join(',') : '' }
]
},
handleOpen() {
......
......@@ -588,7 +588,8 @@ export default {
this.participantData = {
'procInstId': basicInfo.processInstanceId,
'procDefId': basicInfo.processDefinitionId,
'taskKey': basicInfo.taskDefinitionKey
'taskKey': basicInfo.taskDefinitionKey,
description: Array.isArray(basicInfo.comments) && basicInfo.comments.length ? basicInfo.comments.join(',') : ''
}
this.getBizForm()
// this.dynamicComponents = [
......
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