From b599f18337cd1e2d6e7f6ad1fbe2e0ba3277d2d0 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 17 Jan 2024 16:45:23 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BA=BA=E5=91=98=E6=A0=A1=E9=AA=8C=E5=9C=A8?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E4=B9=8B?= =?UTF-8?q?=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RevisionPlanActivelyReportFlow.vue | 12 +++++------ .../RevisionPlanStandardizationInitFlow.vue | 12 +++++------ .../EnterpriseStandardAnnulFlow.vue | 12 +++++------ .../EnterpriseStandardChangeFlow.vue | 12 +++++------ .../PlanApprovalChangeFlow.vue | 20 ++++++++----------- .../EnterpriseStandardRecheckFlow.vue | 12 +++++------ .../EnterpriseStandardRevisionFlow.vue | 12 +++++------ .../EnterpriseStandardSealSaveFlow.vue | 12 +++++------ .../EnterpriseStandardStartUseFlow.vue | 12 +++++------ 9 files changed, 56 insertions(+), 60 deletions(-) diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue index a01fe5b3..2fe170e5 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -505,12 +505,6 @@ export default { // 节点一时候的提交，发起变更 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - if (!personnelObj) { - this.switchValue = 'user' - return - } // 流程信息校验 this.processInfoForm.validateFields((err, values) => { // 流程审批信息校验 @@ -518,6 +512,12 @@ export default { // 需要校验业务基本信息中的表单 const data = await this.$refs.baseInfoFormRef.getDataValidate() if (!err && !approvalErr && data) { + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } this.loading = true const param = {} // 需要给后端的参数 param.common = { ...values, ...approvalValues, ...data.formInline } diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue index cef66f56..9424ba58 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue @@ -409,16 +409,16 @@ export default { // 节点一时候的提交，发起变更 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - if (!personnelObj) { - this.switchValue = 'user' - return - } this.processInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields((approvalErr, approvalValues) => { const data = this.$refs.baseInfoRef.getDataValidate() if (!err && !approvalErr && data) { + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } const param = {} // 传给后端的数据 param.common = { ...values, ...approvalValues } param.dataList = data.dataSource diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue index 28811cac..5bafa04f 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue @@ -361,18 +361,18 @@ export default { // 节点一时候的提交 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - if (!personnelObj) { - this.switchValue = 'user' - return - } // 流程信息的校验 this.processInfoForm.validateFields((err, values) => { // 流程审批信息的校验 this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { const data = await this.$refs.baseInfoRef.getDataValidate() if (!err && !approvalErr && data) { + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } this.loading = true const paramObj = {} // 需要传给后端的数据 paramObj.common = { ...values, ...approvalValues } diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index 37de6718..503d2910 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -373,18 +373,18 @@ export default { // 节点一时候的提交 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - if (!personnelObj) { - this.switchValue = 'user' - return - } // 流程信息的校验 this.processInfoForm.validateFields((err, values) => { // 流程审批信息的校验 this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { const data = await this.$refs.baseInfoRef.getDataValidate() if (!err && !approvalErr && data) { + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } this.loading = true const param = {} // 需要传给后端的数据 param.common = { ...values, ...approvalValues } diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index e3f3b296..8fb33411 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -816,13 +816,6 @@ export default { // 节点一时候的提交，发起立项变更申请,有taskId就是驳回后的提交 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - // 校验是否填了所有能填的人员信息 - if (!personnelObj) { - this.switchValue = 'user' - return - } console.log(this.formInline) this.processInfoForm.validateFields((err, values) => { this.$refs.ruleForm.validate(valid => { @@ -834,7 +827,6 @@ export default { // 是立项 this.$refs.approvalBaseInfo.$refs.ruleForm.validate(approvalBaseValid => { if (valid && approvalBaseValid && !err && !approvalErr) { - this.loading = true const param = Object.assign({}, this.formInline, this.$refs.approvalBaseInfo.formInline) // 企标体系处理成逗号分隔 param.enStandardSystem = param.enStandardSystem.map(item => item.value).join(',') @@ -848,7 +840,6 @@ export default { this.formInline.projectType === ProjectType.WORK_TERMINATE.value) { // 是变更-完成时间 或者 变更-工作终止变更 if (valid && !err && !approvalErr && this.$refs.changeBaseInfo && this.$refs.changeBaseInfo.dataSource.length > 0) { - this.loading = true arr = this.$refs.changeBaseInfo.dataSource.map(item => { return { ...item, ...this.formInline } }) haveErr = false } else if (valid && !err && !approvalErr && this.$refs.changeBaseInfo) { @@ -863,7 +854,6 @@ export default { // 是变更-责任部门变更 this.$refs.changeBaseInfo.$refs.ruleForm.validate(changeBaseValid => { if (valid && changeBaseValid && !err && !approvalErr) { - this.loading = true const param = Object.assign({}, this.formInline, this.$refs.changeBaseInfo.formInline) arr.push(param) haveErr = false @@ -875,14 +865,12 @@ export default { // 是变更-合并 this.$refs.changeBaseInfo.$refs.ruleForm.validate(changeBaseValid => { if (valid && changeBaseValid && !err && !approvalErr) { - this.loading = true const changeBaseInfo = this.$refs.changeBaseInfo.formInline if (changeBaseInfo.projectTypeOne !== changeBaseInfo.projectTypeTwo) { // 合并时候的两个计划需要限定修订+修订，或者制定+制定 this.$message.warning(this.$t('workCenter.enterpriseInitChangePlan.pleaseSelectTwoSameProjectTypePlan')) return } - this.loading = true const param = Object.assign({}, this.formInline, this.$refs.changeBaseInfo.formInline) // 企标体系处理成逗号分隔 param.enStandardSystem = param.enStandardSystem.map(item => item.value).join(',') @@ -897,6 +885,14 @@ export default { this.switchValue = 'base' return } + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + // 校验是否填了所有能填的人员信息 + if (!personnelObj) { + this.switchValue = 'user' + return + } + this.loading = true const param = {} // 需要传给后端的数据 param.common = { ...values, ...approvalValues } // 流程信息和流程审批信息 param.dataList = arr diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index ab2073e4..d104dcae 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -418,18 +418,18 @@ export default { // 节点一时候的提交 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - if (!personnelObj) { - this.switchValue = 'user' - return - } // 流程信息的校验 this.processInfoForm.validateFields((err, values) => { // 流程审批信息的校验 this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { const data = await this.$refs.baseInfoRef.getDataValidate() if (!err && !approvalErr && data) { + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } this.loading = true const paramObj = {} // 需要传给后端的数据 paramObj.common = { ...values, ...approvalValues } diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index bb563df6..6e7c8530 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -520,16 +520,16 @@ export default { // 节点一时候的提交，发起变更 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - if (!personnelObj) { - this.switchValue = 'user' - return - } this.processInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { const data = await this.$refs.baseInfoRef.getDataValidate() if (!err && !approvalErr && data) { + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } this.loading = true const param = {} // 需要传给后端的数据 param.common = { ...values, ...approvalValues } diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue index 6a91fe32..6a33c529 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue @@ -363,18 +363,18 @@ export default { // 节点一时候的提交 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - if (!personnelObj) { - this.switchValue = 'user' - return - } // 流程信息的校验 this.processInfoForm.validateFields((err, values) => { // 流程审批信息的校验 this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { const data = await this.$refs.baseInfoRef.getDataValidate() if (!err && !approvalErr && data) { + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } this.loading = true const paramObj = {} // 需要传给后端的数据 paramObj.common = { ...values, ...approvalValues } diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index 00c7a7c9..7e24f61f 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -361,18 +361,18 @@ export default { // 节点一时候的提交 handleStart () { if (this.loading) return - // 人员信息的数据, 处理成对象 - const personnelObj = this.$refs.personnelInfo.getDataObjVerify() - if (!personnelObj) { - this.switchValue = 'user' - return - } // 流程信息的校验 this.processInfoForm.validateFields((err, values) => { // 流程审批信息的校验 this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { const data = await this.$refs.baseInfoRef.getDataValidate() if (!err && !approvalErr && data) { + // 人员信息的数据, 处理成对象 + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } this.loading = true const paramObj = {} // 需要传给后端的数据 paramObj.common = { ...values, ...approvalValues }