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..ce68da751 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -502,6 +502,39 @@
+
+
+
+ {{ $t('cancel') }}
+
+
+
+
+
+ {{ $t('See') }}
+
+
+ {{ $t('download') }}
+
+
+
+
{{ $t('dataLoading') }}
{{ $t('Submitting') }}
@@ -1357,7 +1390,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(',') })
}
},
@@ -2503,7 +2536,30 @@
},
viewFileClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
- }
+ },
+ pdfPreview(fileQuery) {
+ let fileName = fileQuery.fileName
+ let index1 = fileName.lastIndexOf('.')
+ let index2 = fileName.length
+ let fileSuffix = fileName.substring(index1, index2)
+ if (fileSuffix == '.pdf') {
+ window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
+ } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+ window.open(url, '_blank')
+ } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+ window.open(url, '_blank')
+ } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
+ window.open(url, '_blank')
+ } else {
+ downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+ }
+ },
+ download(item) {
+ downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
+ },
}
}
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 @@
-
+