WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'master' 到 'dev_third_stage'

Browse Source 
Master

查看合并请求 laws-nio/laws-weilai!52
This commit is contained in:
李雪涛
2022-07-06 21:28:40 +08:00
parent c5087d63df 7438de7f7d
commit addbc8b42c
6 changed files with 88 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+5 -4
View File
@@ -152,10 +152,11 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
*/ */
@AutoLog(value = "项目库-法规清单表-批量删除") @AutoLog(value = "项目库-法规清单表-批量删除")
@ApiOperation(value="项目库-法规清单表-批量删除", notes="项目库-法规清单表-批量删除") @ApiOperation(value="项目库-法规清单表-批量删除", notes="项目库-法规清单表-批量删除")
@DeleteMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids, public Result<?> deleteBatch(@RequestBody JSONObject json) {
@RequestParam(name="projectLibraryId",required=true) String projectLibraryId, String ids = json.getString("ids");
@RequestParam(name="cut",required=true) String cut) { String projectLibraryId = json.getString("projectLibraryId");
String cut = json.getString("cut");
this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut); this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut);
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+8 -1
View File
@@ -1060,7 +1060,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
//如果是拒绝 //如果是拒绝
}else if(StringUtils.equals(inventoryAffirmStatus,InventoryAffirmStatusEnum.REJECTED.getValue())){ }else if(StringUtils.equals(inventoryAffirmStatus,InventoryAffirmStatusEnum.REJECTED.getValue())){
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus()) if((StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())&& StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),OperatorResultEnum.REJECTED.getValue()))
&& (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())&& StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(),OperatorResultEnum.REJECTED.getValue()))){
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REJECTED.getName());
}else {
projectLawsInventoryEO.setInventoryAffirmStatusName(InventoryAffirmStatusEnum.REJECTED.getValue());
}
}else if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())
&& StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),OperatorResultEnum.REJECTED.getValue())){ && StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),OperatorResultEnum.REJECTED.getValue())){
//如果认证工程师提交状态不为空，并且认证工程师提交状态为拒绝 //如果认证工程师提交状态不为空，并且认证工程师提交状态为拒绝
if(StringUtils.equals(cut, CutEnum.CN.getValue())){ if(StringUtils.equals(cut, CutEnum.CN.getValue())){
jero-web/src/views/projectManagement/components/listEditModel.vue
+28 -1
View File
@@ -904,7 +904,7 @@
verifyDutyIdDisabled: false, verifyDutyIdDisabled: false,
verifyInitiatorIdDisabled: false, verifyInitiatorIdDisabled: false,
DeliverableTreeList: [], DeliverableTreeList: [],
userInfoQuery:{}, userInfoQuery: {}
} }
}, },
mounted() { mounted() {
@@ -1240,6 +1240,33 @@
formInline[res] = formInline[res].join(',') 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 this.confirmLoading = true
putAction(this.url.editModel, formInline).then((res) => { putAction(this.url.editModel, formInline).then((res) => {
if (res.success) { if (res.success) {
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+30 -29
View File
@@ -1241,7 +1241,7 @@
content: _this.$t('ConfirmBatchDeletion'), content: _this.$t('ConfirmBatchDeletion'),
onOk() { onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
deleteAction(_this.url.deleteBatch, { postAction(_this.url.deleteBatch, {
ids: idList.join(','), ids: idList.join(','),
projectLibraryId: _this.$route.query.id projectLibraryId: _this.$route.query.id
}).then((res) => { }).then((res) => {
@@ -1615,7 +1615,7 @@
}) })
}, },
getRowKeys(value, callBack) { getRowKeys(value,num, callBack) {
let isTrue = true let isTrue = true
let dataSource = [] let dataSource = []
for (let i = 0; i < this.dataSource.length; i++) { for (let i = 0; i < this.dataSource.length; i++) {
@@ -1651,35 +1651,36 @@
// this.$message.warning(dataSource[i].serialNumber + this.$t('submitted')) // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
// return // return
} }
if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId if(num == 1){
&& dataSource[i].designInitiatorId == this.userInfo().id) || if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
(dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId && dataSource[i].designInitiatorId == this.userInfo().id) ||
&& dataSource[i].designInitiatorId == this.userInfo().id)){ (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
if(!dataSource[i].designDutyId || !dataSource[i].designDueDate){ && dataSource[i].designInitiatorId == this.userInfo().id)){
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) if(!dataSource[i].designDutyId || !dataSource[i].designDueDate){
continue 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((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId && dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
&& dataSource[i].verifyInitiatorId == this.userInfo().id) || (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
(dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId && dataSource[i].prehomoInitiatorId == this.userInfo().id)){
&& dataSource[i].verifyInitiatorId == this.userInfo().id)){ if(!dataSource[i].prehomoDutyId || !dataSource[i].prehomoDueDate){
if(!dataSource[i].verifyDutyId || !dataSource[i].verifyDueDate){ this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) continue
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]) this.rowKeysSuccessList.push(dataSource[i])
} else { } else {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('incorrectsubmitted') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('incorrectsubmitted') } < /div>)
// isTrue = false // isTrue = false
@@ -1760,12 +1761,12 @@
onOk() { onOk() {
if (num == 0) { if (num == 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
_this.getRowKeys(selectedRowKeys, function() { _this.getRowKeys(selectedRowKeys, 1,function() {
_this.updateStatusBatch(num, selectedRowKeys) _this.updateStatusBatch(num, selectedRowKeys)
}) })
} else { } else {
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
_this.getRowKeys(selectedRowKeys, function() { _this.getRowKeys(selectedRowKeys, 2,function() {
_this.visibleComment = true _this.visibleComment = true
}) })
} }
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+15 -4
View File
@@ -113,6 +113,17 @@
{{$t('edit')}} {{$t('edit')}}
</a> </a>
</span> </span>
<span slot="regulatoryEngineer" >
<span :title="$t('regulatoryEngineer')">
{{$t('regulatoryEngineer')}}
</span>
</span>
<span slot="engineeringInterfacePerson" :title="$t('engineeringInterfacePerson')">
{{$t('engineeringInterfacePerson')}}
</span>
<span slot="certifiedEngineer" :title="$t('certifiedEngineer')">
{{$t('certifiedEngineer')}}
</span>
</a-table> </a-table>
<!-- <div class="page">--> <!-- <div class="page">-->
<!-- <a-pagination--> <!-- <a-pagination-->
@@ -267,20 +278,20 @@
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('regulatoryEngineer'),
align: 'center', align: 'center',
dataIndex: 'lawEngineerName', dataIndex: 'lawEngineerName',
slots:{title:'regulatoryEngineer'},
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('engineeringInterfacePerson'),
align: 'center', align: 'center',
slots:{title:'engineeringInterfacePerson'},
dataIndex: 'engineeringInterfacePersonName', dataIndex: 'engineeringInterfacePersonName',
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('certifiedEngineer'),
align: 'center', align: 'center',
slots:{title:'certifiedEngineer'},
dataIndex: 'certificationEngineerName', dataIndex: 'certificationEngineerName',
ellipsis: true ellipsis: true
}, },
@@ -293,7 +304,7 @@
{ {
title: this.$t('operation'), title: this.$t('operation'),
align: 'center', align: 'center',
width: 100, width: 110,
fixed: 'right', fixed: 'right',
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
} }
jero-web/src/views/system/RoleUserList.vue
+2 -2
View File
@@ -130,7 +130,7 @@
title: this.$t('serialNumber'), title: this.$t('serialNumber'),
dataIndex: '', dataIndex: '',
key: 'rowIndex', key: 'rowIndex',
width: 20, width: 90,
align: 'center', align: 'center',
customRender: function(t, r, index) { customRender: function(t, r, index) {
return parseInt(index) + 1 return parseInt(index) + 1
@@ -160,7 +160,7 @@
}, },
{ {
title: this.$t('operation'), title: this.$t('operation'),
width: 100, width: 200,
dataIndex: 'action', dataIndex: 'action',
align: 'center', align: 'center',
scopedSlots: { customRender: 'action' } scopedSlots: { customRender: 'action' }