diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 079c40133..ea739fe22 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -434,3 +434,6 @@ ALTER TABLE `project_related_personnel` ALTER TABLE `project_task_planning` ADD COLUMN `certification_submission` datetime(0) NULL COMMENT '认证提交' AFTER `attestation_start_time`; +-- 项目库-认证清单-认证目录 说明字段长度修改 2023-3-30 未同步生产环境 +ALTER TABLE `project_certification_directory` + MODIFY COLUMN `explain_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`; \ No newline at end of file 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 42836a268..f86813fb3 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 @@ -2663,6 +2663,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "报告编号不能超过200个字符, "; + }else{ + message = errorMsg + " The Report No cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } + //产品型号 + if(StringUtils.isNotBlank(productModel)){ + if(productModel.length() > 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "产品型号不能超过200个字符, "; + }else{ + message = errorMsg + " The Product Model cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } + //生产企业名称 + if(StringUtils.isNotBlank(productionEnterpriseName)){ + if(productionEnterpriseName.length() > 200){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ + message = errorMsg + "生产企业名称不能超过200个字符, "; + }else{ + message = errorMsg + " The Name Of Manufacturer cannot contain more than 200 characters, "; + } + msgList.add(message); + } + } //WVTA ID if(StringUtils.isNotBlank(wvtaId)){ - if(wvtaId.length() > 100){ + if(wvtaId.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能超过100个字符, "; + message = errorMsg + "WVTA ID不能超过300个字符, "; }else{ - message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; + message = errorMsg + " The WVTA ID cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3025,12 +3068,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ + if(category.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "类别不能超过100个字符, "; + message = errorMsg + "类别不能超过300个字符, "; }else{ - message = errorMsg + " The Category cannot contain more than 100 characters, "; + message = errorMsg + " The Category cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3049,9 +3092,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ - message = errorMsg + "检验项目不能超过100个字符, "; + message = errorMsg + "检验项目不能超过300个字符, "; }else{ - message = errorMsg + " The InspectionItem cannot contain more than 100 characters, "; + message = errorMsg + " The InspectionItem cannot contain more than 300 characters, "; } msgList.add(message); } @@ -3067,12 +3110,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 100){ + if(configItem.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){ message = errorMsg + "配置项不能超过100个字符, "; }else{ - message = errorMsg + " The ConfigItem cannot contain more than 100 characters, "; + message = errorMsg + " The ConfigItem cannot contain more than 300 characters, "; } msgList.add(message); } 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 34bc2d6d0..01db4e5b0 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 @@ -9741,7 +9741,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ if(res.code==200){ + if(res.result.zxsj==0){ + res.result.zxsj=null + } this.form=res.result==null ? { sjmd:'', // fhgd:1, @@ -395,6 +399,9 @@ this.$forceUpdate() otaId='' } this.form.otaId=otaId + if(this.form.zxsj==undefined){ + this.form.zxsj=0 + } postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 6a806d92a..54ccc17db 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -316,8 +316,8 @@ import ImportFile from '@/components/ImportFileData/index' this.form.cpmc = item.cpmc this.form.cpxh = item.cpxh getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ - this.form.dllx1=res.result.dllx1 - this.form.dllx2=res.result.dllx2 + this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1 + this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2 this.$forceUpdate() }) } diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index e2dbcf92d..27d90dfd9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -156,7 +156,7 @@ {{$t('Vehicledynamictype')}} - + @@ -165,7 +165,7 @@ - + @@ -326,6 +326,7 @@ import { message } from 'ant-design-vue' this.form.cpxh=res.result.cpxh this.form.txzd=res.result.txzd this.form.txzd=res.result.txzd + this.form.cdotasj=res.result.cdotasj this.form.id=res.result.id if(this.$route.query.type == 1 && res.result.cxmb == null){ this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh @@ -338,8 +339,14 @@ import { message } from 'ant-design-vue' if(res.result.dllx2 == null){ res.result.dllx2 = undefined } + + if(res.result.cplb == null){ + res.result.cplb = undefined + } this.form.dllx1=res.result.dllx1 this.form.dllx2=res.result.dllx2 + this.form.cplb=res.result.cplb + this.getDllx2() // this.changeSelect() this.$forceUpdate() } @@ -366,6 +373,7 @@ import { message } from 'ant-design-vue' 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) @@ -387,6 +395,24 @@ import { message } from 'ant-design-vue' }else{ this. projectNameList2=['其他'] } + }, + getDllx2(){ + if(this.form.dllx1==undefined){ + this.projectNameList=[] + } + if(this.form.dllx1=='传统动力汽车'){ + this. projectNameList2=['汽油','柴油'] + } + if(this.form.dllx1=='节能汽车'){ + this. projectNameList2=['混合动力','天然气','甲醇','其他'] + } + if(this.form.dllx1=='新能源汽车'){ + this. projectNameList2=['纯电动','插电式混合动力','燃料电池'] + } + if(this.form.dllx1=='其他'){ + this. projectNameList2=['其他'] + } + }, update(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 54953b5d8..d57a5aa42 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -253,7 +253,7 @@ import ImportFile from '@/components/ImportFileData/index' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last(){ @@ -284,7 +284,7 @@ import ImportFile from '@/components/ImportFileData/index' } button{ - width: 89px; + //width: 89px; border-radius: 4px; cursor: pointer; background: #00B3BE; diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 70cdeba6a..42d0199c9 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -299,7 +299,7 @@ export default { this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last() { @@ -323,7 +323,7 @@ export default { } button { - width: 89px; + /*width: 89px;*/ border-radius: 4px; cursor: pointer; background: #00B3BE; diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue index 69d150010..ddba93e87 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue @@ -168,7 +168,7 @@ export default { ids:this.ids } this.confirmLoading = true - postAction('ota/otaBaSjList/batchRecord', query).then((res) => { + postAction('ota/otaBaCxList/batchRecord', query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index f1fda8f8b..548f3c44d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -15,10 +15,10 @@
-
- {{$t('CertificationListName')}} +
+ {{$t('marketCertificationList')}}
-
@@ -87,7 +87,7 @@ selectedRowKeys: [], columns: [ { - title: this.$t('CertificationListName'), + title: this.$t('marketCertificationList'), dataIndex: 'name', align: 'left', ellipsis: true, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 0c407627d..e4b0bf2b9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -162,7 +162,7 @@
- + {{ $t('processReset') }}
diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue index c26d49d02..8a661ce0e 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue @@ -242,7 +242,22 @@ export default { }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + if (res.result && res.result.length > 0) { + let detailedWarningList = [] + res.result.forEach(val => { + detailedWarningList.push( + < div > { val } < /div>) + }) + this.$warning({ + content: ( + < div > + { detailedWarningList } + < /div> + ) + }) + } else { + this.$message.success(this.$t('OperationSuccessful')) + } this.visible = false this.selectedRowKeys = [] this.$emit('transferListFormHomo')