From faf55988a82f7ca8e0e5261faf8515067faa86bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Wed, 13 Dec 2023 10:24:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workCenter.js | 7 +++- src/enums/commonEnums.js | 2 +- .../ProjectComplianceEvaluationProcess.vue | 19 ++++++++- .../components/StandardList.vue | 39 ++++++++++++++++--- .../modules/SelectStandardListDrawer.vue | 12 +++--- 5 files changed, 66 insertions(+), 13 deletions(-) diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 16de1f66..db3c8607 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -358,6 +358,9 @@ const savePostMeetingManage = (params) => postAction('/process/meetingManageFlow // 权限申请流程业务数据 const getPostMeetingManageDataById = (params) => getAction('/meetingmanage/processMeetingManage/queryByProjectId', params) +/* 项目合规评估流程 */ +const queryProjectRegulationList = (params) => getAction('/projectLibrary/lawsAssess/page', params) + export { getProcessNodeList, @@ -537,5 +540,7 @@ export { approvalPostMeetingManage, transferPostMeetingManage, savePostMeetingManage, - getPostMeetingManageDataById + getPostMeetingManageDataById, + + queryProjectRegulationList } diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 5b75809b..8c76eb3f 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -189,7 +189,7 @@ export const ProcessKey = { // 征求意见流程 CONSULTATION: { text: 'fb-standard-consultation', value: 'fb-standard-consultation' }, // 项目合规评估流程 - PROJECT_COMPLIANCE_EVALUATION: { text: '', value: '' }, + PROJECT_COMPLIANCE_EVALUATION: { text: 'project-assessment', value: 'project-assessment' }, // 未符合项跟踪流程 NO_MATCH_TRACKING: { text: '', value: '' }, // 法规合规评估流程 diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue index f79629a5..d5bc4018 100644 --- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue +++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue @@ -92,7 +92,7 @@ - + @@ -387,6 +387,7 @@ export default { } ], projectDataSource: [], // 选中的项目 + projectId: null, // 选中项目的id standardDataSource: [], // 选中的标准 basicColumns: [ // 序号 @@ -748,6 +749,8 @@ export default { this.processInfoForm.validateFields(this.processInfoShowField, (errors, values) => { if (errors) { flag = false + } else { + this.processInfo = Object.assign(this.processInfo, values) } }) } @@ -757,6 +760,8 @@ export default { if (!this.projectDataSource || this.projectDataSource.length === 0) { this.$message.warning(this.$t('addAtLeastOneRowOfData')) flag = false + } else { + this.projectId = this.projectDataSource[0].id } } // 第三步选择标准 @@ -891,7 +896,19 @@ export default { record.evaluationFeedback = value this.$set(this.dataSource, index, record) }, + dealFormData (isSave) { + let formData = {}, processProjectAssess = {} + // 流程信息 + formData.basicProcessInfoDTO = { ...this.processInfo } + // 业务基本信息(项目信息) + if (this.projectDataSource && this.projectDataSource.length > 0) { + processProjectAssess.projectId = this.projectDataSource[0].id + } + return formData + }, handleSave () { + const formData = this.dealFormData(true) + console.log('保存表单数据===', formData) }, handleSubmit () { }, diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/components/StandardList.vue b/src/views/workCenter/projectComplianceEvaluationProcess/components/StandardList.vue index 0f611b1e..a9531d81 100644 --- a/src/views/workCenter/projectComplianceEvaluationProcess/components/StandardList.vue +++ b/src/views/workCenter/projectComplianceEvaluationProcess/components/StandardList.vue @@ -15,9 +15,10 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="false" + :pagination="ipagination" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" - v-bind="$attrs"> + v-bind="$attrs" + @change="handleTableChange">