diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue index d8907d0e..d8a9ff2a 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue @@ -328,7 +328,7 @@ export default { 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) + this.model.dataList = JSON.parse(this.model.infoJsonStr).dataList } // 初始化业务基本信息 this.$refs.baseInfoRef.initData(this.model.dataList) @@ -385,7 +385,7 @@ export default { return } // 该流程中业务基本信息只有表格 - paramObj.infoJsonStr = JSON.stringify(ruleForm.dataSource) + paramObj.infoJsonStr = JSON.stringify({dataList: ruleForm.dataSource}) } else { // 需要外层信息至少填了一项 const form = { ...processInfoForm, ...approvalInfoForm, ...personnelObj } diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue index b5d9876a..54e822cb 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue @@ -271,10 +271,10 @@ export default { 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) + this.model.data = JSON.parse(this.model.infoJsonStr).data // 如果是节点1的保存回显人员信息 if (this.currentNode === 1) { - this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj) } } if (this.$refs.baseInfoRef) { @@ -340,8 +340,8 @@ export default { } // 业务基本信息和人员信息 paramObj.infoJsonStr = JSON.stringify({ - ...baseInfo.formInline, - ...personnelObj + data: baseInfo.formInline, + personnelObj: personnelObj }) // paramObj.common = { ...processInfoForm, ...approvalInfoForm } // paramObj.common.taskId = this.$route.query.taskId || null diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index 463c6231..0036fb2d 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -272,10 +272,10 @@ export default { 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) + this.model.data = JSON.parse(this.model.infoJsonStr).data // 如果是节点1的保存回显人员信息 if (this.currentNode === 1) { - this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj) } } // 初始化业务基本信息中组件内容 @@ -347,8 +347,8 @@ export default { baseInfoObj.list = baseInfo.dataSource } paramObj.infoJsonStr = JSON.stringify({ - ...baseInfoObj, - ...personnelObj + data: baseInfoObj, + personnelObj: personnelObj }) } else { const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj } diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 3e34eec5..5d3cf3bf 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -567,7 +567,7 @@ export default { prcObj.commitFile = this.model.handleFile this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile')) console.log(JSON.parse(this.model.infoJsonStr)) - this.model.dataList = JSON.parse(this.model.infoJsonStr).arr || JSON.parse(this.model.infoJsonStr).dataList + this.model.dataList = JSON.parse(this.model.infoJsonStr).dataList } // 初始化业务基本信息的申请类型和项目类别,分开赋值是因为项目类别会没有下拉数据无法回显 const baseInfoForm = {} @@ -825,7 +825,7 @@ export default { // 业务基本信息和人员信息 console.log(this.userFormModel) paramObj.infoJsonStr = JSON.stringify({ - arr: arr.map(item => { + dataList: arr.map(item => { return { ...item, ...this.userFormModel } }), personnelObj: personnelObj diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index b692b47f..8b42b6d1 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -319,7 +319,7 @@ export default { 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).baseInfo + this.model.data = JSON.parse(this.model.infoJsonStr).data // 如果是节点1的保存回显人员信息 if (this.currentNode === 1 || this.currentNode === 2) { this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj) @@ -398,7 +398,7 @@ export default { // 业务基本信息和人员信息 paramObj.infoJsonStr = JSON.stringify({ personnelObj: personnelObj, - baseInfo: baseInfo.formInline + data: baseInfo.formInline }) // paramObj.common = { ...processInfoForm, ...approvalInfoForm } // paramObj.common.taskId = this.$route.query.taskId || null diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue index 58dac7c7..39ef0320 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue @@ -273,10 +273,10 @@ export default { 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) + this.model.data = JSON.parse(this.model.infoJsonStr).data // 如果是节点1的保存回显人员信息 if (this.currentNode === 1) { - this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj) } } if (this.$refs.baseInfoRef) { @@ -342,8 +342,8 @@ export default { } // 业务基本信息和人员信息 paramObj.infoJsonStr = JSON.stringify({ - ...baseInfo.formInline, - ...personnelObj + data: baseInfo.formInline, + personnelObj: personnelObj }) // paramObj.common = { ...processInfoForm, ...approvalInfoForm } // paramObj.common.taskId = this.$route.query.taskId || null diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index bec892ae..71c2b981 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -271,10 +271,10 @@ export default { 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) + this.model.data = JSON.parse(this.model.infoJsonStr).data // 如果是节点1的保存回显人员信息 if (this.currentNode === 1) { - this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr)) + this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj) } } if (this.$refs.baseInfoRef) { @@ -340,8 +340,8 @@ export default { } // 业务基本信息和人员信息 paramObj.infoJsonStr = JSON.stringify({ - ...baseInfo.formInline, - ...personnelObj + data: baseInfo.formInline, + personnelObj: personnelObj }) // paramObj.common = { ...processInfoForm, ...approvalInfoForm } // paramObj.common.taskId = this.$route.query.taskId || null