From d145647f6731f97ed00fd32e5418716a2d6a639c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 7 Apr 2023 09:35:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=A0=A1=E6=A0=B8=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BB=8E?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=8A=9E=E7=90=86=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E8=BF=9B=E6=9D=A5=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/listOfRegulations.vue      | 6 +++++-
 .../projectRegulationTasks/components/dealtWith.vue         | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 64086cda2..b0f1da992 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1494,7 +1494,11 @@
         getAction(this.url.AndUserId, query).then((res) => {
           if (res.success) {
             // this.isDisplay = true
-            this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
+            if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){
+              this.formInlineRoleSwitching.roleSwitchingCode = '1'
+            }else{
+              this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
+            }
             this.AndUserId = res.result.id
             if (this.formInlineRoleSwitching.roleSwitchingCode) {
               if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index ec2664592..33e9aeef1 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -266,7 +266,8 @@
               projectNameId: row.projectNameId,
               targetMarket: row.targetMarket,
               studioEngineer: row.studioEngineer,
-              type: '102'
+              type: '102',
+              roleOpen:'fggcs',
             }
           })
           window.open(newUrl.href, '_blank')
@@ -279,7 +280,7 @@
               projectNameId: row.projectNameId,
               targetMarket: row.targetMarket,
               studioEngineer: row.studioEngineer,
-              type: '106'
+              type: '106',
             }
           })
           window.open(newUrl.href, '_blank')