From a9118dc7b70a094178c47e6f4a499634f5bb7853 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 30 Dec 2022 11:59:24 +0800
Subject: [PATCH] =?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 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('evaluationResults')}}
         </div>
-        <div class="doc-detail-right">
+        <div class="doc-detail-right" v-if='!this.flag'>
           <div @click="endProcessClick"
                v-if="(formInline.createBy == this.userInfoQuery.username || administrators) && formInline.gatherResult == 'Underway'"
                class="operator-text-text" :title="$t('endProcess')">
@@ -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 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
         </div>
-        <div class="doc-detail-right">
+        <div class="doc-detail-right" v-if='!this.flag'>
           <div @click="CurrentStandard" class="operator-text-text" :title="$t('initiateSupplementaryProcess')">
             <a-icon type="profile"/>
             {{$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