From f34787436d002bd971f21916a50b3d8605c1c86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Thu, 25 Jan 2024 16:53:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=2081324=EF=BC=9B=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=8A=A0=E4=B8=A4=E4=B8=AA=E6=89=B9=E9=87=8F=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/workCenter/zh.js | 3 + .../components/DepartLeaderIssueTable.vue | 2 + .../components/DesignEngineerWriteProject.vue | 1 + .../components/InitialAssignTable.vue | 3 + .../components/InitialBasicServiceInfo.vue | 2 + .../components/ModuleOwnerIssueTable.vue | 2 + .../components/RegulatoryEngineerApproval.vue | 67 ++++++++++++++++++- 7 files changed, 77 insertions(+), 3 deletions(-) diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 445fa60a..64daa6f6 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -431,5 +431,8 @@ module.exports = { pleaseSelectResponsibleUnitContactPerson: '请选择责任单位联络人', atLeastOneData:'至少需要保留一条数据', pleaseSelectDesignEngineer: '请选择设计工程师', + batchSelectDesignEngineer: '批量选择设计工程师', + batchSelectCCPersonnel:'批量选择抄送人员', + noProjectData: '不立项数据不能选择设计工程师' } } diff --git a/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue b/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue index b3c3915c..4b83546a 100644 --- a/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue +++ b/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue @@ -169,6 +169,7 @@ export default { } return item }) + this.$message.success(this.$t('operationSuccessful')) }, /** * 不涉及 @@ -185,6 +186,7 @@ export default { record.moduleOwner_dictText = null } this.$set(this.dataSource, index, record) + this.$message.success(this.$t('operationSuccessful')) }, onSelectChange (selectedRowKeys) { this.selectedRowKeys = selectedRowKeys diff --git a/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue b/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue index 21d021df..a9b135a4 100644 --- a/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue +++ b/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue @@ -145,6 +145,7 @@ export default { modalFormOk (record) { const index = this.dataSource.findIndex(tt => tt.id === record.id) this.$set(this.dataSource, index, record) + this.$message.success(this.$t('operationSuccessful')) }, handleTableChange (pagination) { this.ipagination = pagination diff --git a/src/views/workCenter/standardComplianceProcess/components/InitialAssignTable.vue b/src/views/workCenter/standardComplianceProcess/components/InitialAssignTable.vue index b164db23..a402a74d 100644 --- a/src/views/workCenter/standardComplianceProcess/components/InitialAssignTable.vue +++ b/src/views/workCenter/standardComplianceProcess/components/InitialAssignTable.vue @@ -225,6 +225,7 @@ export default { } return item }) + this.$message.success(this.$t('operationSuccessful')) }, handleDelete (rowKey) { this.$confirm({ @@ -235,6 +236,7 @@ export default { this.dataSource[index] = null this.dataSource = this.dataSource.filter(tt => !!tt) this.selectedRowKeys = [] + this.$message.success(this.$t('deleteSucceeded')) } }) }, @@ -261,6 +263,7 @@ export default { }).filter(tt => !!tt) this.dataSource = JSON.parse(JSON.stringify(data)) this.selectedRowKeys = [] + this.$message.success(this.$t('deleteSucceeded')) } }) }, diff --git a/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue b/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue index 3018913f..9f20a53a 100644 --- a/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue +++ b/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue @@ -139,6 +139,7 @@ export default { onOk: () => { this.dataSource = [] this.$emit('standard:change', this.dataSource[0]) + this.$message.success(this.$t('deleteSucceeded')) } }) }, @@ -156,6 +157,7 @@ export default { this.$set(this.dataSource, 0, data) } this.$emit('standard:change', this.dataSource[0]) + this.$message.success(this.$t('operationSuccessful')) }, handleSourceChange (value, record) { const splitInfoId = record.decompositionOrderSourceVOList.find(tt => tt.value === value).sarFileSplitInfoId diff --git a/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue b/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue index 6324b5cf..b0e82997 100644 --- a/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue +++ b/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue @@ -168,6 +168,7 @@ export default { } return item }) + this.$message.success(this.$t('operationSuccessful')) }, /** * 不涉及 @@ -183,6 +184,7 @@ export default { record.designEngineer_dictText = undefined } this.$set(this.dataSource, index, record) + this.$message.success(this.$t('operationSuccessful')) }, onSelectChange (selectedRowKeys) { this.selectedRowKeys = selectedRowKeys diff --git a/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue b/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue index 116584d9..3fd8b4f9 100644 --- a/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue +++ b/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue @@ -3,7 +3,24 @@
{{ $t('workCenter.standardCompliance.projectFiling') }}
- +
+ + + {{ $t('workCenter.standardCompliance.batchSelectDesignEngineer') }} + + + + {{ $t('workCenter.standardCompliance.batchSelectCCPersonnel') }} + +
+ + @@ -82,10 +101,11 @@ import DepartLeaderDetailModal from '../modules/DepartLeaderDetailModal' import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail' import { YesOrNoEnum } from '../../../../enums/commonEnums' import { queryStandardComplianceEvaluateDetail } from '../../../../api/workCenter' +import UserSelectModal from '../../../../components/selection/UserSelectModal' export default { name: 'RegulatoryEngineerApproval', - components: { SplitClauseDetail, DepartLeaderDetailModal, UserSelection, JTable }, + components: { UserSelectModal, SplitClauseDetail, DepartLeaderDetailModal, UserSelection, JTable }, props: { // 回显的数据 displayDataSource: { @@ -214,7 +234,10 @@ export default { total: 0 }, termNumber: null, - termName: null + termName: null, + selectedRowKeys: [], + batchSelectField: null, + batchSelectType: 'radio' } }, watch: { @@ -281,6 +304,44 @@ export default { return false } return this.dataSource + }, + onSelectChange (selectedRowKeys) { + this.selectedRowKeys = selectedRowKeys + }, + /** + * 批量选人 + * @param fieldName + */ + handleSelectPerson (fieldName) { + // 请选择要分发的数据 + if (!this.selectedRowKeys || this.selectedRowKeys.length === 0) { + this.$message.warning(this.$t('pleaseSelectDistributeData')) + return + } + if (fieldName === 'designEngineer') { + console.log(this.selectedRowKeys) + console.log(this.dataSource.some(tt => this.selectedRowKeys.includes(tt.id))) + if (this.dataSource.some(tt => this.selectedRowKeys.includes(tt.id) && tt.projectApprovalFlag !== this.yesValue)) { + this.$message.warning(this.$t('workCenter.standardCompliance.noProjectData')) + return + } + this.batchSelectType = 'radio' + } else { + this.batchSelectType = 'checkbox' + } + this.batchSelectField = fieldName + this.$refs.userSelectModal.open() + }, + handleBatchSelected (list) { + const data = JSON.parse(JSON.stringify(this.dataSource)) + this.dataSource = data.map(item => { + if (this.selectedRowKeys.includes(item.id)) { + item[this.batchSelectField] = list.map(tt => tt.id).join(',') + item[this.batchSelectField + '_dictText'] = list.map(tt => tt.realname + '(' + tt.username + ')').join(',') + } + return item + }) + this.$message.success(this.$t('operationSuccessful')) } } }