From a9118dc7b70a094178c47e6f4a499634f5bb7853 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 30 Dec 2022 11:59:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?viewer=E8=A7=92=E8=89=B2=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E9=9C=80=E8=A6=81=E6=9C=89=E2=80=9C=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E8=A1=A5=E5=85=85=E6=B5=81=E7=A8=8B=E2=80=9D=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsList.vue | 9 ++++++++- .../components/evaluationResultsWhole.vue | 9 ++++++++- .../projectManagement/components/ProjectDetails.vue | 7 +++++++ .../views/projectManagement/projectLibrary/index.vue | 12 +++++++++++- jero-web/src/views/system/modules/UserModal.vue | 3 +-- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 85e38ad5a..8f1ae24e8 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -8,7 +8,7 @@ {{$route.query.serialNumber +' '+$t('evaluationResults')}} -
+
@@ -92,6 +92,7 @@ total: 0, pageSize: 10, pageNo: 1, + flag:'', dataSource: [], formInline: {}, administrators:false, @@ -161,6 +162,12 @@ } }) } + getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsOpinionGather',id : this.$route.query.id}).then((res) => { + if (res.success) { + this.flag = res + } else { + } + }) }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index a57c1df23..a84ab50ee 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -8,7 +8,7 @@ {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
-
+
{{$t('initiateSupplementaryProcess')}} @@ -96,6 +96,7 @@ return { queryParam: {}, dataSource: [], + flag:'', userInfoQuery: {}, administrators: false, url: { @@ -180,6 +181,12 @@ } }) } + getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsTechnologyEvaluation',id : this.$route.query.id}).then((res) => { + if (res.success) { + this.flag = res + } else { + } + }) }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index bed29b591..23aea89dd 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -189,6 +189,7 @@ data() { return { queryForm: {}, + cut:'', administrators:false, activeKey: this.$t('CurrentStatusOfTheProject'), url: { @@ -220,7 +221,13 @@ getForm() { getAction(this.url.queryById, { id: this.$route.query.id }).then((res) => { if (res.success) { + this.cut = res.cut this.queryForm = res.result[0] || {} + if(this.cut == 'en'){ + this.queryForm.brandText = this.queryForm.brandTextEn + }else{ + this.queryForm.brandText = this.queryForm.brandText + } } else { this.queryForm = {} } diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 444b1ee8b..30396a062 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -290,6 +290,7 @@ queryParam: {}, orderBy: '1', orderByField: '', + cut: '', administrators: false } }, @@ -442,8 +443,17 @@ this.getList() return } - this.dataSource = res.result.records || [] this.total = res.result.total + this.cut = res.cut + this.dataSource = res.result.records || [] + this.dataSource.forEach((item) => { + if(this.cut == 'en'){ + item.brandText = item.brandTextEn + }else{ + item.brandText = item.brandText + } + }) + this.loading = false } else { this.loading = false diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index fa72cc65b..2be2d4173 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -419,7 +419,6 @@ }) }, selectChange(value){ - console.log(value,"value",this.roleList) value.map((item,index) => { this.roleList.map((val,index) => { if(val.roleCode == 'Viewer' && item == val.id){ @@ -429,8 +428,8 @@ }) return } else if(val.roleCode == 'BrandAdministrator' && item == val.id) { - this.brands = [] this.$nextTick(() => { + this.brands = [] this.viewshowbrand = true }) return From 43aa09e23dd9fa06b1293e4bbf34d66377f05aa6 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 30 Dec 2022 13:44:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86=20?= =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E4=B8=8A=E7=A7=BB=E4=B8=8B?= =?UTF-8?q?=E7=A7=BB=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/documentManage/splitting/modules/SplitDetail.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 4eb207bd8..16bbe69d7 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -328,6 +328,8 @@ export default { uploadMenuId: '', selectedKeys: [], deleteNode: false, + moveDownFlag: false, + moveUpFlag: false, fullWidth: '', parameter: {}, widthBrown: '', @@ -495,6 +497,8 @@ export default { rightClick({ event, node }) { this.deleteNode = node._props.dataRef.pid ? true : false + this.moveDownFlag = node._props.dataRef.moveDownFlag == true ? true : false + this.moveUpFlag = node._props.dataRef.moveUpFlag == true ? true : false // console.log('eee',event,node) // this.NodeTreeItemVisible=true const x = From bb82387ea5b8146ae5478cbc9b71050a8b99d89e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 30 Dec 2022 14:01:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E5=AD=97=E6=AE=B5=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/UserAnnouncementList.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index 4f4da31a3..78582aaf1 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -145,13 +145,13 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' ellipsis: true, scopedSlots: { customRender: 'msgTitile' } }, - { - title: this.$t('Sponsor'), - align: 'left', - ellipsis: true, - dataIndex: 'initiator', - width: 200 - }, + // { + // title: this.$t('Sponsor'), + // align: 'left', + // ellipsis: true, + // dataIndex: 'initiator', + // width: 200 + // }, { title: this.$t('MessageType'), align: 'left', From d8f6176cbe7e348f821655378b00a05a6fe7a101 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 30 Dec 2022 14:02:10 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=93=81=E7=89=8C=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?= =?UTF-8?q?+=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0/?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86viewer?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectUserPermissionController.java | 12 +++ .../project/entity/ProjectLibraryBase.java | 2 + .../enums/ProcessControlButtonTypeEnum.java | 34 ++++++++ .../mapper/xml/ProjectLibraryBaseMapper.xml | 8 +- .../IProjectUserPermissionService.java | 7 ++ .../ProjectUserPermissionServiceImpl.java | 77 ++++++++++++++++++- .../components/evaluationResultsList.vue | 7 +- .../components/evaluationResultsWhole.vue | 7 +- 8 files changed, 142 insertions(+), 12 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProcessControlButtonTypeEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java index 3a76fd1e1..496b90f3f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java @@ -52,4 +52,16 @@ public class ProjectUserPermissionController extends JeroController { @TableField(exist = false) private String brandText; + @TableField(exist = false) + private String brandTextEn; @Override public int compareTo(ProjectLibraryBase o) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProcessControlButtonTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProcessControlButtonTypeEnum.java new file mode 100644 index 000000000..2f73bcb1d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProcessControlButtonTypeEnum.java @@ -0,0 +1,34 @@ +package com.jero.modules.project.enums; + +public enum ProcessControlButtonTypeEnum { + + LawsOpinionGather("法规意见收集","LawsOpinionGather"), + LawsTechnologyEvaluation("法规技术评估","LawsTechnologyEvaluation"); + + String label; + String value; + + ProcessControlButtonTypeEnum() { + } + + ProcessControlButtonTypeEnum(String label, String value) { + this.label = label; + this.value = value; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index f394e4d62..26e42dd5a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -52,7 +52,8 @@ plb.sort, plb.flag, plb.brand, - sdi.item_text brandText + sdi.item_text brandText, + sdi.en_name brandTextEn from project_library_base as plb left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id @@ -227,6 +228,11 @@ and plb.project_status like concat('%',#{projectLibraryBase.projectStatus},'%') + + + and plb.brand = #{projectLibraryBase.brand} + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java index 7bbcd028e..eb0ad17e7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java @@ -73,4 +73,11 @@ public interface IProjectUserPermissionService extends IService queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("laws_technology_evaluation_id", id); + List flowDetailEOS = lawsTechnologyEvaluationFlowDetailEOService.list(queryWrapper); + if (ObjectUtils.isEmpty(flowDetailEOS)) { + return false; + } + boolean eva = true; + if (ObjectUtils.isEmpty(flowDetailEOS.get(0).getEvaluatorId()) || (ObjectUtils.isNotEmpty(flowDetailEOS.get(0).getEvaluatorId()) && !flowDetailEOS.get(0).getEvaluatorId().contains(currentUser.getId()))) { + eva = false; + } + if (!lawsTechnologyEvaluationEO.getCreateBy().equals(currentUser.getUsername()) + && !eva + && viewer) { + hasProcessControlButton = false; + } + + } else { + hasProcessControlButton = false; + } + return hasProcessControlButton; + } + } diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 8f1ae24e8..c52321365 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -8,7 +8,7 @@ {{$route.query.serialNumber +' '+$t('evaluationResults')}}
-
+
@@ -92,7 +92,7 @@ total: 0, pageSize: 10, pageNo: 1, - flag:'', + flag:false, dataSource: [], formInline: {}, administrators:false, @@ -163,10 +163,7 @@ }) } getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsOpinionGather',id : this.$route.query.id}).then((res) => { - if (res.success) { this.flag = res - } else { - } }) }, methods: { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index a84ab50ee..7653a3873 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -8,7 +8,7 @@ {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
-
+
{{$t('initiateSupplementaryProcess')}} @@ -96,7 +96,7 @@ return { queryParam: {}, dataSource: [], - flag:'', + flag:false, userInfoQuery: {}, administrators: false, url: { @@ -182,10 +182,7 @@ }) } getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsTechnologyEvaluation',id : this.$route.query.id}).then((res) => { - if (res.success) { this.flag = res - } else { - } }) }, methods: { From bc278eee701e5111d324e91effd669556f9e52c7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 30 Dec 2022 14:02:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E5=88=97?= =?UTF-8?q?=E8=A1=A8--=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/report/controller/ParamsReportEOController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 7187296a0..f875ee776 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -198,7 +198,7 @@ public class ParamsReportEOController extends JeroController Date: Fri, 30 Dec 2022 14:07:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E7=9C=8B=E6=9D=BF=E4=B8=AD=EF=BC=8C=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/regulationsKanban/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 1de4b6044..2b09ddc41 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -298,10 +298,11 @@ export default { }, //虚拟清单名称事件 entryNameClick(item) { - this.$router.push({ - path: '/ParameterTemplateList', + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', query: item }) + window.open(newUrl.href, '_blank') }, searchQuery() { this.pageNo = 1