diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 533f02122..78cb0073e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1834,4 +1834,5 @@ module.exports = { deliveryTime:'Delivery Time', expectedDeliveryTime:'Expected Delivery Time', changeAuthor:'Change Author', + requireddataisnull:'Required data is null', } \ 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 e9e2d3a19..b85aebf9b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1935,4 +1935,5 @@ module.exports = { deliveryTime:'交付时间', expectedDeliveryTime:'预计交付时间', changeAuthor:'更改作者', + requireddataisnull:'必填数据为空', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 177f37626..834913b6c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -296,6 +296,10 @@ export default { } }) + }else{ + // let otaflag = 3 + this.$message.warning(this.$t('requireddataisnull')) + // localStorage.setItem('otaflag',otaflag) } // else { // this.form.bapc = undefined diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue index adbea406a..bef35b668 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue @@ -228,7 +228,16 @@ export default { } else if(this.oldName == this.$t('informationaboutotherupgradetasks')){ this.$refs.otherRef.save() } - this.oldName = tab + setTimeout(()=>{ + let otaflag = localStorage.getItem('otaflag') + if(otaflag){ + console.log(otaflag) + this.tabActive = this.$t('upgradetargetmodel') + this.oldName = this.$t('upgradetargetmodel') + } + this.oldName = tab + },1000) + localStorage.removeItem('otaflag') }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index e76322d82..f9cff0d45 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -20,7 +20,7 @@ - + {{ item.value }} @@ -33,15 +33,15 @@
{{$t('theNameOfFirm')}}
- + - + :max-length="50" + class="box-input" + :placeholder="$t('pleaseEnter')" + :title='form.qymc' + disabled + v-model="form.qymc"> + @@ -51,15 +51,15 @@ * {{$t('registrationnumber')}} - + + :max-length="50" + :disabled="disabled" + :title='form.djbh' + class="box-input" + :placeholder="$t('pleaseEnter')" + v-model.trim="form.djbh"> @@ -88,13 +88,13 @@ - + :max-length="500" + :disabled="disabled" + :title='form.ggpc' + class="box-input" + :placeholder="$t('pleaseEnter')" + v-model="form.ggpc"> + @@ -105,13 +105,13 @@ - + :max-length="50" + :disabled="disabled" + :title='form.cpsb' + class="box-input" + :placeholder="$t('pleaseEnter')" + v-model="form.cpsb"> + @@ -122,13 +122,13 @@ - + :max-length="50" + :disabled="disabled" + :title='form.cpmc' + class="box-input" + :placeholder="$t('pleaseEnter')" + v-model="form.cpmc"> + @@ -140,13 +140,13 @@ - + :max-length="50" + :disabled="disabled" + :title='form.cpxh' + class="box-input" + :placeholder="$t('pleaseEnter')" + v-model="form.cpxh"> + @@ -155,44 +155,44 @@
{{$t('Vehicledynamictype')}}
- +
- - - - - - - + + + + + + + -
-
- - - {{ item.text }} - + :disabled="disabled" + :dictCode="'vehicle_dynamic_type'" + :placeholder="$t('PleaseSelect')" + :type="'select'" + @input="changeSelect(form.dllx1)" + :triggerChange="false" + v-model="form.dllx1"/> +
+
+ + + {{ item.text }} + - - - - - - - - + + + + + + + + +
- -
+
@@ -202,12 +202,12 @@ + :disabled="disabled" + :dictCode="'communication_terminal'" + :placeholder="$t('PleaseSelect')" + :type="'select'" + :triggerChange="false" + v-model="form.txzd"/> @@ -218,11 +218,11 @@ + /> @@ -237,318 +237,323 @@ \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue index 7f291a631..cfe55aff3 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue @@ -7,11 +7,11 @@ {{$t('fillintherecord')}} - - - - - + + + + + @@ -216,7 +216,9 @@ export default { tabClick(tab,event){ this.tabActive=tab if(this.oldName == this.$t('basicinformationofvehicletype')){ + this.$refs.dealtWithRef.save() + } else if(this.oldName == this.$t('onlineupgraderequirements')){ this.$refs.doneListRef.save() } else if(this.oldName == this.$t('safetymeasure')){ @@ -230,7 +232,17 @@ export default { } else if(this.oldName == this.$t('other')){ this.$refs.otherRef.save() } - this.oldName = tab + setTimeout(()=>{ + let otaflag = localStorage.getItem('otaflag') + if(otaflag){ + console.log(otaflag) + this.tabActive = this.$t('basicinformationofvehicletype') + this.oldName = this.$t('basicinformationofvehicletype') + } + this.oldName = tab + },1000) + localStorage.removeItem('otaflag') + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus @@ -286,44 +298,44 @@ export default { }, basicInformationForm(){ this.tabActive = this.$t('onlineupgraderequirements') - + }, upgradeRequirementsup(){ this.tabActive = this.$t('basicinformationofvehicletype') - + }, upgradeRequirementsdown(){ this.tabActive = this.$t('safetymeasure') }, safetyPrecautionsup(){ this.tabActive = this.$t('onlineupgraderequirements') - + }, safetyPrecautionsdown(){ this.tabActive = this.$t('upgradedonline') }, upgradedonlineup(){ this.tabActive = this.$t('safetymeasure') - + }, upgradedonlinedown(){ this.tabActive = this.$t('beupgradedonline') - + }, beupgradedonlineup(){ this.tabActive = this.$t('upgradedonline') - + }, beupgradedonlinedown(){ this.tabActive = this.$t('recordparameters') - + }, recordparametersup(){ this.tabActive = this.$t('beupgradedonline') }, recordparametersdown(){ this.tabActive = this.$t('other') - + }, otherup(){ this.tabActive = this.$t('recordparameters')