Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -393,6 +393,8 @@ export default {
     },
     // 创建车型
     createvehicleandfunctionrecords() {
+      localStorage.removeItem('otaId')
+      localStorage.removeItem('otaIdT')
       this.$router.push({
         path: '/upgradeactivityrecord',
         query: {}

jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 第五页 -->
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">

jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 第七页 -->
   <div class="box">
     <a-spin :spinning="confirmLoading">
       <a-form-model class="formAdd" ref="ruleForm">

jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 第二页 -->
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
@@ -11,7 +12,7 @@
       </div>
     </div>
     <a-spin :spinning="confirmLoading">
-      <a-form-model class="formAdd" ref="ruleForm">
+      <a-form-model class="formAdd" ref="ruleForm" :model="formInline">
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text-add">
@@ -21,6 +22,7 @@
               <a-form-model-item class="itemModel" prop="dutyTerritory">
                 <a-input class="box-input"
                          :disabled="disabled"
+                         v-model="formInline.zsl"
                          :placeholder="$t('PleaseSelect')"></a-input>
               </a-form-model-item>
             </div>
@@ -33,11 +35,9 @@
                 {{$t('dateofproduction')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="dateofproduction">
-                <a-date-picker class="box-input"
+                <a-range-picker class="box-input"
                                :placeholder="$t('PleaseSelect')+$t('dateofproduction')"
-                               @change="dateChange({db_field_name:'dateofproduction'})"
                                format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.dateofproduction"
                                :disabled="false"
                                style="width: 100%"/>
@@ -79,14 +79,16 @@
                                 formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                                 }}
                               </a-button>
+                              <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
                             </a-form-model-item>
             </div>
           </a-col>
         </a-row>
+        
       </a-form-model>
     </a-spin>
     <div class="bootom-button">
-      <a-button class='btn' style='margin-right: 50px'>{{$t('preservation')}}</a-button>
+      <a-button class='btn' style='margin-right: 50px' @click="save">{{$t('preservation')}}</a-button>
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
       <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
@@ -100,6 +102,7 @@ import moment from 'moment'
 export default {
   name: 'basicInformation',
   components:{
+    uploadFile
   },
   data() {
     return {
@@ -112,15 +115,24 @@ export default {
 
   },
   methods: {
+    save(){
+      let obj={}
+      obj.zsl = this.formInline.zsl
+      obj.scrqks = this.formInline.dateofproduction[0]
+      obj.scrqjs = this.formInline.dateofproduction[1]
+      obj.VINcodelist = this.formInline.VINcodelist
+        postAction('ota/otaBaSjSjmbcl/add',obj).then(res=>{
+          console.log(res);
+        })
+    },
     next(){
+      this.save()
       this.$emit('upgradeRequirementsdown')
     },
     last(){
+      this.save()
       this.$emit('upgradeRequirementsup')
     },
-    dateChange(item) {
-      this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
-    },
     clickButtonToUpload(item) {
       this.$refs.uploadFile.perentHandleFunc()
       this.$refs.uploadFile.visible = true

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 第四页 -->
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 第三页 -->
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 第一页 -->
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">

jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 第六页 -->
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">

jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue

@@ -339,18 +339,27 @@ import { message } from 'ant-design-vue'
          
       },
       next(){
-         this.save()
+        this.$refs.ruleForm.validate(valid=>{
+          if(valid){
+            this.save()
          setTimeout(()=>{
           this.$emit('basicInformationForm')
          },1000)
         
+          }
+        })
+        
       },
       async save(){
-           postAction('/ota/otaBaCxJbxx/add',{ otaId:localStorage.getItem('otaId'),...this.form}).then( res => {
+        this.$refs.ruleForm.validate(valid=>{
+          if(valid){
+            postAction('/ota/otaBaCxJbxx/add',{ otaId:localStorage.getItem('otaId'),...this.form}).then( res => {
            if(res.code == 200){
             localStorage.setItem('otaId', res.result.otaId)
           }
         })
+          }
+        })
       },
       changeSelect(target){
         this.form.dllx2=undefined

jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue

@@ -135,7 +135,7 @@ import ImportFile from '@/components/ImportFileData/index'
             gnmc:'百区监测(BSD)',
           },
           {
-            gnmc:'驻员疲劳篮澳CDFM)',
+            gnmc:'驾驶员疲劳监测(DFM)',
           },
           {
             gnmc:'自动紧急制动(AEB)',

jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue

@@ -890,7 +890,7 @@ 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){
+                  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])
                   }