From 326a129154873b057ced4291c5a0f30fcebd856e Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 6 Jul 2022 14:41:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E7=9A=84=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/listOfRegulations.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index d4318782f..db42bba91 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1241,7 +1241,7 @@ content: _this.$t('ConfirmBatchDeletion'), onOk() { let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - deleteAction(_this.url.deleteBatch, { + postAction(_this.url.deleteBatch, { ids: idList.join(','), projectLibraryId: _this.$route.query.id }).then((res) => { From b0e426c62fbce2bb9717497687883219cce32f13 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 6 Jul 2022 14:50:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectLawsInventoryEOController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 704c077f0..3e3cb5a99 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -152,10 +152,11 @@ public class ProjectLawsInventoryEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids, - @RequestParam(name="projectLibraryId",required=true) String projectLibraryId, - @RequestParam(name="cut",required=true) String cut) { + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody JSONObject json) { + String ids = json.getString("ids"); + String projectLibraryId = json.getString("projectLibraryId"); + String cut = json.getString("cut"); this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut); return Result.OK("批量删除成功!"); } From 8b27242ff4ea7b5a3afd504facd8dbcbf6599558 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 6 Jul 2022 16:02:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9=20-bug=2055544?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 910f78f95..0736144aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1060,7 +1060,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 6 Jul 2022 18:06:16 +0800 Subject: [PATCH 4/5] =?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 --- .../components/listEditModel.vue | 29 ++++++++++++++++++- .../components/listOfRelevantPersonnel.vue | 19 +++++++++--- jero-web/src/views/system/RoleUserList.vue | 4 +-- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 8f8c57cc6..eef2f448c 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -904,7 +904,7 @@ verifyDutyIdDisabled: false, verifyInitiatorIdDisabled: false, DeliverableTreeList: [], - userInfoQuery:{}, + userInfoQuery: {} } }, mounted() { @@ -1240,6 +1240,33 @@ formInline[res] = formInline[res].join(',') } }) + if (!formInline.verifyDutyId) { + formInline.verifyDutyId = '' + } + if (!formInline.regulationOwnerId) { + formInline.regulationOwnerId = '' + } + if (!formInline.engineeringInterfacePerson) { + formInline.engineeringInterfacePerson = '' + } + if (!formInline.homologationEngineerId) { + formInline.homologationEngineerId = '' + } + if (!formInline.designInitiatorId) { + formInline.designInitiatorId = '' + } + if (!formInline.designDutyId) { + formInline.designDutyId = '' + } + if (!formInline.prehomoInitiatorId) { + formInline.prehomoInitiatorId = '' + } + if (!formInline.prehomoDutyId) { + formInline.prehomoDutyId = '' + } + if (!formInline.verifyInitiatorId) { + formInline.verifyInitiatorId = '' + } this.confirmLoading = true putAction(this.url.editModel, formInline).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 08986ea69..a77144c4f 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -113,6 +113,17 @@ {{$t('edit')}} + + + {{$t('regulatoryEngineer')}} + + + + {{$t('engineeringInterfacePerson')}} + + + {{$t('certifiedEngineer')}} + @@ -267,20 +278,20 @@ ellipsis: true }, { - title: this.$t('regulatoryEngineer'), align: 'center', dataIndex: 'lawEngineerName', + slots:{title:'regulatoryEngineer'}, ellipsis: true }, { - title: this.$t('engineeringInterfacePerson'), align: 'center', + slots:{title:'engineeringInterfacePerson'}, dataIndex: 'engineeringInterfacePersonName', ellipsis: true }, { - title: this.$t('certifiedEngineer'), align: 'center', + slots:{title:'certifiedEngineer'}, dataIndex: 'certificationEngineerName', ellipsis: true }, @@ -293,7 +304,7 @@ { title: this.$t('operation'), align: 'center', - width: 100, + width: 110, fixed: 'right', scopedSlots: { customRender: 'operation' } } diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue index 55b0e85ed..b86fe23e8 100644 --- a/jero-web/src/views/system/RoleUserList.vue +++ b/jero-web/src/views/system/RoleUserList.vue @@ -130,7 +130,7 @@ title: this.$t('serialNumber'), dataIndex: '', key: 'rowIndex', - width: 20, + width: 90, align: 'center', customRender: function(t, r, index) { return parseInt(index) + 1 @@ -160,7 +160,7 @@ }, { title: this.$t('operation'), - width: 100, + width: 200, dataIndex: 'action', align: 'center', scopedSlots: { customRender: 'action' } From 768b58264374f3519f97c15c36ef9f852848a441 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 6 Jul 2022 18:10:51 +0800 Subject: [PATCH 5/5] =?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 --- .../components/listOfRegulations.vue | 57 ++++++++++--------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index db42bba91..1a0963aaa 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1615,7 +1615,7 @@ }) }, - getRowKeys(value, callBack) { + getRowKeys(value,num, callBack) { let isTrue = true let dataSource = [] for (let i = 0; i < this.dataSource.length; i++) { @@ -1651,35 +1651,36 @@ // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted')) // return } - if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId - && dataSource[i].designInitiatorId == this.userInfo().id) || - (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId - && dataSource[i].designInitiatorId == this.userInfo().id)){ - if(!dataSource[i].designDutyId || !dataSource[i].designDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) - continue - } - } - if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId - && dataSource[i].prehomoInitiatorId == this.userInfo().id) || - (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId - && dataSource[i].prehomoInitiatorId == this.userInfo().id)){ - if(!dataSource[i].prehomoDutyId || !dataSource[i].prehomoDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) - continue + if(num == 1){ + if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId + && dataSource[i].designInitiatorId == this.userInfo().id) || + (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId + && dataSource[i].designInitiatorId == this.userInfo().id)){ + if(!dataSource[i].designDutyId || !dataSource[i].designDueDate){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) + continue + } } - } - if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId - && dataSource[i].verifyInitiatorId == this.userInfo().id) || - (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId - && dataSource[i].verifyInitiatorId == this.userInfo().id)){ - if(!dataSource[i].verifyDutyId || !dataSource[i].verifyDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) - continue + if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId + && dataSource[i].prehomoInitiatorId == this.userInfo().id) || + (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId + && dataSource[i].prehomoInitiatorId == this.userInfo().id)){ + if(!dataSource[i].prehomoDutyId || !dataSource[i].prehomoDueDate){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) + continue + } + } + if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId + && dataSource[i].verifyInitiatorId == this.userInfo().id) || + (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId + && dataSource[i].verifyInitiatorId == this.userInfo().id)){ + if(!dataSource[i].verifyDutyId || !dataSource[i].verifyDueDate){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) + continue + } } } this.rowKeysSuccessList.push(dataSource[i]) - } else { this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('incorrectsubmitted') } < /div>) // isTrue = false @@ -1760,12 +1761,12 @@ onOk() { if (num == 0) { let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - _this.getRowKeys(selectedRowKeys, function() { + _this.getRowKeys(selectedRowKeys, 1,function() { _this.updateStatusBatch(num, selectedRowKeys) }) } else { let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - _this.getRowKeys(selectedRowKeys, function() { + _this.getRowKeys(selectedRowKeys, 2,function() { _this.visibleComment = true }) }