From 60084175acec1555237fe70b882a724f7ede6887 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 19 Apr 2022 14:33:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=8F=8A=E4=BF=AE=E6=94=B9=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/virtualListDetails.vue | 154 ++++++++++++++++-- .../components/listOfRegulations.vue | 64 ++++++-- 4 files changed, 193 insertions(+), 30 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 65a40432d..78cd46eac 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -674,4 +674,6 @@ module.exports = { submitted:'Data has been submitted and cannot be submitted again', basicInformationOfParameters:'Basic information of parameters', regulatoryCertificationTaskPlan:'Regulatory / certification task plan', + bringInRelevantPersonnel:'Bring in relevant personnel', + confirmBringInRelevantPersonnel:'confirm Bring in relevant personnel' } \ 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 923a0fed4..147e766b6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -678,4 +678,7 @@ module.exports = { submitted:'条数据已提交不能重复提交', basicInformationOfParameters:'参数基本信息', regulatoryCertificationTaskPlan:'法规/认证任务计划', + bringInRelevantPersonnel:'带入相关人员', + confirmBringInRelevantPersonnel:'确认带入相关人员？', + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index a49787aee..79f08a9b0 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -133,6 +133,39 @@ {{$t('edit')}} {{$t('deleteLib')}} + + {{text && text.length > 20 ? text.slice(0,19)+'...':text}} + + + {{record.designDeliverableType_dictText}}
+ + {{record.designDeliverableTemplateName}} + + {{$t('viewFile')}} + -- + + + {{record.prehomoDeliverableType_dictText}}
+ + {{record.prehomoDeliverableTemplateName}} + + {{$t('viewFile')}} + -- + + + {{record.verifyDeliverableType_dictText}}
+ + {{record.verifyDeliverableTemplateName}} + + {{$t('viewFile')}} + -- + @@ -142,6 +175,32 @@ + + + + + {{$t('See')}} + + + {{$t('download')}} + + + + @@ -152,6 +211,7 @@ import UpdateLog from '@/components/UpdateLog/index' import batSetting from './batSetting' import { getAction, postAction, downloadFile } from '@/api/manage' + import { Base64 } from 'js-base64' export default { name: 'virtualListDetails', @@ -166,6 +226,23 @@ return { title: '维护虚拟清单', queryParam: {}, + visibleFile:false, + dataSourceFile:[], + columnsFile: [ + { + title: this.$t('deliverableTemplate'), + dataIndex: 'fileName', + align: 'center', + width: 260, + ellipsis: true + }, + { + title: this.$t('operation'), + align: 'center', + width: 130, + scopedSlots: { customRender: 'fileOperation' } + } + ], url: { addModelList: '/document/bussDocumentLibraryEO/queryPageInfoDummy', list: '/dummy/dummyInventoryInfoEO/list', @@ -187,24 +264,24 @@ align: 'center', dataIndex: 'serialNumber', width: 180, - ellipsis: true, - fixed: 'left' + fixed: 'left', + scopedSlots: { customRender: 'titleName' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', - width: 100, - ellipsis: true, - fixed: 'left' + width: 180, + fixed: 'left', + scopedSlots: { customRender: 'titleName' } }, { title: this.$t('subtitle'), align: 'center', dataIndex: 'subtitle', - width: 100, - ellipsis: true, - fixed: 'left' + width: 180, + fixed: 'left', + scopedSlots: { customRender: 'titleName' } }, { title: this.$t('scopeOfApplication'), @@ -294,7 +371,8 @@ title: this.$t('Deliverables'), dataIndex: 'designDeliverableTemplateName', ellipsis: true, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'designDeliverableTemplateName' } }, { title: this.$t('Sponsor'), @@ -317,7 +395,8 @@ title: this.$t('Deliverables'), dataIndex: 'prehomoDeliverableTemplateName', ellipsis: true, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'prehomoDeliverableTemplateName' } }, { title: this.$t('Sponsor'), @@ -340,7 +419,8 @@ title: this.$t('Deliverables'), dataIndex: 'verifyDeliverableTemplateName', ellipsis: true, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'verifyDeliverableTemplateName' } }, { title: this.$t('Sponsor'), @@ -518,7 +598,57 @@ this.$router.push({ path: '/virtualList' }) - } + }, + 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)) + } else if (fileSuffix == '.docx') { + 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 { + downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) + } + }, + pdfPreviewClick(name, id) { + let fileName = name + 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=' + id)) + } else if (fileSuffix == '.docx') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) + window.open(url, '_blank') + } else { + downloadFile('/sys/common/downLoadFile', name, { id: id }) + } + }, + download(item) { + downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id }) + }, + clickButtonToUpload(item) { + this.loading = true + this.visibleFile = true + getAction('sys/common/getFileInfos', { id: item }).then((res) => { + if (res.success) { + this.dataSourceFile = res.result + this.loading = false + } else { + this.dataSourceFile = [] + this.loading = false + } + }) + }, } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index c6c9d9d4d..791bd289f 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -87,14 +87,22 @@ {{$t('BatchDelete')}} +
+ + {{$t('batSetting')}} +
+
+ + {{$t('bringInRelevantPersonnel')}} +
- + {{$t('submit')}}
- + {{$t('overrule')}}
@@ -114,12 +122,15 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - - {{$t('edit')}} - {{$t('deleteLib')}} - + + {{$t('edit')}} + {{$t('deleteLib')}} + + + {{text && text.length > 20 ? text.slice(0,19)+'...':text}} + - {{record.designDeliverableType_dictText}}
+ {{record.designDeliverableType_dictText}}
{{record.designDeliverableTemplateName}} @@ -129,7 +140,7 @@ -- - {{record.prehomoDeliverableType_dictText}}
+ {{record.prehomoDeliverableType_dictText}}
 {{record.prehomoDeliverableTemplateName}} @@ -139,7 +150,7 @@ -- - {{record.verifyDeliverableType_dictText}}
+ {{record.verifyDeliverableType_dictText}}
 {{record.verifyDeliverableTemplateName}} @@ -244,24 +255,24 @@ align: 'center', dataIndex: 'serialNumber', width: 180, - ellipsis: true, - fixed: 'left' + fixed: 'left', + scopedSlots: { customRender: 'titleName' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', - width: 100, - ellipsis: true, - fixed: 'left' + width: 180, + fixed: 'left', + scopedSlots: { customRender: 'titleName' } }, { title: this.$t('subtitle'), align: 'center', dataIndex: 'subtitle', - width: 100, - ellipsis: true, - fixed: 'left' + width: 180, + fixed: 'left', + scopedSlots: { customRender: 'titleName' } }, { title: this.$t('listConfirmationStatus'), @@ -472,7 +483,8 @@ editModel: '/project/projectLawsInventoryEO/edit', deleteBatch: '/project/projectLawsInventoryEO/deleteBatch', deleteOne: '/project/projectLawsInventoryEO/delete', - updateStatusBatch: '/project/projectLawsInventoryEO/updateStatusBatch' + updateStatusBatch: '/project/projectLawsInventoryEO/updateStatusBatch', + matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople' }, loading: false, dataSource: [] @@ -735,6 +747,22 @@ this.loading = false } }) + }, + bringInRelevantPersonnelClick() { + let _this = this + this.$confirm({ + content: _this.$t('confirmBringInRelevantPersonnel'), + onOk() { + getAction(_this.url.matchRelevantPeople, { projectLibraryId: _this.$route.query.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) } } }