diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue index 322e9d70..56406067 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue @@ -77,7 +77,7 @@
- +
@@ -112,8 +112,6 @@ import InternalDetailPage from '@/components/InternalDetailPage' import ProcessDetailList from '@/components/ProcessDetailList' import PersonnelInfo from '@/components/PersonnelInfo' import UserSelectModal from '@/components/selection/UserSelectModal' -import { USER_INFO } from '@/store/mutation-types' -import Vue from 'vue' import pick from 'lodash.pick' import { enStandardSealSaveGetDataById, @@ -125,41 +123,7 @@ import { } from '@/api/workCenter' import BaseInfoForm from './modules/BaseInfoForm' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' - -// 人员信息 -const personalInfo = [ // 人员信息的数据 - { - id: 1, - nodeName: '发起人发起', - nodeRoleName: '发起人', - canChoose: false, - userList: Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' - }, - { - id: 2, - nodeName: '相关人员会签', - nodeRoleName: '相关人员', - canChoose: true, - chooseType: 'checkbox', - fieldName: '' - }, - { - id: 3, - nodeName: '起草人和会签人主管级领导审批', - nodeRoleName: '起草人和会签人主管级领导', - canChoose: true, - chooseType: 'radio', - fieldName: '' - }, - { - id: 4, - nodeName: '标准化审批', - nodeRoleName: '标准化', - canChoose: true, - chooseType: 'radio', - fieldName: '' - } -] +import { ProcessKey } from '@/enums/commonEnums' export default { name: 'EnterpriseStandardSealSaveFlow', @@ -178,7 +142,7 @@ export default { }, mounted () { // 获取人员信息结构 - this.getPersonInfoStructure() + this.getPersonInfoStructure(ProcessKey.ES_ARCHIVE.value) if (this.$route.query.taskId) { this.currentNodeName = this.$route.query.taskName // 有流程id说明是从流程中心来的,需要初始化数据 @@ -343,24 +307,23 @@ export default { // 流程信息的校验 this.processInfoForm.validateFields((err, values) => { // 流程审批信息的校验 - this.approvalInfoForm.validateFields((approvalErr, approvalValues) => { - this.$refs.baseInfoRef.getDataValidate(data => { - if (!err && !approvalErr && data) { - const paramObj = {} // 需要传给后端的数据 - paramObj.common = { ...values, ...approvalValues } - paramObj.flowUser = personnelObj - paramObj.dataList = [data.formInline] - enStandardSealSaveApproval(paramObj).then(res => { - if (res.success) { - this.$message.success(res.message) - } else { - this.$message.warning(res.message) - } - }).finally(() => { - this.loading = false - }) - } - }) + this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { + const data = await this.$refs.baseInfoRef.getDataValidate() + if (!err && !approvalErr && data) { + const paramObj = {} // 需要传给后端的数据 + paramObj.common = { ...values, ...approvalValues } + paramObj.flowUser = personnelObj + paramObj.dataList = [data.formInline] + enStandardSealSaveApproval(paramObj).then(res => { + if (res.success) { + this.$message.success(res.message) + } else { + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) + } }) }) }, diff --git a/src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue index 545c22cc..37ddb27d 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/modules/BaseInfoForm.vue @@ -1,160 +1,163 @@ -