From eff18530e7a28716b90526e8675606a27f72f940 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 15 Jun 2022 11:04:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[update]=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParameterItemCollectionList.vue | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 37c7c56c2..65fe10fe7 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -252,11 +252,11 @@
-
NIO编号为{{ item.nioNumber }},状态为{{ item.state }},没有此按钮的操作权限。
+
NIO编号为{{ item.nioNumber }},状态为{{ item.state }},没有此按钮的操作权限。
- {{ currentPersonRole =='homo'? '认证工程师': (currentPersonRole =='sdt'? '工程接口人': '填写人') }} 数据状态为 + {{ currentPersonRole =='homo'? '认证工程师': (currentPersonRole =='sdt'? '工程接口人': '填写人') }}数据状态为 '待发起收集'、'工程接口人退回'或'变更' @@ -267,7 +267,7 @@ - '已提交'或'变更' + '待发起收集' @@ -463,6 +463,7 @@ export default { handleOkRoleSwitching() { this.visibleRoleSwitching = false this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode + this.selectedRowKeysValue = [] }, roleSwitchingClick() { this.visibleRoleSwitching = true @@ -475,6 +476,7 @@ export default { }, // 错误数据的弹框 cancleoperationFailed() { + this.selectedRowKeysValue = [] this.visibleoperationFailed = false this.GetgetTableList() }, @@ -503,7 +505,7 @@ export default { // 仅仅状态为 已提交 可以退回 homoJurisdictionReturn() { // 认证工程师 已提交 - if(currentPersonRole =='homo') { + if(this.currentPersonRole =='homo') { this.NotSelectedRowKeysValue = [] // 定义开关 0为没有权限 1为有权限 let flag = 1 @@ -521,7 +523,7 @@ export default { } return flag //工程接口人 待工程接口人处理 填写人退回 - }else if(currentPersonRole =='sdt') { + }else if(this.currentPersonRole =='sdt') { this.NotSelectedRowKeysValue = [] // 定义开关 0为没有权限 1为有权限 let flag = 1 @@ -539,7 +541,7 @@ export default { } return flag //填写人 待填写 认证工程师退回 - }else if(currentPersonRole =='dre') { + }else if(this.currentPersonRole =='dre') { this.NotSelectedRowKeysValue = [] // 定义开关 0为没有权限 1为有权限 let flag = 1 @@ -598,7 +600,6 @@ export default { }, // 填写人 截至时间 权限 // 仅仅状态为 可以截至时间 - // todo 此状态为错误的 dreTaskCutOffTimeLibrary() { // 定义开关 0为没有权限 1为有权限 this.NotSelectedRowKeysValue = [] @@ -608,7 +609,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '已提交' && item.state !== '变更') { + if(item.state !== '待发起收集') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -620,7 +621,7 @@ export default { // 仅仅状态为 待工程接口人处理 填写人退回 可以强制撤回 homoJurisdictionCompulsoryWithdrawal() { // 认证工程师 已提交 - if(currentPersonRole =='homo') { + if(this.currentPersonRole =='homo') { this.NotSelectedRowKeysValue = [] // 定义开关 0为没有权限 1为有权限 let flag = 1 @@ -639,7 +640,7 @@ export default { return flag // 工程接口人 强制撤回 权限 // 仅仅状态为 待填写 可以强制撤回 - }else if(currentPersonRole =='sdt') { + }else if(this.currentPersonRole =='sdt') { this.NotSelectedRowKeysValue = [] // 定义开关 0为没有权限 1为有权限 let flag = 1 @@ -657,7 +658,7 @@ export default { } return flag //填写人 已提交 - }else if(currentPersonRole =='dre') { + }else if(this.currentPersonRole =='dre') { this.NotSelectedRowKeysValue = [] // 定义开关 0为没有权限 1为有权限 let flag = 1 @@ -698,6 +699,7 @@ export default { // 填写人 提交 权限 // 仅仅状态为 待填写 认证工程师退回 可以提交 dreJurisdictionSubmit() { + console.log(this.selectedRowKeysValue,'this.selectedRowKeysValue') // 定义开关 0为没有权限 1为有权限 this.NotSelectedRowKeysValue = [] let flag = 1 From eb4d6eb4e3a5ce34b02edbe94bf0c499e1eebfee Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 15 Jun 2022 11:32:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[update]=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../src/components/tableCollection/index.vue | 4 ++-- .../ParameterItemCollectionList.vue | 20 +++++++++++++------ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a0430f3be..f6aad501e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -712,6 +712,7 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'Enclosure', // 认证 + Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The selected item has incomplete data collection, unable to add configuration', theCurrent: 'The current status of this data is', thisbuttonCompleted: 'This button can only be operated when the status is completed', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index a164de6be..6264a9406 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -723,6 +723,7 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '所选项目有未完成收集数据，不能添加配置', theCurrent: '此数据当前状态为', thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮', diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 388442cbb..3e9d42218 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -24,7 +24,7 @@
- + - + {{ item.label }} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 65fe10fe7..665391e07 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -910,6 +910,7 @@ export default { }, // 提交数据 ishandleSubmit() { + let _this = this let postDate = [] this.selectedRowKeysValue.forEach((item, index) => { let postDateobj = {} @@ -932,12 +933,19 @@ export default { if(this.selectedRowKeys.length == 0) { this.$message.warning(this.$t('selectLeastOne')) }else { - postAction(this.url.add, configDataList).then((res) => { - if (res.success) { - this.GetgetTableList() - this.$message.success(this.$t('OperationSuccessful')) - } else { - this.$message.warning(this.$t('operationFailed')) + let _configDataListNo = [] + this.$confirm({ + content: _this.$t('Areyousureparameteritems'), + onOk() { + console.log(configDataList,'configDataListconfigDataList') + postAction(_this.url.add, configDataList).then((res) => { + if (res.success) { + _this.GetgetTableList() + _this.$message.success(this.$t('OperationSuccessful')) + } else { + _this.$message.warning(this.$t('operationFailed')) + } + }) } }) } From 90ef924ccd5397798ae1f171891445d81df86194 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 15 Jun 2022 11:46:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDetails/index.vue | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 8bb0a5ba3..152e4189d 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -29,6 +29,7 @@
{{$t('projectDetails')}} @@ -101,7 +102,7 @@ title: this.$t('projectDetails'), isDisplayNum: '', textTitle: '', - isTrue: false, + isTrue: true, url: { logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '', @@ -134,7 +135,15 @@ this.textTitle = this.$t('TaskParameterCollection') } } else { - this.getList() + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + if (this.userInfo().userRoleList.length == 1 && this.userInfo().userRoleList[0].roleCode == 'sdt') { + this.getList() + } else { + this.textColor(0) + } + } else { + this.textColor(0) + } } }, methods: { @@ -145,6 +154,7 @@ textColor[0].classList.remove('Virtual-detail-left-text-color') } let text = document.getElementsByClassName('Virtual-detail-left-text') + console.log(text) if (name == 0) { text[name].classList.add('Virtual-detail-left-text-color') this.textTitle = text[name].title @@ -217,14 +227,14 @@ dataSource.forEach(res => { this.engineeringInterfacePerson += res.engineeringInterfacePerson + ',' }) + if (this.engineeringInterfacePerson.includes(this.userInfo().id)) { + this.isTrue = true + } else { + this.isTrue = false + } this.$nextTick(() => { - if (this.engineeringInterfacePerson.includes(this.userInfo().id)) { - this.isTrue = true - } else { - this.isTrue = false - } + this.textColor(0) }) - this.textColor(0) } else { this.textColor(0) }