From 1de643d453011a81a600ddb536f5ef4c61aa38fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 16 Apr 2023 14:33:56 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 18 ++++++++++--- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 26 +++++++++++++++--- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 27 ++++++++++++++++--- .../impl/OtaBaSjSjfzbhServiceImpl.java | 17 +++++++++--- .../impl/OtaBaSjSjxtbhServiceImpl.java | 23 +++++++++++++--- 5 files changed, 91 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index b45ceda41..6adca19af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -17,10 +17,7 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -871,25 +868,38 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId); int startRow = 63; for (OtaBaCxSjmk sjmk : sjmkList) { row = s.createRow(startRow); cell = row.createCell(0); + cell.setCellStyle(style); cell.setCellValue(sjmk.getBjmc()); cell = row.createCell(1); + cell.setCellStyle(style); cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(sjmk.getPzqk())); cell = row.createCell(2); + cell.setCellStyle(style); cell.setCellValue(sjmk.getKzqmc()); cell = row.createCell(3); + cell.setCellStyle(style); cell.setCellValue(sjmk.getYjggxh()); cell = row.createCell(4); + cell.setCellStyle(style); cell.setCellValue(sjmk.getYjscqy()); cell = row.createCell(5); + cell.setCellStyle(style); cell.setCellValue(sjmk.getRjbb()); cell = row.createCell(6); + cell.setCellStyle(style); cell.setCellValue(sjmk.getRjkfqy()); cell = row.createCell(7); + cell.setCellStyle(style); cell.setCellValue(sjmk.getBzwz()); startRow++; } 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 4deb3da19..946350682 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 @@ -20,10 +20,7 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -340,44 +337,65 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl mccsList = this.getByOtaId(otaId); Workbook wb = ImportFileUtil.readExcel(file); Sheet s = wb.getSheetAt(0); + CellStyle style = wb.createCellStyle(); + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); int startRow = 3; for (int i = 0; i < mccsList.size(); i++) { OtaBaCxKsjjsmccs mccs = mccsList.get(i); Row row = s.getRow(startRow); Cell cell = row.createCell(0); + cell.setCellStyle(style); cell.setCellValue(mccs.getGnmc()); cell = row.createCell(1); + cell.setCellStyle(style); cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(mccs.getPzqk())); cell = row.createCell(2); + cell.setCellStyle(style); cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj())); cell = row.createCell(3); + cell.setCellStyle(style); cell.setCellValue(ComparisonUtil.queryDictTextByKey("driving_automation_level", mccs.getJszdhjb(), sysDictService)); cell = row.createCell(4); + cell.setCellStyle(style); cell.setCellValue(mccs.getSjggcs()); cell = row.createCell(5); + cell.setCellStyle(style); cell.setCellValue(mccs.getGnms()); cell = row.createCell(6); + cell.setCellStyle(style); cell.setCellValue(mccs.getSytj()); cell = row.createCell(7); + cell.setCellStyle(style); cell.setCellValue(mccs.getKzqmc()); cell = row.createCell(8); + cell.setCellStyle(style); cell.setCellValue(mccs.getKzqscqy()); cell = row.createCell(9); + cell.setCellStyle(style); cell.setCellValue(mccs.getKzqxh()); cell = row.createCell(10); + cell.setCellStyle(style); cell.setCellValue(mccs.getYjbbxx()); cell = row.createCell(11); + cell.setCellStyle(style); cell.setCellValue(mccs.getRjkfqy()); cell = row.createCell(12); + cell.setCellStyle(style); cell.setCellValue(mccs.getCzxtbbh()); cell = row.createCell(13); + cell.setCellStyle(style); cell.setCellValue(mccs.getCsyzsj()); startRow++; } Row row = s.createRow(startRow); Cell cell = row.createCell(0); + cell.setCellStyle(style); cell.setCellValue("证明材料"); cell = row.createCell(1); + cell.setCellStyle(style); OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); if (ObjectUtils.isNotEmpty(otaBaCxList)) { StringBuilder sb = new StringBuilder(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index 4c389e199..c780fa0ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -20,10 +20,7 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -414,19 +411,28 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl mccsList = this.getByOtaId(otaId); Workbook wb = ImportFileUtil.readExcel(file); Sheet s = wb.getSheetAt(0); + CellStyle style = wb.createCellStyle(); + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); int startRow = 3; for (OtaBaCxKsjxtmccs mccs : mccsList) { Row row = s.getRow(startRow); Cell cell = row.createCell(0); + cell.setCellStyle(style); cell.setCellValue(mccs.getXtlb()); cell = row.createCell(1); + cell.setCellStyle(style); cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj())); cell = row.createCell(2); + cell.setCellStyle(style); cell.setCellValue(mccs.getSjbgcs()); cell = row.createCell(3); + cell.setCellStyle(style); StringBuilder sb = new StringBuilder(); String tptStr = mccs.getTpt(); if (StringUtils.isNotEmpty(tptStr)) { @@ -446,26 +452,37 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl Date: Sun, 16 Apr 2023 14:37:11 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=92=8C=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=90=8D=E7=A7=B0=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/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/transferListvirtal.vue | 8 +- .../components/virtualListDetails.vue | 102 +++++++++--------- .../views/documentTools/virtualList/index.vue | 18 ++-- .../components/referenceDeliverablesList.vue | 11 +- .../components/transferListvirtal.vue | 2 +- .../components/certificationList/index.vue | 6 +- .../components/listOfRegulations.vue | 2 +- .../components/transferListvirtal.vue | 8 +- .../components/SentList.vue | 6 +- .../components/dealtWith.vue | 6 +- .../components/designCompliance.vue | 8 +- .../components/doneList.vue | 6 +- .../components/referenceDeliverablesList.vue | 14 ++- .../reviewedByThePersonInCharge.vue | 3 +- .../projectRegulationTasks/index.vue | 12 +-- .../views/virtualAuthenticationList/index.vue | 18 ++-- 18 files changed, 125 insertions(+), 107 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d5e94d464..040338da3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1787,4 +1787,5 @@ module.exports = { pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login', cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas', lidar:'lidar', + history:'History', } \ 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 4b1e269d1..325de7d36 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1889,4 +1889,5 @@ module.exports = { pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据', cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人', lidar:'激光雷达', + history:'历史', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue index 31bb656b7..466be2b80 100644 --- a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue +++ b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue @@ -2,7 +2,7 @@
-
- {{$t('VirtualListName')}} +
+ {{$t('marketRegulationList')}}
-
@@ -54,7 +54,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 300px)'}" :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" @change="tableOnChange" @@ -119,12 +119,12 @@
* - {{$t('VirtualListName')}} + {{$t('marketRegulationList')}}
+ :placeholder="$t('PleaseEnter')+$t('marketRegulationList')"/>
@@ -180,12 +180,12 @@ name: [ { required: true, - message: this.$t('VirtualListName') + this.$t('cannotEmpty'), + message: this.$t('marketRegulationList') + this.$t('cannotEmpty'), trigger: 'blur' }, { max: 100, - message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('marketRegulationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'), trigger: 'blur' } ], @@ -218,7 +218,7 @@ title: this.$t('newlyAdded'), columns: [ { - title: this.$t('VirtualListName'), + title: this.$t('marketRegulationList'), align: 'left', dataIndex: 'name', width: '40', diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index f9fa721ef..2a67fb149 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -33,10 +33,10 @@ @@ -87,6 +87,13 @@ dataIndex: 'studioEngineerName', align: 'left', ellipsis: true, + width: 140 + }, + { + title: this.$t('explain'), + dataIndex: 'explanation', + align: 'left', + ellipsis: true, width: 223 } ], diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue index e9c82a9db..2e7c52030 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue @@ -45,7 +45,7 @@ - {{ $t('modifyHistory') }} + {{ $t('history') }} {{textLoading}} - {{$t('referenceDeliverables')}} -
+ {{$t('referenceDeliverables')}} + @@ -87,6 +87,13 @@ dataIndex: 'studioEngineerName', align: 'left', ellipsis: true, + width: 140 + }, + { + title: this.$t('explain'), + dataIndex: 'explanation', + align: 'left', + ellipsis: true, width: 223 } ], @@ -151,6 +158,9 @@ }, onSelectChange(value) { this.selectedRowKeys = value + if (this.selectedRowKeys.length > 1) { + this.selectedRowKeys.shift() + } }, handleCancel() { this.visible = false diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index c2563a666..81e29ade2 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -2,8 +2,7 @@
- {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || $route.query.TaskKey - == 'dezrrtjjfw' + {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw' ? $t('personLiableConfirm'):$t('sponsorReview')}}
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index b08a13f0c..beb513a27 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -23,10 +23,10 @@
-
- {{$t('taskType')}} +
+ {{$t('ProcessType')}}
-
-
- {{$t('taskStatus')}} +
+ {{$t('ProcessStatus')}}
-
-
- {{$t('CertificationListName')}} +
+ {{$t('marketCertificationList')}}
-
@@ -114,12 +114,12 @@
* {{$t('CertificationListName')}} + :title="$t('marketCertificationList')">{{$t('marketCertificationList')}}
+ :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"/>
@@ -167,12 +167,12 @@ name: [ { required: true, - message: this.$t('CertificationListName') + this.$t('cannotEmpty'), + message: this.$t('marketCertificationList') + this.$t('cannotEmpty'), trigger: 'blur' }, { max: 100, - message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('marketCertificationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'), trigger: 'blur' } ], @@ -212,10 +212,10 @@ dataSource: [], columns: [ { - title: this.$t('CertificationListName'), + title: this.$t('marketCertificationList'), align: 'left', dataIndex: 'name', - width: '40%', + width: '40', ellipsis: true, scopedSlots: { customRender: 'CertificationListName' } }, From ebf12248861aaf018bf51ec44b225f8026f9cbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 16 Apr 2023 14:42:23 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/ota/utils/ImportFileUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index d897a2a05..3fe884ac6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -515,7 +515,11 @@ public class ImportFileUtil { // 需要保留原来的文件结构时,需要对空文件夹进行处理 if (KeepDirStructure) { // 空文件夹的处理 - zos.putNextEntry(new ZipEntry(name + "/")); + ZipEntry folderEntry = new ZipEntry(name + "/"); + folderEntry.setMethod(ZipEntry.STORED); + folderEntry.setSize(0); + folderEntry.setCrc(0); + zos.putNextEntry(folderEntry); // 没有文件，不需要文件的copy zos.closeEntry(); } From 798250342898bdfd2e5cd9c2e7fc78ebf2a21fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 16 Apr 2023 15:09:44 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=BA=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=E9=80=80=E5=9B=9E=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=86=8D=E6=AC=A1=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 6 ++- jero-web/src/common/lang/zh-cn.js | 6 ++- .../components/listEditModel.vue | 12 ++--- .../components/listOfRegulations.vue | 45 +++++++++++++------ .../components/confirmationDrawer.vue | 2 +- .../components/designCompliance.vue | 2 +- 6 files changed, 47 insertions(+), 26 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 040338da3..578c718d8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1115,7 +1115,7 @@ module.exports = { requiredParametersEmpty: 'Required parameters cannot be empty', PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', theProjectContactEmpty: 'The project contact person of cannot be empty', - pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List to be Published or whose verification compliance confirmation process status is List to be Published', + pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List Pending Release, Regulatory Engineer Returned or Verification Compliance Confirmation Process status is List Pending Release, Regulatory Engineer Returned', TheEngineerAndCertification: 'The regulatory engineer of cannot be empty', pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected', theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank', @@ -1748,7 +1748,7 @@ module.exports = { databasereportingtime:'Synchronize the database reporting time', synchronizationtime:'Synchronization time', listToBeReleased:'List to be released', - listToBeChecked:'List to be checked', + listToBeChecked:'Task to be initiated', taskToBeConfirmed:'Task to be confirmed', resultsToBeSubmitted:'Results to be submitted', resultsToBeReviewed:'Results to be reviewed', @@ -1788,4 +1788,6 @@ module.exports = { cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas', lidar:'lidar', history:'History', + deliveryDate:'Delivery Date', + regulatoryEngineerReturns:'Regulatory engineer returns', } \ 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 325de7d36..781dbddd3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -710,7 +710,7 @@ module.exports = { listConfirmation: '清单确认', ListConfirmationDeadline: '清单确认截止时间', dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', - pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布或验证符合性确认流程状态为清单待发布的数据', + pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据', pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据', TheEngineerAndCertification: '的法规工程师不能为空', taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空', @@ -1850,7 +1850,7 @@ module.exports = { databasereportingtime: '同步上报库时间', synchronizationtime: '同步时间', listToBeReleased: '清单待发布', - listToBeChecked: '清单待校核', + listToBeChecked: '任务待发起', taskToBeConfirmed: '任务待确认', resultsToBeSubmitted: '结果待提交', resultsToBeReviewed: '结果待审查', @@ -1890,4 +1890,6 @@ module.exports = { cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人', lidar:'激光雷达', history:'历史', + deliveryDate:'交付日期', + regulatoryEngineerReturns:'法规工程师退回', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 31834d650..19c079083 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -211,14 +211,14 @@ * {{$t('cutoffTime')}} + :title="$t('deliveryDate')">{{$t('deliveryDate')}}
+ message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]"> * {{$t('cutoffTime')}} + :title="$t('deliveryDate')">{{$t('deliveryDate')}}
+ message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]"> {{text}} @@ -355,7 +358,8 @@ {{text}} @@ -776,7 +780,7 @@ ellipsis: true }, { - title: this.$t('TaskCutOffTime'), + title: this.$t('deliveryDate'), dataIndex: 'designDueDate', align: 'left', ellipsis: true, @@ -822,7 +826,7 @@ sorter: true }, { - title: this.$t('TaskCutOffTime'), + title: this.$t('deliveryDate'), dataIndex: 'verifyDueDate', align: 'left', ellipsis: true, @@ -1048,9 +1052,9 @@ }, { sort: '', - name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'), + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliveryDate'), headFieldCn: '截止时间', - headFieldEn: 'Due Date', + headFieldEn: 'Delivery Date', field: 'designDueDate', affirmFlag: '1', key: 23, @@ -1098,9 +1102,9 @@ }, { sort: '', - name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'), - headFieldCn: '截止时间', - headFieldEn: 'Due Date', + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliveryDate'), + headFieldCn: '交付日期', + headFieldEn: 'Delivery Date', field: 'verifyDueDate', affirmFlag: '3', key: 33, @@ -1240,6 +1244,11 @@ key: 'List to be released', label: this.$t('listToBeReleased') }, + { + value: 'Regulatory engineer returns', + key: 'Regulatory engineer returns', + label: this.$t('regulatoryEngineerReturns') + }, { value: 'Duty Person Rejected', key: 'Duty Person Rejected', @@ -1296,6 +1305,11 @@ key: 'List to be released', label: this.$t('listToBeReleased') }, + { + value: 'Regulatory engineer returns', + key: 'Regulatory engineer returns', + label: this.$t('regulatoryEngineerReturns') + }, { value: 'Duty Person Rejected', key: 'Duty Person Rejected', @@ -1749,9 +1763,9 @@ } } } - if (!isTrue){ - this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code,content[0]) - }else{ + if (!isTrue) { + this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code, content[0]) + } else { this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code) } } else { @@ -2369,7 +2383,7 @@ 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) { + if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) { this.columnsAll[j].children[k] = this.column[i].children[l] } } @@ -2381,7 +2395,7 @@ 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) { + if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) { this.columnsAll[j].children[k] = this.column[i].children[l] } } @@ -2475,7 +2489,10 @@ } } for (let i = 0; i < dataSource.length; i++) { - if (dataSource[i].verifyFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'List to be released') { + if (dataSource[i].verifyFlowStatus == 'List to be released' || + dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' || + dataSource[i].designFlowStatus == 'List to be released' || + dataSource[i].designFlowStatus == 'Regulatory engineer returns') { if (dataSource[i].regulationOwnerId) { this.detailedSuccessList.push(dataSource[i]) } else { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue index 5803af6d8..77a1dc0a6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue @@ -180,7 +180,7 @@ width: 120 }, { - title: this.$t('closingDate'), + title: this.$t('deliveryDate'), align: 'left', dataIndex: 'endTime', ellipsis: true, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index df825bea2..3def13ac9 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -221,7 +221,7 @@ value: this.queryData.personLiable }, { - title: this.$t('cutoffTime'), + title: this.$t('deliveryDate'), value: this.queryData.DueDate }, { From 3c3a0e8f593d12e05fcc09cfdb2d90ef8cc4b491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 16 Apr 2023 15:33:45 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/service/impl/OtaBaSjListServiceImpl.java | 8 ++++---- .../ota/service/impl/OtaBaSjSjfzbhServiceImpl.java | 4 ++-- .../ota/service/impl/OtaBaSjSjmbclServiceImpl.java | 4 ++-- .../ota/service/impl/OtaBaSjSjxtbhServiceImpl.java | 4 ++-- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 5 ++++- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index c6eb79457..eed1392ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -200,8 +200,8 @@ public class OtaBaSjListServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级的驾驶辅助功能与参数变化.xlsx")) { + if (f.getName().equals("本次升级的驾驶辅助功能名称与参数变化.xlsx")) { upFile = f; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index c9023e723..22d14668c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -177,14 +177,14 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级涉及的目标车辆.xlsx")) { + if (f.getName().equals("本次升级的目标车辆.xlsx")) { upFile = f; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index b9941ab85..54a126f67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -197,7 +197,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级的系统名称与变更参数.xlsx")) { + if (f.getName().equals("本次升级的系统名称与参数变化.xlsx")) { upFile = f; } } 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 22bee1dfe..f2cb2733b 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 @@ -11343,7 +11343,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Sun, 16 Apr 2023 15:45:24 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E9=80=80=E5=9B=9E=E5=90=8E=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 f2cb2733b..9737fc51e 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 @@ -11350,10 +11350,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Sun, 16 Apr 2023 15:49:42 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../informationaboutotherupgradetasks.vue | 231 +++++++++--------- 1 file changed, 116 insertions(+), 115 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index 6a2a843c1..b85422476 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -68,139 +68,140 @@ \ No newline at end of file From 1d41e7299c4fb36c479f14c94367b46fe373f3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 16 Apr 2023 16:18:10 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E5=8F=B7=E5=8D=95=E9=80=89=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addCodeNumber.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue index bc56236c8..7fecfbea3 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue @@ -66,7 +66,7 @@ :scroll="{x: '100%',y:'calc(100vh - 300px)'}" :data-source="dataList" :pagination="false" - :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' ' , type:'radio'}" + :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}" :loading="loading">
@@ -204,7 +204,13 @@ }, onSelectChange(value, row) { this.selectedRowKeys = value + if (this.selectedRowKeys.length > 1) { + this.selectedRowKeys.shift() + } this.selectedRowList = row + if (this.selectedRowList.length > 1) { + this.selectedRowList.shift() + } }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { From 0ac6f6050b16ab49a3a7ec341981a9494d71f1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 16 Apr 2023 20:27:12 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e414b9d37..48a7d7bfd 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -97,10 +97,10 @@ style="overflow:hidden;margin-bottom: 20px">
-
- - 重置流程（数据迁移） -
+ + + +
@@ -2982,28 +2982,28 @@ download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) }, - profileClick() { - let _this = this - this.$confirm({ - width: 760, - content: _this.$t('NoteConfirmTheChange'), - onOk() { - let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - postAction('/project/projectLawsInventoryEO/resetFlowTemp', { - ids: idList.join(','), - projectLibraryId: _this.$route.query.id - }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) - } + // profileClick() { + // let _this = this + // this.$confirm({ + // width: 760, + // content: _this.$t('NoteConfirmTheChange'), + // onOk() { + // let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + // postAction('/project/projectLawsInventoryEO/resetFlowTemp', { + // ids: idList.join(','), + // projectLibraryId: _this.$route.query.id + // }).then((res) => { + // if (res.success) { + // _this.$message.success(_this.$t('OperationSuccessful')) + // _this.selectedRowKeys = [] + // _this.getList() + // } else { + // _this.$message.warning(_this.$t('operationFailed')) + // } + // }) + // } + // }) + // } } } From 7855f487b63da4ba2fcd0a64594d9db6080f4365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 16 Apr 2023 21:22:25 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E7=9A=84=E7=82=B9=E5=87=BB?= 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 48a7d7bfd..b170cb087 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1557,7 +1557,7 @@ designFlowStatusClick(row, name) { let query = {} let TaskKey = '' - if (name == this.$t('designComplianceReview')) { + if (name == this.$t('designComplianceProcess')) { if (row.designFlowStatus == 'Task to be confirmed' || row.designFlowStatus == 'Duty Person Rejected') { TaskKey = 'zrrqr' } else if (row.designFlowStatus == 'Results to be submitted') {