From 0c9d32ca1f927ed5368d2ab7b725cc0f68dc85ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 27 Mar 2023 10:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95--=E8=BD=AC?=
=?UTF-8?q?=E5=8A=9E;=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E9=80=80?=
=?UTF-8?q?=E5=9B=9E=E5=8E=9F=E5=9B=A0=E5=BC=B9=E6=A1=86=20=E6=B3=95?=
=?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-studio=E7=94=9F=E6=88=90=E5=90=88?=
=?UTF-8?q?=E8=A7=84=E6=8A=A5=E5=91=8A=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 3 ++-
jero-web/src/common/lang/zh-cn.js | 5 +++--
jero-web/src/components/SelectedBy/index.vue | 14 +++++++++++++-
.../components/certificationList/index.vue | 3 ++-
.../components/listOfRegulations.vue | 2 +-
.../components/reviewedByThePersonInCharge.vue | 3 ++-
6 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 59bd1a70f..ceb06b6ac 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1713,5 +1713,6 @@ module.exports = {
onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted',
implementationDateTwo:'Implementation Date',
reasonForReturn:'Reason For Return',
- pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process'
+ pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process',
+ complianceReporting:'Compliance Reporting',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index db8f12688..9126f3501 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1812,6 +1812,7 @@ module.exports = {
implementationrecords:'故障处置措施和应急响应实施记录',
onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据',
implementationDateTwo:'实施日期',
- reasonForReturn:'Reason For Return',
- pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程'
+ reasonForReturn:'退回原因',
+ pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程',
+ complianceReporting:'合规报告',
}
\ No newline at end of file
diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue
index 74ad7cb93..35711e606 100644
--- a/jero-web/src/components/SelectedBy/index.vue
+++ b/jero-web/src/components/SelectedBy/index.vue
@@ -47,6 +47,10 @@
title: {
type: String,
default: ''
+ },
+ isSingleChoice: {
+ type: Boolean,
+ default: false
}
},
data() {
@@ -98,6 +102,12 @@
this.visibleTree = false
},
handleSubmit() {
+ if (this.isSingleChoice) {
+ if (this.userIds.length > 1) {
+ this.$message.warning(this.$t('onlyOnePersonCanBeSelected'))
+ return
+ }
+ }
if (this.userIds && this.userIds.length > 0) {
this.submitLoading = true
this.$emit('SelectedByForm', this.userIds.join(','))
@@ -131,11 +141,13 @@
this.confirmLoading = true
postAction('sys/user/queryDepartUserTreeList', {
departId: this.departId,
- json: gData
+ json: gData,
+ flag:'1'
}).then((res) => {
this.confirmLoading = false
if (res.success) {
this.gData = res.result
+ this.gData = [...this.gData]
this.defaultExpandedKeys = [this.departId]
this.visibleTree = true
} else {
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index daaef057c..463a8fa54 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -399,7 +399,8 @@
-
+
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 4a68009ff..2080ff229 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1357,7 +1357,7 @@
this.$message.warning(this.$t('OnlyOneSelected'))
} else {
let serialNumber = this.selectedRowKeysList[0].serialNumber
- downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('compliancereport') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') })
+ downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') })
}
},
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 230759ce6..67f882593 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -88,7 +88,8 @@
-
+