diff --git a/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue b/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue index 6ececb6..58996a5 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue @@ -274,8 +274,8 @@ :label="$t('esInitChange.newPrincipalDrafter')" v-model="baseInfoForm[0].newMainDraftingUser" :readonly="!newMainDrafterCanUpdate && !onlyNewMainDrafterCanUpdate" - filedName="newMainDraftingUser" - @nameChange="selectUserNameChange" + fieldName="newMainDraftingUser" + @selectNameChange="selectUserNameChange" :checkedNames="baseInfoForm[0].newMainDraftingUser_dictText" type="radio" /> @@ -291,8 +291,8 @@ :label="$t('esInitChange.newHeadOfMainDraftingUnit')" v-model="baseInfoForm[0].newMainDraftingUnitResponsiblePerson" :readonly="!newMainDrafterCanUpdate" - filedName="newMainDraftingUnitResponsiblePerson" - @nameChange="selectUserNameChange" + fieldName="newMainDraftingUnitResponsiblePerson" + @selectNameChange="selectUserNameChange" :checkedNames="baseInfoForm[0].newMainDraftingUnitResponsiblePerson_dictText" type="radio" /> @@ -680,8 +680,8 @@ :rules="userRules.newMainDraftUserLeader" :label="$t('esInitChange.superintendent')" v-model="userForm.newMainDraftUserLeader" - filedName="newMainDraftUserLeader" - @nameChange="userFormUserNameChange" + fieldName="newMainDraftUserLeader" + @selectNameChange="userFormUserNameChange" :checkedNames="userForm.newMainDraftUserLeader_dictText" type="radio" /> @@ -692,8 +692,8 @@ :rules="userRules.relatedUserList" :label="$t('esInitChange.relatedPersonnel')" v-model="userForm.relatedUserList" - filedName="relatedUserList" - @nameChange="userFormUserNameChange" + fieldName="relatedUserList" + @selectNameChange="userFormUserNameChange" :checkedNames="userForm.relatedUserList_dictText" type="checkbox" /> @@ -747,15 +747,6 @@ {{ $t('submit') }} - + @@ -817,7 +817,7 @@ export default { ProcessKey, ApplicationCategory, ProjectType, - readonly: true, + readonly: false, loading: false, // 申请类型 applicationCategoryData: [ @@ -1134,6 +1134,7 @@ export default { this.baseInfoForm[0][fieldName + '_dictText'] = value }, userFormUserNameChange (value, fieldName) { + console.log(value, fieldName) this.userForm[fieldName + '_dictText'] = value }, // 转办 @@ -1162,16 +1163,40 @@ export default { // 保存 handleSave () { if (this.loading) return - const param = {} - param.common = Object.assign({}, this.processInfoForm) - param.common.taskId = this.$route.query.taskId || null - param.flowUser = this.$refs.processCommonLayout.getDataObj() - param.dataList = Array.from(this.baseInfoForm) - console.log(param) - param.dataList[0] = { ...param.dataList[0], ...this.userForm } + const flowUser = this.$refs.processCommonLayout.getDataObj() + const paramObj = {} + // 流程信息 + paramObj.basicProcessInfoDTO = Object.assign({}, this.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 = {} + paramObj.basicTaskInfoDTO.handleText = paramObj.basicProcessInfoDTO.commitText + paramObj.basicTaskInfoDTO.handleFile = paramObj.basicProcessInfoDTO.commitFile + paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId + // 业务基本信息和人员信息 + console.log({ + arr: this.baseInfoForm.map(item => { + return { ...item, ...this.userForm } + }), + personnelObj: flowUser + }) + paramObj.infoJsonStr = JSON.stringify({ + arr: this.baseInfoForm.map(item => { + return { ...item, ...this.userForm } + }), + personnelObj: flowUser + }) + // param.common = Object.assign({}, this.processInfoForm) + // param.common.taskId = this.$route.query.taskId || null + // param.dataList = Array.from(this.baseInfoForm) + // console.log(param) + // param.dataList[0] = { ...param.dataList[0], ...this.userForm } this.loading = true // 保存到草稿 - enterprisePlanApprovalSave(param).then(res => { + enterprisePlanApprovalSave(paramObj).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() @@ -1311,4 +1336,9 @@ export default { diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue index b46c454..10f93ef 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue @@ -1,5 +1,5 @@