From 7570bb5d1b6131b78090cf90d3c219cee30b4a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 13:36:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxAqcsController.java | 5 +- .../ota/controller/OtaBaCxJbxxController.java | 3 + .../controller/OtaBaCxJsfzbacsController.java | 3 + .../OtaBaCxKsjjsmccsController.java | 3 + .../OtaBaCxKsjxtmccsController.java | 3 + .../controller/OtaBaCxZxsjyqController.java | 3 + .../modules/ota/entity/OtaBaCxJsfzbacs.java | 88 ++--- .../jero/modules/ota/enums/OtaTitleEnum.java | 10 +- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 327 +++++++++++++++++- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 4 +- .../modules/ota/utils/ComparisonUtil.java | 4 +- 11 files changed, 391 insertions(+), 62 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java index db5503637..f61314193 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java @@ -204,7 +204,10 @@ public class OtaBaCxAqcsController extends JeroController reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, basc, sysDictService); + saveOrUpdate(basc); + + List oldList = OtaBaCxSjmkService.queryByOtaId(otaId); + OtaBaCxSjmkService.deleteByOtaId(otaId); + List sjmkList = parseList(upFile, otaId, cut); + reList.addAll(cu.comparisonListRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, OtaTitleEnum.BJMC.getName(), oldList, sjmkList, sysDictService)); + OtaBaCxSjmkService.saveOrUpdateBatch(sjmkList); + otaBaCxTxjlService.saveBatch(reList); } - private JSONObject parseFile(File upFile, String otaId, String cut) { - JSONObject jsonObj = new JSONObject(); - jsonObj.put("otaId",otaId); + private List parseList(File upFile, String otaId, String cut) throws Exception { + Date now = new Date(); + List sjmkList = new ArrayList<>(); + Workbook wb = ImportFileUtil.readExcel(upFile); + Sheet s = wb.getSheetAt(0); + int rows = s.getPhysicalNumberOfRows(); + for (int i = 63; i < rows; i++) { + Row row = s.getRow(i); + Cell cell = row.getCell(0); + String str = ImportFileUtil.getCellValue(cell, wb); + OtaBaCxSjmk sjmk = new OtaBaCxSjmk(); + if (StringUtils.isEmpty(str)) { + //列表数据数量，部件名称为空时结束 + break; + } else { + sjmk.setOtaId(otaId); + sjmk.setCreateTime(now); + sjmk.setBjmc(str); + cell = row.getCell(1); + sjmk.setPzqk(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + cell = row.getCell(2); + sjmk.setKzqmc(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(3); + sjmk.setYjggxh(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(4); + sjmk.setYjscqy(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(5); + sjmk.setRjbb(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(6); + sjmk.setRjkfqy(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(7); + sjmk.setBzwz(ImportFileUtil.getCellValue(cell, wb)); + sjmkList.add(sjmk); + } + } + return sjmkList; + } + + private OtaBaCxJsfzbacs parseFile(File upFile, String otaId, String cut) throws Exception { + Workbook wb = ImportFileUtil.readExcel(upFile); + Sheet s = wb.getSheetAt(0); + OtaBaCxJsfzbacs bass = new OtaBaCxJsfzbacs(); + bass.setOtaId(otaId); + + Row row = s.getRow(2); + Cell cell = row.getCell(2); + bass.setJsfzczjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(2); + cell = row.getCell(4); + bass.setJgldSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(3); + cell = row.getCell(4); + bass.setJgldBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(4); + cell = row.getCell(4); + bass.setJgldGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(5); + cell = row.getCell(4); + bass.setJgldScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(6); + cell = row.getCell(2); + bass.setHmbldPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(6); + cell = row.getCell(4); + bass.setHmbldSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(7); + cell = row.getCell(4); + bass.setHmbldBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(8); + cell = row.getCell(4); + bass.setHmbldGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(9); + cell = row.getCell(4); + bass.setHmbldScqy(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(10); + cell = row.getCell(2); + bass.setCsbldPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(10); + cell = row.getCell(4); + bass.setCsbldSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(11); + cell = row.getCell(4); + bass.setCsbldBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(12); + cell = row.getCell(4); + bass.setCsbldGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(13); + cell = row.getCell(4); + bass.setCsbldScqy(ImportFileUtil.getCellValue(cell, wb)); - return jsonObj; + + row = s.getRow(14); + cell = row.getCell(2); + bass.setSxthsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(14); + cell = row.getCell(4); + bass.setSxthsSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(15); + cell = row.getCell(4); + bass.setSxthsBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(16); + cell = row.getCell(4); + bass.setSxthsGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(17); + cell = row.getCell(4); + bass.setSxthsScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(18); + cell = row.getCell(2); + bass.setSxtdsdPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(18); + cell = row.getCell(4); + bass.setSxtdsdSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(19); + cell = row.getCell(4); + bass.setSxtdsdBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(20); + cell = row.getCell(4); + bass.setSxtdsdGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(21); + cell = row.getCell(4); + bass.setSxtdsdScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(22); + cell = row.getCell(2); + bass.setJsyjkPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(22); + cell = row.getCell(4); + bass.setJsyjkSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(23); + cell = row.getCell(4); + bass.setJsyjkBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(24); + cell = row.getCell(4); + bass.setJsyjkGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(25); + cell = row.getCell(4); + bass.setJsyjkScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(26); + cell = row.getCell(2); + bass.setJsyhwPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(26); + cell = row.getCell(4); + bass.setJsyhwSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(27); + cell = row.getCell(4); + bass.setJsyhwBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(28); + cell = row.getCell(4); + bass.setJsyhwGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(29); + cell = row.getCell(4); + bass.setJsyhwScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(30); + cell = row.getCell(2); + bass.setCzwxdwPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(30); + cell = row.getCell(4); + bass.setCzwxdwGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(31); + cell = row.getCell(4); + bass.setCzwxdwScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(32); + cell = row.getCell(2); + bass.setGxdhPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(32); + cell = row.getCell(4); + bass.setGxdhGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(33); + cell = row.getCell(4); + bass.setGxdhScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(34); + cell = row.getCell(2); + bass.setLsjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(34); + cell = row.getCell(4); + bass.setLsjGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(35); + cell = row.getCell(4); + bass.setLsjScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(36); + cell = row.getCell(2); + bass.setGjddtPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(36); + cell = row.getCell(4); + bass.setGjddtGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(37); + cell = row.getCell(4); + bass.setGjddtScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(38); + cell = row.getCell(2); + bass.setDzwlPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(38); + cell = row.getCell(4); + bass.setDzwlDxxgcs(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(39); + cell = row.getCell(2); + bass.setCztxPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(39); + cell = row.getCell(4); + bass.setCztxXtmc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(40); + cell = row.getCell(4); + bass.setCztxGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(41); + cell = row.getCell(4); + bass.setCztxScqy(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(42); + cell = row.getCell(4); + bass.setCztxBbh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(43); + cell = row.getCell(4); + bass.setCztxKfqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(44); + cell = row.getCell(2); + bass.setJsfzczjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(44); + cell = row.getCell(4); + bass.setJsfzczjMc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(45); + cell = row.getCell(4); + bass.setJsfzczjYjxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(46); + cell = row.getCell(4); + bass.setJsfzczjScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(47); + cell = row.getCell(2); + bass.setJsfzzsqPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(47); + cell = row.getCell(4); + bass.setJsfzzsqMc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(48); + cell = row.getCell(4); + bass.setJsfzzsqYjxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(49); + cell = row.getCell(4); + bass.setJsfzzsqScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(50); + cell = row.getCell(2); + bass.setFxptstsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(50); + cell = row.getCell(4); + bass.setFxptstsMc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(51); + cell = row.getCell(4); + bass.setFxptstsYjxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(52); + cell = row.getCell(4); + bass.setFxptstsScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(53); + cell = row.getCell(2); + bass.setJsyzyltsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(53); + cell = row.getCell(4); + bass.setJsyzyltsMc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(54); + cell = row.getCell(4); + bass.setJsyzyltsYjxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(55); + cell = row.getCell(4); + bass.setJsyzyltsScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(56); + cell = row.getCell(2); + bass.setDssadPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(56); + cell = row.getCell(4); + bass.setDssadGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(57); + cell = row.getCell(4); + bass.setDssadScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(58); + cell = row.getCell(2); + bass.setEdrPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(58); + cell = row.getCell(4); + bass.setEdrGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(59); + cell = row.getCell(4); + bass.setEdrScqy(ImportFileUtil.getCellValue(cell, wb)); + return bass; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 6526cea06..c10a5ea65 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -98,6 +98,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl(); + } ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); @@ -278,7 +281,6 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl { field.setAccessible(true); Object newVal = field.get(newObj); String newStr = ""; - if (ObjectUtils.isNotEmpty(newVal)) { + if (ObjectUtils.isNotEmpty(newVal) && !field.getName().equals(tableField.getName())) { newStr = newVal.toString(); content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); @@ -93,7 +93,7 @@ public class ComparisonUtil { for (T newObj : newList) { if (ObjectUtils.isNotEmpty(newObj)) { Object newId = idField.get(newObj); - if (ObjectUtils.isNotEmpty(newObj) && oldId.equals(newId.toString())) { + if (ObjectUtils.isNotEmpty(newId) && oldId.equals(newId.toString())) { break; } } From e756b54a9628b5ed56eea98644eef93557d969ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Mar 2023 13:37:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=8D=87=E7=BA=A7=E8=A6=81=E6=B1=82-?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/upgradeRequirements.vue | 15 +++++++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ed3137454..9838b8473 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1716,4 +1716,6 @@ module.exports = { pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process', complianceReporting:'Compliance Reporting', 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', } \ 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 4aac259d7..6347fbd7e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1816,4 +1816,6 @@ module.exports = { pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程', complianceReporting:'合规报告', youCanOnlySelectStatusClearSubmit:'只能选择流程状态为清单待提交的数据', + note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', + format:'支持doc/docx/pdf格式,大小50M以内', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index d2ad38e2f..28189dc21 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -18,10 +18,17 @@ {{ $t('not') }} - - {{ $t('uploadattachment') }} - + + + +
+
+

{{$t('note')}}

+

    {{$t('format')}}

+
+ +
{{ $t('preservation') }} {{ $t('last') }} @@ -228,7 +235,7 @@ export default { this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) this.$forceUpdate() }) - + }, click(value) { this.fileList = value From 57b54883101cc4f2cbaf6ee04abe8beea7e5ae15 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 27 Mar 2023 13:38:58 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/uploadFile/file.vue | 13 ++++++++++++- .../components/beupgradedonline.vue | 2 +- .../components/upgradeRequirements.vue | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 510dc1a4c..601685f03 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled', 'thisFileUploadUrl','accept', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -88,6 +88,16 @@ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); console.log(file) this.fileTypeSatus = true + //根据格式拦截 + if(this.accept){ + let fileNames = file.name.split('.') + let fileType = fileNames[fileNames.length - 1].toLocaleLowerCase() + let extList = this.accept.split(',') + if (!extList.find((item) => item == fileType)) { + this.$message.error(this.$t('uploadOnly') + this.accept + this.$t('type')) + reject(false) + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded')) @@ -121,6 +131,7 @@ // }else{ // this.fileTypeSatus = false; // } + // } // } this.$message.destroy() }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 5c9c59deb..73ba83733 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -45,7 +45,7 @@ :placeholder="$t('PleaseSelect')" :type="'select'" :triggerChange="false" - :dictCode="record.dictCode" + :dictCode="'driving_automation_level'" v-model="record.jszdhjb"/> diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 28189dc21..7563136e2 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -34,7 +34,7 @@ {{ $t('last') }} {{ $t('next') }}
- + From dd28a87d2e087f6a94f328a786b261eb45442296 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 13:42:37 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- .../auxiliaryupgradehavechanged.vue | 203 +++++++++--------- .../components/upgradehavechanged.vue | 63 +++--- .../components/basicInformation.vue | 8 +- .../components/recordparameters.vue | 14 +- 5 files changed, 146 insertions(+), 144 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 6347fbd7e..2d3326621 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1743,7 +1743,7 @@ module.exports = { afterthesoftwareversionupgraded:'软件版本号升级后', beforetheOSversionupgraded:'操作系统版本号升级前', aftertheoperatingsystemversionupgraded:'操作系统版本号升级后', - initialpackageforintegrityinflammatorydata:'初始软件包的完整性炎症数据', + initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据', upgradepackageintegrityverificationdata:'升级包完整性验证数据', upgradepackagesize:'升级包大小', differentialupgradeornot:'是否差分升级', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 07f92fd14..22bcac59c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -22,41 +22,39 @@ :columns="columns" style="margin-bottom: 20px" > - - - - {{ $t('yes') }} - {{ $t('not') }} - + + - - - - {{ $t('yes') }} - {{ $t('not') }} - + + - - - - - - + - - + + + + + + + + + + + + + + + + + + - {{$t('addcontroller')}} - {{$t('addfunction')}} - {{$t('delete')}} + {{$t('add')}} + {{$t('delete')}}
@@ -86,8 +84,7 @@ export default { return { dataSource: [ { - key:1, - functionname:'ceshi', + } ], loading: false, @@ -98,108 +95,83 @@ export default { align: 'left', dataIndex: 'functionname', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functionname' }, }, { - title: this.$t('configuration'), + title: this.$t('upgradedestinationype'), align: 'left', - dataIndex: 'configuration', + dataIndex: 'upgradedestinationype', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'upgradedestinationype' }, + }, + { + title: this.$t('adjustmentofchangedBulletinparameters'), + align: 'left', + dataIndex: 'adjustmentofchangedBulletinparameters', + ellipsis: true, + width: 170, + children: [ + { + title: this.$t('preupgrade'), + align: 'left', + dataIndex: 'preupgrade', + ellipsis: true, + width: 170, + scopedSlots: { customRender: 'preupgrade' }, + }, + { + title: this.$t('afterupgrade'), + align: 'left', + dataIndex: 'afterupgrade', + ellipsis: true, + width: 170, + scopedSlots: { customRender: 'afterupgrade' }, + }, + ] }, { - title: this.$t('whetheritcanbeupgraded'), + title: this.$t('functionalchangedescription'), align: 'left', - dataIndex: 'whetheritcanbeupgraded', + dataIndex: 'functionalchangedescription', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functionalchangedescription' }, }, { - title: this.$t('drivingautomationlevel'), + title: this.$t('variationofapplicableconditions'), align: 'left', - dataIndex: 'drivingautomationlevel', + dataIndex: 'variationofapplicableconditions', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'variationofapplicableconditions' }, }, { - title: this.$t('technicalparameters'), + title: this.$t('upgradetheelectroniccontrollerinvolved'), align: 'left', - dataIndex: 'technicalparameters', + dataIndex: 'upgradetheelectroniccontrollerinvolved', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' }, }, { title: this.$t('functiondescription'), align: 'left', dataIndex: 'functiondescription', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'functiondescription' }, }, { title: this.$t('applicationconditions'), align: 'left', dataIndex: 'applicationconditions', ellipsis: true, - width: 170 - }, - { - title: this.$t('controllerparameter'), - align: 'left', - dataIndex: 'controllerparameter', - ellipsis: true, width: 170, - children: [ - { - title: this.$t('electronic'), - align: 'left', - dataIndex: 'electronic', - ellipsis: true, - width: 170 - }, - { - title: this.$t('electroniccontrollerproductionenterprises'), - align: 'left', - dataIndex: 'electroniccontrollerproductionenterprises', - ellipsis: true, - width: 170 - }, - { - title: this.$t('electroniccontrollertype'), - align: 'left', - dataIndex: 'electroniccontrollertype', - ellipsis: true, - width: 170 - }, - { - title: this.$t('hardwareversioninformation'), - align: 'left', - dataIndex: 'hardwareversioninformation', - ellipsis: true, - width: 170 - }, - { - title: this.$t('softwaredevelopmententerprise'), - align: 'left', - dataIndex: 'softwaredevelopmententerprise', - ellipsis: true, - width: 170 - }, - { - title: this.$t('operatingsystemversion'), - align: 'left', - dataIndex: 'operatingsystemversion', - ellipsis: true, - width: 170 - }, - { - title: this.$t('inflammatorydata'), - align: 'left', - dataIndex: 'inflammatorydata', - ellipsis: true, - width: 170 - }, - ] + scopedSlots: { customRender: 'applicationconditions' }, }, + { title: this.$t('operation'), align: 'left', @@ -216,6 +188,7 @@ export default { }, mounted() { // this.getList() + this.getData() }, methods: { // 模板下载 @@ -250,12 +223,40 @@ export default { } }) }, + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ + this.dataSource =res.result.list == null ? {} : res.result.list + }) + }, + save(){ + postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + console.log(res); + this.$message.success(this.$t('SavedSuccessfully')) + }) + }, last(){ + this.save() this.$emit('beupgradedonlineup') }, next(){ + this.save() this.$emit('beupgradedonlinedown') }, + addlineAtBot(){ + let obj={} + this.dataSource.push(obj) + }, + deleteData(record){ + this.dataSource.splice(this.dataSource.indexOf(record),1) + }, uploadSuccess(data) { let attIdList = [] if (data && data.length > 0) { diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 8a9ba250d..4193f643a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -37,34 +37,28 @@ - + - + - + - + - - - - - - - + - + - + - + @@ -76,7 +70,7 @@ {{$t('uploadattachment')}}
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('next')}}
@@ -194,22 +188,7 @@ export default { width: 170, scopedSlots: { customRender: 'aftertheoperatingsystemversionupgraded' }, }, - { - title: this.$t('softwaredevelopmententerprise'), - align: 'left', - dataIndex: 'softwaredevelopmententerprise', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'softwaredevelopmententerprise' }, - }, - { - title: this.$t('initialpackageforintegrityinflammatorydata'), - align: 'left', - dataIndex: 'initialpackageforintegrityinflammatorydata', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'initialpackageforintegrityinflammatorydata' }, - }, + { title: this.$t('upgradepackageintegrityverificationdata'), align: 'left', @@ -252,6 +231,7 @@ export default { }, mounted() { // this.getList() + this.getData() }, methods: { // 模板下载 @@ -298,10 +278,31 @@ export default { } }) }, + getData(){ + let otaIdT=localStorage.getItem('otaIdT') + if(otaIdT==null){ + otaIdT='' + } + let otaId=localStorage.getItem('otaId') + if(otaId==null){ + otaId='' + } + getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ + this.dataSource =res.result.list == null ? {} : res.result.list + }) + }, + save(){ + postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + console.log(res); + this.$message.success(this.$t('SavedSuccessfully')) + }) + }, last(){ + this.save() this.$emit('upgradedonlineup') }, next(){ + this.save() this.$emit('upgradedonlinedown') }, addlineAtBot(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 754c0b314..e1769a475 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -360,10 +360,14 @@ import { message } from 'ant-design-vue' }) }, - async save(){ + save(){ this.$refs.ruleForm.validate(valid=>{ if(valid){ - postAction('/ota/otaBaCxJbxx/add',{ otaId:localStorage.getItem('otaId'),...this.form}).then( res => { + let otaId = localStorage.getItem('otaId') + if(otaId==null || otaId == undefined){ + otaId='' + } + postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => { if(res.code == 200){ localStorage.setItem('otaId', res.result.otaId) this.$message.success(this.$t('SavedSuccessfully')) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 0c2bb82ca..1a291a6cf 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -95,7 +95,7 @@
{{$t('fillincontent')}} - + {{ $t('yes') }} {{ $t('not') }} @@ -299,7 +299,7 @@ export default { }, dataSource: [ { - key: 'wlaqyqSl', + key: 'jgldSl', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), @@ -307,7 +307,7 @@ export default { fillincontent:this.$t('yesisselected'), }, { - key: 'wlaqyqBzwz', + key: 'jgldBzwz', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), @@ -315,7 +315,7 @@ export default { fillincontent:this.$t('forwardXquantity'), }, { - key: 'wlaqyqGgxh', + key: 'jgldGgxh', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('ineffectiveupgrades'), @@ -323,7 +323,7 @@ export default { fillincontent:this.$t('yesisselected'), }, { - key: 'wlaqyqScqy', + key: 'jgldScqy', val:'', componentname: this.$t('networksecurityrequirements'), configuration: this.$t('productionenterprise'), @@ -890,10 +890,6 @@ export default { this.dataSource.forEach(item=>{ for(let key in res.result.bj){ - if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0 && key !='id'){ - console.log(key); - res.result.bj[key]=Number(res.result.bj[key]) - } if(item.key==key){ item.val=res.result.bj[key] } From d47372e40d3f505ded10a991e7b6c66c4f416588 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 27 Mar 2023 13:44:30 +0800 Subject: [PATCH 5/8] =?UTF-8?q?bug=E4=BF=AE=E6=94=B967147=E5=92=8C67146?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) 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 df309f54b..e7331dcc2 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 @@ -2251,7 +2251,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList = Arrays.asList(transferUserId.split(",")); List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); this.sendMessageByTemplateId( @@ -2427,7 +2427,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - index = list.indexOf("截止日期") + 1; + index = list.indexOf("*截止日期") + 1; }else{ - index = list.indexOf("Due Date") + 1; + index = list.indexOf("*Due Date") + 1; } //创建临时文件夹 @@ -3087,25 +3087,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Mon, 27 Mar 2023 13:53:35 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E7=9C=8B=EF=BC=8C=E4=B8=8A=E4=BC=A0=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8D=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 13 +- .../components/editModel.vue | 274 +++++++++--------- 2 files changed, 155 insertions(+), 132 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 8417b5850..a3013d2a5 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -179,7 +179,7 @@
+ @click="clickButtonToUpload('deliverableTemplate',index,true)"> {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === '' || item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -719,12 +719,19 @@ } this.formInline = { ...this.formInline } }, - clickButtonToUpload(item, index) { + clickButtonToUpload(item, index,isTrue) { this.numIndex = index this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item - getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { + let ids = '' + console.log(index) + if (isTrue){ + ids = this.formInline.dataList[index][item] + }else{ + ids = this.formInline[item] + } + getAction('sys/common/getFileInfos', { id: ids }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 3b0869ae9..907e6582d 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -1,148 +1,153 @@ From aa9af81a8a0dd90751038302807c34fb0c46c4da Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 27 Mar 2023 14:05:41 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/ImportFileData/index.vue | 3 +++ .../vehicleinformation/components/basicInformation.vue | 2 +- .../vehicleinformation/components/beupgradedonline.vue | 2 +- .../vehicleinformation/components/recordparameters.vue | 2 +- .../vehicleinformation/components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradeRequirements.vue | 2 +- .../vehicleinformation/components/upgradedonline.vue | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/jero-web/src/components/ImportFileData/index.vue b/jero-web/src/components/ImportFileData/index.vue index db00c642c..23e53b99c 100644 --- a/jero-web/src/components/ImportFileData/index.vue +++ b/jero-web/src/components/ImportFileData/index.vue @@ -120,6 +120,9 @@ }) } else { if (this.isTrue) { + if(info.file.response.result != null && info.file.response.result.otaId){ + localStorage.setItem('otaId', info.file.response.result.otaId) + } this.$emit('getList',info.file.response.result) } else { eventBUs.$emit('searchGetData') diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 754c0b314..667cd5f32 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -2,7 +2,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 73ba83733..d952d59ea 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -2,7 +2,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 0c2bb82ca..f19001a77 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -2,7 +2,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 46b817dbf..5af1ca8bd 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -2,7 +2,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 7563136e2..a0c80c65d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -2,7 +2,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 09b03809d..9d3871bec 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -2,7 +2,7 @@
- +
From 2c85b35e5168394e867421c3168a8da8c46181d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 14:10:38 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=B8=A6=E5=85=A5=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0;=20=E4=B8=8D=E8=83=BD=E8=BD=AC?= =?UTF-8?q?=E5=8A=9E=E7=BB=99=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/certificationList/index.vue | 9 +++++++-- .../projectManagement/components/listOfRegulations.vue | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) 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/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..95cfd3f19 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -2511,7 +2511,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'))