diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue index ee1060d8..5847ff09 100644 --- a/src/components/PersonnelInfo.vue +++ b/src/components/PersonnelInfo.vue @@ -32,16 +32,22 @@ v-model="step.linkUserIds" :type="step.chooseType" :name-str="step.linkUserIds_dictText" + :filedName="step.variableName" + @nameChange="nameChange" input-type="textarea" />
{{ step.userList }}
@@ -116,11 +122,24 @@ export default { // 获取人员对象，无校验 getDataObj () { const personnelObj = {} + // for (let i = 0; i < this.stepsData.length; i++) { + // // 该属性还没有人就给他赋值 + // if ((this.stepsData[i].canChoose || i === 0) && !personnelObj[this.stepsData[i].variableName]) { + // personnelObj[this.stepsData[i].variableName] = this.stepsData[i].linkUserIds + // personnelObj[this.stepsData[i].variableName + '_dictText'] = this.stepsData[i].linkUserIds_dictText || this.stepsData[i].userList + // } + // } for (const item of this.stepsData) { + console.log(item) // 该属性还没有人就给他赋值 - if ((item.canChoose || item.sort === 1) && !personnelObj[item.variableName]) { + if (!personnelObj[item.variableName]) { personnelObj[item.variableName] = item.linkUserIds + personnelObj[item.variableName + '_dictText'] = item.linkUserIds_dictText || item.userList } + // if ((item.canChoose || item.sort === 1) && !personnelObj[item.variableName]) { + // personnelObj[item.variableName] = item.linkUserIds + // personnelObj[item.variableName + '_dictText'] = item.linkUserIds_dictText || item.userList + // } } return personnelObj }, @@ -140,11 +159,15 @@ export default { // personnelObj[item.variableName] = item.linkUserIds // } // } + console.log(personnelObj) if (!Object.values(personnelObj).every(v => !!v)) { this.$message.warning(this.$t('pleaseEnterPersonnelInfo')) personnelObj = false } return personnelObj + }, + nameChange (value, fieldName) { + this.stepsData.find(item => item.variableName === fieldName).linkUserIds_dictText = value } } } diff --git a/src/mixins/WorkCenterMixin.js b/src/mixins/WorkCenterMixin.js index d5d60afe..1cd3bfdc 100644 --- a/src/mixins/WorkCenterMixin.js +++ b/src/mixins/WorkCenterMixin.js @@ -62,6 +62,19 @@ export const WorkCenterMixin = { }) } }, + // 节点1的草稿回显人员信息 + draftInitPersonInfo (personInfoObj) { + console.log('(((((((((((((draftInitPersonInfo)))))))))))') + this.personnelInfoData = this.personnelInfoData.map(item => { + return { + ...item, + linkUserIds: personInfoObj[item.variableName] || item.linkUserIds, + linkUserIds_dictText: personInfoObj[item.variableName + '_dictText'], + userList: personInfoObj[item.variableName + '_dictText'] + } + }) + console.log(this.personnelInfoData) + }, // 操作完成返回 goBack () { let timer = setTimeout(() => { diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue index e4846b6a..80e187d4 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue @@ -258,9 +258,22 @@ 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) + // 如果是节点1的保存回显人员信息 + if (this.currentNode === 1) { + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + } } if (this.$refs.baseInfoRef) { this.$refs.baseInfoRef.initData(this.model.data) @@ -305,11 +318,27 @@ export default { } // 需要传给后端的数据 const paramObj = {} - paramObj.common = { ...processInfoForm, ...approvalInfoForm } - paramObj.common.taskId = this.$route.query.taskId || null - paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null - paramObj.flowUser = personnelObj - paramObj.data = baseInfo.formInline + // 流程信息 + 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.infoJsonStr = JSON.stringify({ + ...baseInfo.formInline, + ...personnelObj + }) + // paramObj.common = { ...processInfoForm, ...approvalInfoForm } + // paramObj.common.taskId = this.$route.query.taskId || null + // paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null + // paramObj.flowUser = personnelObj + // paramObj.data = baseInfo.formInline this.loading = true // 保存到草稿 enStandardAnnulSave(paramObj).then(res => { diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index 6406267a..ea5b0a26 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -259,9 +259,22 @@ 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) + // 如果是节点1的保存回显人员信息 + if (this.currentNode === 1) { + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + } } // 初始化业务基本信息中组件内容 this.$refs.baseInfoRef.initData(this.model.data) @@ -295,10 +308,21 @@ export default { const personnelObj = this.$refs.personnelInfo.getDataObj() // 需要传给后端的 const paramObj = {} - paramObj.common = { ...processInfoForm, ...approvalInfoForm } - paramObj.common.taskId = this.$route.query.taskId || null - paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null - 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.common.taskId = this.$route.query.taskId || null + // paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null + // paramObj.flowUser = personnelObj if (this.$refs.baseInfoRef) { // 业务基本信息 const baseInfo = this.$refs.baseInfoRef.getData() @@ -309,10 +333,14 @@ export default { this.$message.warning(this.$t('pleaseFillInAtLeastOneItem')) return } - paramObj.data = Object.assign({}, baseInfo.formInline) + const baseInfoObj = Object.assign({}, baseInfo.formInline) if (baseInfo.dataSource) { - paramObj.data.list = baseInfo.dataSource + baseInfoObj.list = baseInfo.dataSource } + paramObj.infoJsonStr = JSON.stringify({ + ...baseInfoObj, + ...personnelObj + }) } else { const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj } const flag = Object.values(param).some(v => !!v || v === 0) @@ -321,6 +349,7 @@ export default { this.$message.warning(this.$t('pleaseFillInAtLeastOneItem')) return } + paramObj.infoJsonStr = JSON.stringify(personnelObj) } this.loading = true // 保存到草稿 diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index e5a0fbc0..6103fc43 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -171,7 +171,7 @@ type="radio" v-decorator="['newMainDraftUserLeader', validatorRules.newMainDraftUserLeader]" @nameChange="userSelectNameChange" - fieldName="newMainDraftUserLeader" + filedName="newMainDraftUserLeader" :nameStr="userFormModel.newMainDraftUserLeader_dictText" input-type="textarea" /> @@ -183,7 +183,7 @@ type="checkbox" v-decorator="['relatedUserList', validatorRules.relatedUserList]" @nameChange="userSelectNameChange" - fieldName="relatedUserList" + filedName="relatedUserList" :nameStr="userFormModel.relatedUserList_dictText" input-type="textarea" /> @@ -523,9 +523,18 @@ export default { this.model = res.result // 初始化流程信息 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.dataList = JSON.parse(this.model.infoJsonStr).arr } // 初始化业务基本信息的申请类型和项目类别,分开赋值是因为项目类别会没有下拉数据无法回显 const baseInfoForm = {} @@ -555,6 +564,10 @@ export default { this.initPersonInfoData(false) } } + // 如果是草稿节点1的保存回显人员信息 + if (type === 'draft' && this.currentNode === 1) { + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + } // 初始化业务基本信息中组件内容 if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) { // 是立项 @@ -585,7 +598,10 @@ export default { this.$refs.changeBaseInfo.formInline = param }) // 回显部分节点选人 - this.userFormModel = Object.assign({}, this.model.dataList[0]) + this.userFormModel = { + newMainDraftUserLeader_dictText: this.model.dataList[0].newMainDraftUserLeader_dictText, + relatedUserList_dictText: this.model.dataList[0].relatedUserList_dictText + } this.userForm.setFieldsValue(pick(this.model.dataList[0], 'newMainDraftUserLeader', 'relatedUserList')) }) } @@ -628,6 +644,7 @@ export default { }, // 选择用户得到用户名 userSelectNameChange (value, fieldName) { + console.log(fieldName) this.userFormModel[fieldName + '_dictText'] = value }, // 业务基本信息组件中获取到流程名称改变后的值 @@ -649,7 +666,7 @@ export default { // 部分节点的选人表单 const userInfoForm = this.userForm.getFieldsValue() // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObj + const personnelObj = this.$refs.personnelInfo.getDataObj() // 业务基础信息组件中的数据 let arr = [] // 业务基本信息-立项表单 @@ -721,14 +738,33 @@ export default { } } this.loading = true - const param = {} // 传给后端的参数 - param.common = { ...processInfoForm, ...approvalInfoForm } // 流程信息和流程审批信息 - param.common.taskId = this.$route.query.taskId || null - param.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null - param.dataList = arr // 业务基础信息数组 - param.flowUser = personnelObj // 人员信息 + const paramObj = {} // 传给后端的参数 + // 流程信息 + 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 + // 业务基本信息和人员信息 + console.log(this.userFormModel) + paramObj.infoJsonStr = JSON.stringify({ + arr: arr.map(item => { + return { ...item, ...this.userFormModel } + }), + ...personnelObj + }) + // param.common = { ...processInfoForm, ...approvalInfoForm } // 流程信息和流程审批信息 + // param.common.taskId = this.$route.query.taskId || null + // param.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null + // param.dataList = arr // 业务基础信息数组 + // param.flowUser = personnelObj // 人员信息 // 保存到草稿 - enterprisePlanApprovalSave(param).then(res => { + enterprisePlanApprovalSave(paramObj).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index 9ce57ac6..450ffedd 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -201,6 +201,7 @@ export default { // 如果没有processInstanceId说明流程还没发起过 if (!this.$route.query.processInstanceId) { // 不显示第一个节点人员信息 + console.log('要截一个人了') this.personnelInfoData.shift() // 说明是在新发起一个节点，初始化发起人员信息 this.personnelInfoData[0].linkUserIds = Vue.ls.get(USER_INFO).id @@ -297,19 +298,37 @@ 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) + // 如果是节点1的保存回显人员信息 + if (this.currentNode === 1 || this.currentNode === 2) { + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + } } // 初始化业务基本信息中组件内容 if (this.$refs.baseInfoRef) { this.$refs.baseInfoRef.initData(this.model.data) } + console.log(this.model.data.showFirstNode) + if (this.$route.query.processInstanceId && !Number(this.model.data.showFirstNode)) { + // 不显示第一个节点人员信息 + console.log('要截第二个人') + this.personnelInfoData.shift() + // this.personnelInfoData[0].linkUserIds = Vue.ls.get(USER_INFO).id + // this.personnelInfoData[0].linkUserIds_dictText = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' + // this.personnelInfoData[0].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' + } }) - if (!this.model.data.showFirstNode) { - // 不显示第一个节点人员信息 - this.personnelInfoData.shift() - } // enStandardRecheckIsShowFirstPerson({ id: this.model.data.id }).then(res => { // if (res.success && !res.result) { // @@ -353,11 +372,27 @@ export default { } // 需要传给后端的数据 const paramObj = {} - paramObj.common = { ...processInfoForm, ...approvalInfoForm } - paramObj.common.taskId = this.$route.query.taskId || null - paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null - paramObj.flowUser = personnelObj - paramObj.data = baseInfo.formInline + // 流程信息 + 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.infoJsonStr = JSON.stringify({ + ...personnelObj, + ...baseInfo.formInline + }) + // paramObj.common = { ...processInfoForm, ...approvalInfoForm } + // paramObj.common.taskId = this.$route.query.taskId || null + // paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null + // paramObj.flowUser = personnelObj + // paramObj.data = baseInfo.formInline this.loading = true // 保存到草稿 enStandardRecheckSave(paramObj).then(res => { diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue index 5db1894e..56e88e4b 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue @@ -101,8 +101,10 @@ export default { // 给表单赋值 this.formInline = Object.assign({}, data) // 带出计划中主起草人可修改 - this.formInline.standardizationUser = data.mainDraftingUser - this.formInline.standardizationUser_dictText = data.mainDraftingUser_dictText + if (data.mainDraftingUser && !this.$route.query.draftId) { + this.formInline.standardizationUser = data.mainDraftingUser + this.formInline.standardizationUser_dictText = data.mainDraftingUser_dictText + } }, // 外层要获取数据 getData () { diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue index e67cfc7c..d3f5a2bb 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue @@ -256,11 +256,26 @@ export default { if (res.success) { this.model = res.result this.$nextTick(() => { - // 初始化流程信息 - this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes')) - // 初始化流程审批信息，草稿进来的才回显审批信息 + if (type === 'todo') { + // 初始化流程信息 + 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) + // 如果是节点1的保存回显人员信息 + if (this.currentNode === 1) { + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + } } if (this.$refs.baseInfoRef) { this.$refs.baseInfoRef.initData(this.model.data) @@ -305,14 +320,27 @@ export default { } // 需要传给后端的数据 const paramObj = {} + // 流程信息 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.infoJsonStr = JSON.stringify({ + ...baseInfo.formInline, + ...personnelObj + }) // paramObj.common = { ...processInfoForm, ...approvalInfoForm } // paramObj.common.taskId = this.$route.query.taskId || null // paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null // paramObj.flowUser = personnelObj // paramObj.data = baseInfo.formInline - paramObj.infoJsonStr = JSON.stringify(baseInfo.formInline) this.loading = true // 保存到草稿 enStandardSealSaveSave(paramObj).then(res => { diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index f1e23945..12666436 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -258,9 +258,22 @@ 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) + // 如果是节点1的保存回显人员信息 + if (this.currentNode === 1) { + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + } } if (this.$refs.baseInfoRef) { this.$refs.baseInfoRef.initData(this.model.data) @@ -305,11 +318,27 @@ export default { } // 需要传给后端的数据 const paramObj = {} - paramObj.common = { ...processInfoForm, ...approvalInfoForm } - paramObj.common.taskId = this.$route.query.taskId || null - paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null - paramObj.flowUser = personnelObj - paramObj.data = baseInfo.formInline + // 流程信息 + 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.infoJsonStr = JSON.stringify({ + ...baseInfo.formInline, + ...personnelObj + }) + // paramObj.common = { ...processInfoForm, ...approvalInfoForm } + // paramObj.common.taskId = this.$route.query.taskId || null + // paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null + // paramObj.flowUser = personnelObj + // paramObj.data = baseInfo.formInline this.loading = true // 保存到草稿 enStandardStartUseSave(paramObj).then(res => {