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