diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8d170f76b..1370464ef 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1424,4 +1424,6 @@ module.exports = { onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected', confirmResetProcess:'Confirm reset process?', confirmUrging:'Confirm urging ?', + statusthetasistobeconfirmed:'You can withdraw the list only when the status of the list is to be checked or the status of the task is to be confirmed', + confirmreturn:'Confirm return ?', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index a26417b59..9ad2e7ded 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1525,4 +1525,6 @@ module.exports = { onlyDataStatusResultReviewedCanBeSelected:'只能选择流程状态为结果待审查的数据', confirmResetProcess:'确认重置流程?', confirmUrging:'确认催办', + statusthetasistobeconfirmed:'只有清单待校核状态或任务确认状态为待确认时才可以进行撤回', + confirmreturn:'确认退回?', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index d42bea7ef..95d0f33d4 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -207,7 +207,9 @@ '13': 'Viewer', '14': '品牌管理员', '20': '接口人', - '21': '责任人' + '21': '责任人', + '30': '工程接口人', + '31': '责任人', }, roleSwitchListEn: { '0': 'R&H Studio', @@ -219,7 +221,9 @@ '13': 'Viewer', '14': 'BrandAdministrator', '20': 'Interface person', - '21': 'Person liable' + '21': 'Person liable', + '30': 'Engineering interface person', + '31': 'Person liable', }, areaOfResponsibility: {}, engineeringInterfacePerson: '', @@ -321,7 +325,12 @@ }, //待办中心跳转 todocenterClick(){ - + this.$router.push({ + path: '/projectRegulationTasks', + query: { + projectName:this.$route.query.projectName + } + }) }, UpdateLogClick() { this.$refs.updateLogRef.getList({ projectLibraryId: this.$route.query.id }) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index c9e16c437..7c4d84fc6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -124,6 +124,9 @@ } }, mounted() { + if(this.$route.query.projectName){ + this.queryParam.projectName = this.$route.query.projectName + } this.getList() }, methods: { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 734ff2f82..dfc21ccd7 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -112,7 +112,9 @@ }, data() { return { - queryParam: {}, + queryParam: { + projectName:this.$route.query.projectName?this.$route.query.projectName:'' + }, toggleSearchStatus: false, taskTypeList: [ {