From 34a21edf4f6dca527a4d662feeaf5c2f9a5b06d2 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 7 Apr 2023 11:39:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/tableCollection/index1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index 8f124f2ad..681a4a461 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -575,7 +575,7 @@
         }
         let paramscm = {
           paramsManifestId: paramsManifestid,
-          moduleFlag:'上报库管理'
+          moduleFlag:'上报库详情'
         }
         var jsonHead = []
         getAction(url, paramscm).then((res) => {

From 89d65ddfe25b2f396b65601f2f5b93b04a541797 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 11:45:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=A0=A1=E6=A0=B8=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=8E=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=8A=9E=E7=90=86?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BF=9B=E6=9D=A5=EF=BC=8C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 4b95b3d6f..cc1edc48d 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1504,8 +1504,8 @@
         getAction(this.url.AndUserId, query).then((res) => {
           if (res.success) {
             // this.isDisplay = true
-            if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){
-              this.formInlineRoleSwitching.roleSwitchingCode = '1'
+            if (this.$route.query.roleOpen){
+              this.formInlineRoleSwitching.roleSwitchingCode = this.$route.query.roleOpen
             }else{
               this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
             }
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 33e9aeef1..b7678eb70 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -267,7 +267,7 @@
               targetMarket: row.targetMarket,
               studioEngineer: row.studioEngineer,
               type: '102',
-              roleOpen:'fggcs',
+              roleOpen:'1',
             }
           })
           window.open(newUrl.href, '_blank')