From 2c85b35e5168394e867421c3168a8da8c46181d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 14:10:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E5=85=A5=E7=9B=B8=E5=85=B3=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=B7=E6=96=B0;=20=E4=B8=8D=E8=83=BD=E8=BD=AC=E5=8A=9E?= =?UTF-8?q?=E7=BB=99=E8=87=AA=E5=B7=B1?= 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 + .../components/certificationList/index.vue | 9 +++++++-- .../projectManagement/components/listOfRegulations.vue | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9838b8473..b64ce7989 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1718,4 +1718,5 @@ module.exports = { youCanOnlySelectStatusClearSubmit:'You can only select data with a process status of Clear to Submit', note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification', format:'It supports doc/docx/pdf format and is less than 50M in size', + cantTransferToYourself:"Can't transfer to yourself", } \ 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 2d3326621..30c367db6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1818,4 +1818,5 @@ module.exports = { youCanOnlySelectStatusClearSubmit:'只能选择流程状态为清单待提交的数据', note:'注:附件包括测试项目清单、测试报告.测试标准或技术规范', format:'支持doc/docx/pdf格式,大小50M以内', + cantTransferToYourself:"不能转办给自己", } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 67c00adfe..21166c48f 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1383,13 +1383,13 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { isTrue = true - }else{ + } else { isTrue = false this.$message.warning(this.$t('youCanOnlySelectStatusClearSubmit')) return } } - if (isTrue){ + if (isTrue) { this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys))) } } else { @@ -1453,6 +1453,11 @@ }, //转办接口 SelectedByForm(userIds) { + if (this.userInfo().id == userIds) { + this.$refs.SelectedByRef.submitLoading = false + this.$message.warning(this.$t('cantTransferToYourself')) + return + } let query = { transferUserId: userIds, 'projectLibraryId': this.$route.query.id, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index da433c8e8..95cfd3f19 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -2511,7 +2511,7 @@ }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) - this.selectedRowKeys = [] + _this.selectedRowKeys = [] _this.getList() } else { _this.$message.warning(_this.$t('operationFailed'))