From fa148cb12ecf75402db48c49606e27d126ab2dad Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 1 Sep 2022 16:38:00 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug5?= =?UTF-8?q?9041,58779?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSplitItemsEOServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 5f0c328d1..6b37ba8b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1702,8 +1702,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Thu, 1 Sep 2022 16:56:41 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listEditModel.vue | 68 +++++++++++- .../components/listOfRegulations.vue | 48 +++++++- .../components/listOfRegulationsView.vue | 103 ++++++++++-------- 3 files changed, 170 insertions(+), 49 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 38b7f34f6..9d45f7dec 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -804,6 +804,49 @@ +
+ {{$t('reasonsForRejection')}} +
+
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -907,7 +950,8 @@ verifyDutyIdDisabled: false, verifyInitiatorIdDisabled: false, DeliverableTreeList: [], - userInfoQuery: {} + userInfoQuery: {}, + rejectCauseList: [] } }, mounted() { @@ -916,6 +960,18 @@ }, methods: { ...mapGetters(['userInfo']), + getRejectCause(id) { + let query = { + projectLawsInventoryId: id + } + getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => { + if (res.success) { + this.rejectCauseList = res.result + } else { + this.rejectCauseList = [] + } + }) + }, getDeliverableTree() { getAction('/sys/category/getDeliverableTree', {}).then((res) => { if (res.success) { @@ -1110,6 +1166,7 @@ item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : [] item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : [] item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : [] + this.getRejectCause(item.id) if (item.dutyTerritory) { this.queryPersonByProject(item) } else { @@ -1400,6 +1457,15 @@ margin-top: 2px; } + .itemModel-reject { + width: calc(100% - 130px); + display: inline-block; + font-size: 16px; + word-break: break-all; + color: #040B29; + padding-top: 11px; + } + .Required { color: red; margin-right: 4px; diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 8b943d1a5..4a01f7b1e 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -220,6 +220,11 @@ @click="edit(record)"> {{ $t('edit') }} + + {{$t('view')}} + @@ -229,10 +234,13 @@ @click="resultReportedClick(record)"> {{$t('resultReported')}} - + + + + {{$t('view')}} - + @@ -745,6 +753,13 @@ fixed: 'right', width: 240, scopedSlots: { customRender: 'operation' } + }, + { + title: this.$t('operation'), + align: 'center', + fixed: 'right', + width: 140, + scopedSlots: { customRender: 'operationOne' } } ], columnsFileAll: [ @@ -1014,7 +1029,14 @@ let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) if (!this.isRoleSwitching) { for (var i = 0; i < columnResult.length; i++) { - if (columnResult[i].title === this.$t('operation')) { + if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 240) { + columnResult.splice(i, 1) + i-- + } + } + } else if (this.isRoleSwitching) { + for (var i = 0; i < columnResult.length; i++) { + if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 140) { columnResult.splice(i, 1) i-- } @@ -2019,15 +2041,18 @@ if (valid) { let url = '/project/projectCommentEO/add' let content = [] + let ids = [] if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) { this.rowKeysSuccessList.forEach(res => { content.push(res.serialNumber) + ids.push(res.id) }) } let query = { commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent, projectLibraryId: this.$route.query.id } + this.rejectCauseAdd(this.formInlineComment.commentContent,ids) this.confirmLoadingComment = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) this.updateStatusBatch(1, selectedRowKeys) @@ -2042,6 +2067,19 @@ } }) }, + rejectCauseAdd(rejectCause,ids) { + let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + let query = { + rejectUserId:this.userInfo().id, + rejectTime:rejectTime, + rejectCause:rejectCause, + projectLawsInventoryId:ids.join(','), + rejectType:'0', + } + postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { + + }) + }, handleCancelComment() { this.visibleComment = false }, @@ -2368,7 +2406,7 @@ } ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue index 1642cae03..d95bdb5cc 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -433,46 +433,49 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ {{$t('reasonsForRejection')}} +
+
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -486,7 +489,7 @@