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')