From f225c22e553a23b60324f64b7f05163ccaa476f1 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 1 Jun 2022 18:09:09 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParameterItemCollectionList.vue | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 6ee45e3a1..dafa46bcb 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -334,7 +334,7 @@ export default { if(flag === 1) { flag = 1 } else { - this.$message.warning(this.$t('operatethisbutton')) + this.$message.warning(this.$t('certifiedEngineer')+this.$t('and')+this.$t('Statusis')+this.$t('Submitted')+this.$t('toHavePermission')) } } // 工程接口人 退回 权限 @@ -352,7 +352,7 @@ export default { if(flag === 1) { flag = 1 } else { - this.$message.warning(this.$t('operatethisbutton')) + this.$message.warning(this.$t('engineeringInterfacePerson')+this.$t('and')+this.$t('Statusis')+this.$t('handledInterface')+this.$t('Filledreturn')+this.$t('toHavePermission')) } } } else if(this.dre){ @@ -439,7 +439,8 @@ export default { homoJurisdictionCompulsoryWithdrawal() { // 定义开关 0为没有权限 1为有权限 let flag = 1 - if(this.homo) { + if(this.homo && this.sdt == 0) { + // 仅为认证工程师 if(this.selectedRowKeysValue.length == 0) { flag = 0 this.$message.success(this.$t('selectLeastOne')) @@ -452,12 +453,13 @@ export default { if(flag === 1) { flag = 1 } else { - this.$message.warning(this.$t('operatethisbutton')) + this.$message.warning(this.$t('certifiedEngineer')+this.$t('Statusis')+this.$t('handledInterface')+this.$t('Filledreturn')+this.$t('toHavePermission')) } } // 工程接口人 强制撤回 权限 // 仅仅状态为 待填写 可以强制撤回 - }else if(this.sdt){ + }else if(this.sdt && this.homo == 0){ + // 仅为工程接口人 if(this.selectedRowKeysValue.length == 0) { flag = 0 this.$message.warning(this.$t('selectLeastOne')) @@ -470,7 +472,24 @@ export default { if(flag === 1) { flag = 1 } else { - this.$message.warning(this.$t('operatethisbutton')) + this.$message.warning(this.$t('engineeringInterfacePerson')+this.$t('and')+this.$t('Statusis')+this.$t('completed')+this.$t('toHavePermission')) + } + } + } else if(this.sdt && this.homo ) { + // 认证工程师和工程接口人 + if(this.selectedRowKeysValue.length == 0) { + flag = 0 + this.$message.success(this.$t('selectLeastOne')) + } else { + this.selectedRowKeysValue.forEach((item, index) => { + if(item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== '待填写') { + flag = 0 + } + }) + if(flag === 1) { + flag = 1 + } else { + this.$message.warning(this.$t('certifiedEngineer')+this.$t('Statusis')+this.$t('handledInterface')+this.$t('Filledreturn')+this.$t('engineeringInterfacePerson')+this.$t('completed')+this.$t('toHavePermission')) } } } else { @@ -718,7 +737,7 @@ export default { // 认证工程师 任意状态 都有此权限 this.areaVisible = true } else { - this.$message.warning(this.$t('operatethisbutton')) + this.$message.warning(this.$t('certifiedEngineer')+this.$t('toHavePermission')) } }, // 提交