Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
zyx.net
+15
-15
@@ -2070,6 +2070,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
String itemName = (String) standNameAndItemName.get("itemName");
|
||||
|
||||
try {
|
||||
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
|
||||
// 把交付结果、截止日期清空，流程状态 设置为 清单待发布
|
||||
LambdaUpdateWrapper<ProjectCertificationInventoryEO> updateWrap = new LambdaUpdateWrapper<>();
|
||||
updateWrap.set(ProjectCertificationInventoryEO::getDeliveryResult,null);
|
||||
|
||||
// 流程重置，清空截止日期， 撤回不清空。 对应禅道问题：67048
|
||||
if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
|
||||
updateWrap.set(ProjectCertificationInventoryEO::getEndTime,null);
|
||||
}
|
||||
|
||||
updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
|
||||
updateWrap.eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
|
||||
this.update(updateWrap);
|
||||
}
|
||||
|
||||
// 处理待办中心相关数据
|
||||
// 更新该项目认证流程中，认证工程师的任务状态。
|
||||
// 认证工程师接受任务节点
|
||||
@@ -2090,21 +2105,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
|
||||
this.processInfoDetailEOService.remove(detailRemoveWrap);
|
||||
|
||||
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
|
||||
// 把交付结果、截止日期清空，流程状态 设置为 清单待发布
|
||||
LambdaUpdateWrapper<ProjectCertificationInventoryEO> updateWrap = new LambdaUpdateWrapper<>();
|
||||
updateWrap.set(ProjectCertificationInventoryEO::getDeliveryResult,null);
|
||||
|
||||
// 流程重置，清空截止日期， 撤回不清空。 对应禅道问题：67048
|
||||
if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
|
||||
updateWrap.set(ProjectCertificationInventoryEO::getEndTime,null);
|
||||
}
|
||||
|
||||
updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
|
||||
updateWrap.eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
|
||||
this.update(updateWrap);
|
||||
}
|
||||
|
||||
try {
|
||||
List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
|
||||
if(CollectionUtils.isNotEmpty(certificationEngineerList)){
|
||||
|
||||
@@ -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",
|
||||
}
|
||||
@@ -1818,4 +1818,5 @@ module.exports = {
|
||||
youCanOnlySelectStatusClearSubmit:'只能选择流程状态为清单待提交的数据',
|
||||
note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范',
|
||||
format:'支持doc/docx/pdf格式,大小50M以内',
|
||||
cantTransferToYourself:"不能转办给自己",
|
||||
}
|
||||
@@ -93,8 +93,8 @@
|
||||
}}</a-button>
|
||||
|
||||
<div style='margin-top: 20px'>
|
||||
<p>注:附件包括测试项目清单、测试报告．测试标准或技术规范</p>
|
||||
<p> 支持doc/docx/pdf格式,大小50M以内</p>
|
||||
<p>{{ $t('note') }}</p>
|
||||
<p> {{ $t('format') }}</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -38,6 +38,10 @@
|
||||
</a-button>
|
||||
</span>
|
||||
</a-table>
|
||||
<div style='margin-top: 20px'>
|
||||
<p>{{ $t('note') }}</p>
|
||||
<p> {{ $t('format') }}</p>
|
||||
</div>
|
||||
<div class="bootom-button">
|
||||
<a-button class='btn' @click="save">{{$t('preservation')}}</a-button>
|
||||
<a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -761,14 +761,14 @@
|
||||
scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
title: this.$t('operation'),
|
||||
align: 'left',
|
||||
fixed: 'right',
|
||||
width: 260,
|
||||
scopedSlots: { customRender: 'operation' }
|
||||
}
|
||||
// {
|
||||
// title: this.$t('operation'),
|
||||
// align: 'left',
|
||||
// fixed: 'right',
|
||||
// width: 260,
|
||||
// scopedSlots: { customRender: 'operation' }
|
||||
// }
|
||||
],
|
||||
columnsAll: [],
|
||||
columnsFileAll: [
|
||||
@@ -1998,6 +1998,7 @@
|
||||
moduleFlag: '法规清单'
|
||||
}).then((res) => {
|
||||
if (res.success) {
|
||||
if (res.result && res.result.length > 0) {
|
||||
this.columnsAll = res.result
|
||||
for (let j = 0; j < this.columnsAll.length; j++) {
|
||||
for (let i = 0; i < this.column.length; i++) {
|
||||
@@ -2032,6 +2033,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
this.columnsAll = this.column
|
||||
}
|
||||
this.columnsAll.push({
|
||||
title: this.$t('operation'),
|
||||
align: 'left',
|
||||
@@ -2511,7 +2515,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'))
|
||||
|
||||
Reference in New Issue
Block a user