[update] 修改企标制修订流程
This commit is contained in:
+45
-14
@@ -384,12 +384,26 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
// 初始化流程信息
|
||||
this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
|
||||
// 初始化流程审批信息,草稿进来的才回显审批信息
|
||||
// 草稿进来的回显
|
||||
if (type === 'draft') {
|
||||
this.approvalInfoForm.setFieldsValue(pick(this.model.common, 'commitText', 'commitFile'))
|
||||
// 初始化流程信息
|
||||
const prcObj = Object.assign({}, this.model)
|
||||
prcObj.dueTime = this.model.processDueDate
|
||||
prcObj.prcMes = this.model.processDescription
|
||||
this.processInfoForm.setFieldsValue(pick(prcObj, 'prcName', 'dueTime', 'prcMes'))
|
||||
// 初始化流程审批信息
|
||||
prcObj.commitText = this.model.handleText
|
||||
prcObj.commitFile = this.model.handleFile
|
||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr).data
|
||||
// 如果是节点1的保存回显人员信息
|
||||
if (this.currentNode === 1) {
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
|
||||
}
|
||||
}
|
||||
if (this.$refs.baseInfoRef) {
|
||||
this.$refs.baseInfoRef.initData(this.model.data)
|
||||
}
|
||||
// 初始化业务基本信息中组件内容
|
||||
this.$refs.baseInfoRef.initData(this.model.data)
|
||||
})
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
@@ -438,26 +452,43 @@ export default {
|
||||
const personnelObj = this.$refs.personnelInfo.getDataObj()
|
||||
// 需要传给后端的
|
||||
const paramObj = {}
|
||||
paramObj.common = { ...processInfoForm, ...approvalInfoForm }
|
||||
paramObj.flowUser = personnelObj
|
||||
// 流程信息
|
||||
paramObj.basicProcessInfoDTO = Object.assign({}, processInfoForm)
|
||||
paramObj.basicProcessInfoDTO.processName = paramObj.basicProcessInfoDTO.prcName
|
||||
paramObj.basicProcessInfoDTO.processDueDate = paramObj.basicProcessInfoDTO.dueTime
|
||||
paramObj.basicProcessInfoDTO.processDescription = paramObj.basicProcessInfoDTO.prcMes
|
||||
paramObj.basicProcessInfoDTO.processInstanceId = this.$route.query.processInstanceId
|
||||
// 流程审批信息
|
||||
paramObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm)
|
||||
paramObj.basicTaskInfoDTO.handleText = paramObj.basicTaskInfoDTO.commitText
|
||||
paramObj.basicTaskInfoDTO.handleFile = paramObj.basicTaskInfoDTO.commitFile
|
||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||
// paramObj.common = { ...processInfoForm, ...approvalInfoForm }
|
||||
// paramObj.flowUser = personnelObj
|
||||
// 业务基本信息
|
||||
if (this.$refs.baseInfoRef) {
|
||||
// 业务基本信息
|
||||
const baseInfo = this.$refs.baseInfoRef.getData()
|
||||
const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj, ...baseInfo.formInline }
|
||||
const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj, ...baseInfo }
|
||||
const flag = Object.values(param).some(v => !!v || v === 0)
|
||||
if (!flag || (baseInfo.dataSource && baseInfo.dataSource.length <= 0)) {
|
||||
if (!flag) {
|
||||
// 提示至少填写一项
|
||||
this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
|
||||
return
|
||||
}
|
||||
if (baseInfo.dataSource) {
|
||||
paramObj.dataList = baseInfo.dataSource.map(item => {
|
||||
return { ...item, ...baseInfo.formInline }
|
||||
})
|
||||
} else {
|
||||
paramObj.dataList = [baseInfo.formInline]
|
||||
// 业务基本信息和人员信息
|
||||
paramObj.infoJsonStr = JSON.stringify({
|
||||
data: Object.assign({}, baseInfo),
|
||||
personnelObj: personnelObj
|
||||
})
|
||||
}
|
||||
// if (baseInfo.dataSource) {
|
||||
// paramObj.dataList = baseInfo.dataSource.map(item => {
|
||||
// return { ...item, ...baseInfo.formInline }
|
||||
// })
|
||||
// } else {
|
||||
// paramObj.dataList = [baseInfo.formInline]
|
||||
// }
|
||||
} else {
|
||||
// 需要外层信息至少填了一项
|
||||
const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
|
||||
|
||||
Reference in New Issue
Block a user