From 38c81dfaae730f7f00d341aced144de28d164de5 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 15 Dec 2023 19:23:58 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E5=B9=B4=E5=BA=A6?=
=?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?=
=?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=89=B9=E9=87=8F=E9=A9=B3=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/workCenter.js | 3 ++
.../RevisionPlanStandardizationInitFlow.vue | 36 +++++++++++++++++--
.../modules/ContactSelectApproverBaseInfo.vue | 5 +--
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index 0545f3d3..c3d7f907 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -61,6 +61,8 @@ const standardizationInitReject = (params) => postAction('/process/es/annualInit
const standardizationInitGetDataById = (taskId, params) => getAction(`/process/es/annualInit/handle/${taskId}`, params)
// 草稿的办理回显数据
const standardizationInitGetDataDraft = (params) => getAction('', params)
+// 批量驳回
+const standardizationInitBatchReject = (params) => postAction('/process/es/annualInit/batchReject', params)
// 企标制修订流程
// 保存
@@ -404,6 +406,7 @@ export {
standardizationInitReject,
standardizationInitGetDataById,
standardizationInitGetDataDraft,
+ standardizationInitBatchReject,
enStandardEditSave,
enStandardEditApproval,
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
index f5501bb4..df07e3e6 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
@@ -57,7 +57,7 @@
-
+
@@ -145,7 +145,8 @@ import {
standardizationInitAgree,
standardizationInitReject,
standardizationInitGetDataById,
- standardizationInitGetDataDraft
+ standardizationInitGetDataDraft,
+ standardizationInitBatchReject
} from '@/api/workCenter'
import pick from 'lodash.pick'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
@@ -526,6 +527,37 @@ export default {
}
})
})
+ },
+ // 批量驳回
+ handleBatchReject (ids) {
+ if (this.loading) return
+ this.validatorRules.commitText.rules[0].required = true
+ if (!this.approvalInfoForm.getFieldValue('commitText')) {
+ this.$message.warning(this.$t('pleaseEnterRemarks'))
+ return
+ }
+ this.$nextTick(() => {
+ this.approvalInfoForm.validateFields((err, values) => {
+ if (!err) {
+ this.loading = true
+ const param = {}
+ param.common = Object.assign({}, values)
+ param.common.taskId = this.$route.query.taskId
+ param.batchRejectIds = ids
+ console.log(param, this.$route.query.taskId)
+ standardizationInitBatchReject(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ }
+ })
+ })
}
}
}
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
index 171c176d..ed19db1c 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
@@ -17,7 +17,7 @@
:can-drag="true"
:scroll="{x: '100%'}"
ref="table"
- :rowKey="(record, index) => {return index}"
+ :rowKey="(record, index) => {return record.id || index}"
:columns="columns"
:dataSource="dataSource"
:pagination="false"
@@ -273,9 +273,10 @@ export default {
batchReject () {
if (this.selectedRowKeys.length <= 0) {
// 请选择至少一条记录
- this.$message.warning(this.$t('atLeastSelectARecord'))
+ this.$message.warning(this.$t('depart.atLeastSelectARecord'))
return
}
+ this.$emit('batchReject', this.selectedRowKeys.join(','))
console.log(this.selectedRowKeys)
},
// 批量设置审批人