diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index e7331dcc2..0d91c75d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2070,6 +2070,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 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 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 certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); if(CollectionUtils.isNotEmpty(certificationEngineerList)){ 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/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index d952d59ea..8cf9c9cf3 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -70,7 +70,7 @@ - + @@ -93,10 +93,10 @@ }}
-

注:附件包括测试项目清单、测试报告．测试标准或技术规范

-

    支持doc/docx/pdf格式,大小50M以内

+

{{ $t('note') }}

+

    {{ $t('format') }}

- +
{{$t('preservation')}} @@ -317,7 +317,7 @@ import ImportFile from '@/components/ImportFileData/index' otaIdT='' } getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ - if(res.code==200){ + if(res.code==200){ if(res.result.list.length==0){ this.dataSource=[ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 5af1ca8bd..66653b1ed 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -38,6 +38,10 @@ +
+

{{ $t('note') }}

+

    {{ $t('format') }}

+
{{$t('preservation')}} {{$t('last')}} @@ -182,10 +186,10 @@ import ImportFile from '@/components/ImportFileData/index' // this.getList() this.getData() }, - + methods: { // 模板下载 - + handleModule() { downloadFile('ota/otaBaCxAqcs/exportTemplate', '安全措施' + '.zip', {}) }, @@ -196,7 +200,7 @@ import ImportFile from '@/components/ImportFileData/index' } getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ if(res.code == 200){ - + this.dataSource[0].info = res.result.bhjz this.dataSource[1].info =res.result.fsxjz // this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs) @@ -211,7 +215,7 @@ import ImportFile from '@/components/ImportFileData/index' this.loading = false } }) - + }, uploadSuccess(data) { let attIdList = [] 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..8053df156 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -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,39 +1998,43 @@ moduleFlag: '法规清单' }).then((res) => { if (res.success) { - this.columnsAll = res.result - for (let j = 0; j < this.columnsAll.length; j++) { - for (let i = 0; i < this.column.length; i++) { - if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { - if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { - if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { - for (let k = 0; k < this.columnsAll[j].children.length; k++) { - for (let l = 0; l < this.column[i].children.length; l++) { - if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { - this.columnsAll[j].children[k] = this.column[i].children[l] + 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++) { + if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { + if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } } } } } - } - } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { - if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { - if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { - for (let k = 0; k < this.columnsAll[j].children.length; k++) { - for (let l = 0; l < this.column[i].children.length; l++) { - if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { - this.columnsAll[j].children[k] = this.column[i].children[l] + } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { + if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } } } } } - } - } else { - if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { - this.columnsAll[j] = this.column[i] + } else { + if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { + this.columnsAll[j] = this.column[i] + } } } } + } else { + this.columnsAll = this.column } this.columnsAll.push({ title: this.$t('operation'), @@ -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'))