From a2da942929af8e01f6e409496c33103b8a9f9de8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 28 Jun 2023 11:47:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=B9=E6=A1=86=202.=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=A4=9A=E9=80=89=203.=E4=BB=A3=E5=8A=9E-=E5=8A=9E=E7=90=86-?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../ParameterItemCollectionList.vue | 121 +++++++++++++++--- .../components/certificationList/index.vue | 1 + .../components/listOfRegulations.vue | 1 + .../components/circulationHistory.vue | 30 +++++ 6 files changed, 142 insertions(+), 19 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 995d60ea3..5a15385a1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1528,6 +1528,7 @@ module.exports = { Taskresponsibilityrecognition:'Responsibility Confirm', uploadattachment:'Upload', Processhistory:'Process history', + historyData:'1. Regulatory Engineer, 2. Responsible person, 3. Responsible person, 4. Regulatory Engineer', resultofhandling:'Result of handling', cause:'cause', networksecurityrequirements:'Network security requirements', @@ -1897,4 +1898,7 @@ module.exports = { pleaseViewOnPc:'Please view on PC', taskHandling:'Task Handling', pleaseEnterUserAccountSearchFor:'Please enter a user account to search for', + exportOption:'Export Option', + includeTitle:'Include title', + Notitleincluded:'No title included', } \ 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 74f6a5802..7913edf5c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3538,6 +3538,7 @@ module.exports = { Taskresponsibilityrecognition: '任务责任确认', uploadattachment: '上传附件', Processhistory: '流程历史', + historyData: '1.法规工程师，2.责任人，3.责任人，4.法规工程师', resultofhandling: '处理结果', Listoftreatableregulations: '可处理法规列表', Listofuntractableregulations: '不可处理法规列表', @@ -3860,4 +3861,7 @@ module.exports = { copyLink:'复制链接', successfulReplication:'复制成功', pleaseEnterUserAccountSearchFor:'请输入用户账号搜索', + exportOption:'导出选项', + includeTitle:'包含标题', + Notitleincluded:'不包含标题', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 04429394c..7438dfd48 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -583,6 +583,46 @@ + + + + + +
+
+ * + + {{$t('exportOption')}} +
+ + + + {{$t('includeTitle')}} + + + {{$t('Notitleincluded')}} + + + +
+ + + + {{this.$t('pleaseWaitWhileRunning')}} @@ -877,6 +917,7 @@ selectedRowKeys: [], textLoading: false, formInline: {}, + dataExportformInline: {}, queryParamQuery: {}, url: { tableHeader: 'params/collectManifest/getHeader', @@ -919,6 +960,7 @@ areaVisiblereferenceparameter: false, // 引用参数弹框 areaVisibsynchronous: false, // 同步上报库弹框 visibleoperationFailed: false, // 数据失败的弹框 + dataExportFailed: false, // 数据失败的弹框 currentPersonRole: '', // 当前人角色 jurisdiction: '', wrapperCol: { @@ -930,6 +972,11 @@ sm: { span: 7 } }, rules: {}, + dataExportrules: { + exportOption:[ + { required: true, message: this.$t('PleaseSelect')+this.$t('exportOption'), trigger: 'change' } + ] + }, FreezeList: [], // 冻结字段 roleSwitchingList: [], JTextLoading: false, @@ -1329,24 +1376,56 @@ }, //导出 handleExport() { - this.$message.success(this.$t('Intheexport')) - let long = localStorage.getItem('language') - this.cut = '' - if (long && long === 'zh-cn') { - this.cut = 'cn' - } else if (long && long === 'en-us') { - this.cut = 'en' - } - let query = { - paramsManifestId: this.paramsManifest.id, - paramsTemplateId: this.$route.query.paramsTemplateId, - paramsTemplatePublishVersion: 1, - cut: this.cut, - userTypes: this.currentPersonRole, - exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')' - } - let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' - downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear) + this.dataExportFailed = true + // this.$message.success(this.$t('Intheexport')) + // let long = localStorage.getItem('language') + // this.cut = '' + // if (long && long === 'zh-cn') { + // this.cut = 'cn' + // } else if (long && long === 'en-us') { + // this.cut = 'en' + // } + // let query = { + // paramsManifestId: this.paramsManifest.id, + // paramsTemplateId: this.$route.query.paramsTemplateId, + // paramsTemplatePublishVersion: 1, + // cut: this.cut, + // userTypes: this.currentPersonRole, + // exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')' + // } + // let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' + // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear) + }, + // 导出确定 + handleExportSubmit(){ + this.$refs.dataExportruleForm.validate(valid => { + if(valid){ + this.$message.success(this.$t('Intheexport')) + let long = localStorage.getItem('language') + this.cut = '' + if (long && long === 'zh-cn') { + this.cut = 'cn' + } else if (long && long === 'en-us') { + this.cut = 'en' + } + let query = { + paramsManifestId: this.paramsManifest.id, + paramsTemplateId: this.$route.query.paramsTemplateId, + exportOption:this.dataExportformInline.exportOption, + paramsTemplatePublishVersion: 1, + cut: this.cut, + userTypes: this.currentPersonRole, + exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')' + } + let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' + downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear) + } + }) + }, + handleCancel() { + this.dataExportformInline = {} + this.$refs.dataExportruleForm.clearValidate() + this.dataExportFailed = false }, //填写人导出 handleExportDre() { @@ -2631,7 +2710,11 @@ height: 42px; line-height: 36px; } - + .itemModel { + width: 100%; + display: inline-block; + margin-top: 2px; + } .box-input .ant-select-selection { height: 38px !important; } diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 713cccc45..e144def4d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -30,6 +30,7 @@ diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 2978772ae..d90b4bf48 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -53,6 +53,7 @@ allowClear show-search style="width: calc(100% - 80px);" + mode="multiple" optionFilterProp="label" :getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="queryParam[selectModel]"> diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index c06a8c737..28f9181a9 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -22,6 +22,7 @@
{{item.name}}
+
{{item.userName}}
@@ -303,6 +304,23 @@ }) } } + this.regulatoryCertificationTaskPlanList.forEach(val => { + if (val.name == this.$t('initiatingProcess')) { + val.userName = this.$t('regulatoryEngineer') + } else if (val.name == this.$t('Taskresponsibilityrecognition')) { + val.userName = this.$t('personLiable') + } else if (val.name == this.$t('designComplianceReview')) { + val.userName = this.$t('personLiable') + } else if (val.name == this.$t('verificationComplianceReview')) { + val.userName = this.$t('personLiable') + } else if (val.name == this.$t('designComplianceReviewAdmin')) { + val.userName = this.$t('regulatoryEngineer') + } else if (val.name == this.$t('verificationComplianceExamine')) { + val.userName = this.$t('regulatoryEngineer') + } else { + val.userName = '' + } + }) this.regulatoryCertificationTaskPlanList = [...this.regulatoryCertificationTaskPlanList] } this.loading = false @@ -403,6 +421,18 @@ white-space: nowrap; overflow: hidden; } + .process-content-right-top-user{ + //background: #E6FAFA; + //padding: 5px; + color: #00B3BE; + font-size: 14px; + font-weight: lighter; + margin-top: 5px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + } } From 5158f4d6e2895b3f2553d051c972eda71054f1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 28 Jun 2023 18:03:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E8=A7=92=E8=89=B2=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/circulationHistory.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 28f9181a9..2a58e6510 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -314,9 +314,9 @@ } else if (val.name == this.$t('verificationComplianceReview')) { val.userName = this.$t('personLiable') } else if (val.name == this.$t('designComplianceReviewAdmin')) { - val.userName = this.$t('regulatoryEngineer') + val.userName = this.$t('Sponsor') } else if (val.name == this.$t('verificationComplianceExamine')) { - val.userName = this.$t('regulatoryEngineer') + val.userName = this.$t('Sponsor') } else { val.userName = '' } @@ -424,8 +424,8 @@ .process-content-right-top-user{ //background: #E6FAFA; //padding: 5px; - color: #00B3BE; - font-size: 14px; + color: #9c9fac; + font-size: 12px; font-weight: lighter; margin-top: 5px; text-overflow: ellipsis; From 99af6468d1e047a43da7609ef97185b72ef3412d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 28 Jun 2023 19:54:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8C=85=E5=90=AB=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ParamsCollectManifestEOMapper.java | 1 + .../mapper/xml/ParamsCollectManifestEOMapper.xml | 13 +++++++++++++ .../impl/ParamsCollectManifestEOServiceImpl.java | 10 +++++++--- .../cert/collect/vo/ParamsCollectManifestVO.java | 4 ++++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java index 64eb78905..dfa97007a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java @@ -23,6 +23,7 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper listInfoOfTodoCenter(@Param("manifestIdList") List manifestIdList); List> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO, @Param("ids") String ids); + List> listInfoForExportExportTitle(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO, @Param("ids") String ids); List listInfoOfTodoCenter(); // 查询控件类型为 标题的 参数项 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 01139f7ac..35f81bc2f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -94,6 +94,19 @@ + +