From 206eb155b3ea12b08f694a050fdf3e49eec47efd Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 7 Dec 2023 11:01:47 +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=E7=82=B9=E5=90=8C=E6=84=8F=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=B2=A1=E5=A1=AB=E5=A4=87=E6=B3=A8=E7=9A=84=E8=AF=9D?= =?UTF-8?q?=E5=B8=A6=E5=85=A5=E2=80=98=E5=90=8C=E6=84=8F=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RevisionPlanActivelyReportFlow.vue | 3 +++ .../RevisionPlanStandardizationInitFlow.vue | 3 +++ .../enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue | 3 +++ .../enterpriseStandardChange/EnterpriseStandardChangeFlow.vue | 3 +++ .../enterpriseStandardChange/modules/ApproveBaseInfo.vue | 2 +- .../enterpriseStandardInitChange/PlanApprovalChangeFlow.vue | 3 +++ .../EnterpriseStandardRecheckFlow.vue | 3 +++ .../EnterpriseStandardRevisionFlow.vue | 3 +++ .../EnterpriseStandardSealSaveFlow.vue | 3 +++ .../EnterpriseStandardStartUseFlow.vue | 3 +++ 10 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue index ad998210..c18ca831 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -529,6 +529,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } this.approvalInfoForm.validateFields((err, values) => { if (!err) { this.loading = true diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue index f606b083..0fad43f2 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue @@ -431,6 +431,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } this.approvalInfoForm.validateFields((err, values) => { const data = this.$refs.baseInfoFormRef.getDataValidate() if (!err && data) { diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue index e693c6c8..41ae40d4 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue @@ -401,6 +401,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } this.approvalInfoForm.validateFields((err, values) => { if (!err) { this.loading = true diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index bf078745..19ad52bb 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -414,6 +414,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } this.approvalInfoForm.validateFields((err, values) => { if (!err) { this.loading = true diff --git a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue index 3ef65ab8..922a53ec 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue @@ -7,7 +7,7 @@ :can-drag="true" :scroll="{x: '100%'}" ref="table" - :rowKey="(index) => {return index}" + :rowKey="(record, index) => {return index}" :columns="columns" :dataSource="dataSource" :pagination="false" diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 05daa21a..584f25c6 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -914,6 +914,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } const param = {} // 需要传给后端的数据 this.approvalInfoForm.validateFields((err, values) => { if (this.formInline.projectType === this.ProjectType.RESPONSIBLE_DEPT_CHANGE.value && this.currentNode === 6) { diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index fe5de294..f8a9d37a 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -472,6 +472,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } this.approvalInfoForm.validateFields((err, values) => { if (!err) { this.loading = true diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index adf9505e..cc268f1f 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -535,6 +535,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } this.approvalInfoForm.validateFields((err, values) => { if (!err) { this.loading = true diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue index 44503c6f..603aeb26 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue @@ -401,6 +401,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } this.approvalInfoForm.validateFields((err, values) => { if (!err) { this.loading = true diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index 6efd0300..a833534b 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -401,6 +401,9 @@ export default { handleAgree () { if (this.loading) return this.validatorRules.commitText.rules[0].required = false + if (!this.approvalInfoForm.getFieldValue('commitText')) { + this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) + } this.approvalInfoForm.validateFields((err, values) => { if (!err) { this.loading = true