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

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

@@ -12,7 +12,7 @@
     </div>
   
     <a-spin :spinning="confirmLoading">
-      <a-form-model class="formAdd" ref="ruleForm">
+      <a-form-model class="formAdd" ref="ruleForm" :model="form" :rules="rules">
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text-add">
@@ -37,11 +37,14 @@
           <a-col :span="24">
             <div class="box-title-text-add">
               <div class="title-text-add">
+                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('upgraderecordnumber')">{{$t('upgraderecordnumber')}}</span>
               </div>
-              <div class="title-text-add-input">
+              <div style="width:78%">
                 <!-- <span class="title-text-text">中文</span> -->
-                <a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')" disabled style="width:93%"  :max-length="50"></a-input>
+                <a-form-model-item  prop="babh">
+                <a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')"  style="width:93%"  :max-length="50"></a-input>
+                </a-form-model-item>
               </div>
             </div>
           </a-col>
@@ -60,9 +63,10 @@
           <a-col :span="24">
             <div class="box-title-text-add">
               <div class="title-text-add plus">
+                <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('Modelandfunctionrecord')">{{$t('Modelandfunctionrecord')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="dutyTerritory">
+              <a-form-model-item class="itemModel" prop="bapc">
                 <a-select  :disabled="disabled" class="box-input" v-model="form.bapc" allowClear     :placeholder="$t('PleaseSelect')" @change="changeId">
                   <a-select-option v-for="(item , key ) in selectListPc" :key="key" :value="item.id" >
                     {{ item.ggpc }}
@@ -174,6 +178,14 @@ import ImportFile from '@/components/ImportFileData/index'
         projectNameList2:[],
         selectListPc:[],
         selectListMb:[],
+        rules:{
+          babh:[
+          { required:true,message:this.$t('upgraderecordnumber')+this.$t('cannotEmpty'),trigger:'blur'}
+          ],
+          bapc:[
+            { required:true,message:this.$t('Modelandfunctionrecord')+this.$t('cannotEmpty'),trigger:'change'}
+          ]
+        }
       }
     },
     mounted() {
@@ -230,17 +242,27 @@ import ImportFile from '@/components/ImportFileData/index'
         if(otaId==null){
           otaId=''
         }
-      postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{
+        this.$refs.ruleForm.validate(valid=>{
+          if(valid){
+            postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{
         if(res.code==200){
         localStorage.setItem('otaId', res.result.otaId)
           this.$message.success(this.$t('SavedSuccessfully'))
            this.getData()
         }
         })
+          }
+        })
+    
     },
       next(){
         this.save()
-        this.$emit('basicInformationForm')
+        this.$refs.ruleForm.validate(valid=>{
+          if(valid){
+            this.$emit('basicInformationForm')
+          }})
+       
+       
       },
       getSelect(){
          getAction('/ota/otaBaCxList/list').then(res=>{
@@ -368,4 +390,8 @@ import ImportFile from '@/components/ImportFileData/index'
     margin-top: 5px;
     line-height: 1.4 !important;
   }
+  .Required {
+  color: red;
+  margin-right: 3px;
+}
 </style>

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

@@ -93,7 +93,7 @@
         </span>
       </div>
       <div style='width: 300px'>
-        <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
+        <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('configuration')}}</span>
         <span class='radio-text'>
           <a-radio-group style='margin-left: 40px;' v-model="query.jgldPz">
                     <a-radio :value="1"> {{ $t('yes') }} </a-radio>
@@ -948,7 +948,7 @@ export default {
           this.$message.success(this.$t('SavedSuccessfully'))
            this.getData()
         }
-       
+
       })
 
     },