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

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

@@ -389,8 +389,25 @@ export default {
     },
     // 引用备案
     citeforrecord(){
-
-    },
+      if( this.selectedRowKeys.length == 0 ){
+        this.$message.warning(this.$t('selectLeastOne'))
+      }else{
+        if ( this.selectedRowKeys.length > 1){
+        this.$message.warning(this.$t('OnlyOneSelected'))
+      }else{
+        localStorage.removeItem('otaIdT')
+        localStorage.removeItem('otaId')
+        localStorage.setItem('otaIdT',this.selectedRowKeys[0])
+        if(localStorage.getItem('otaIdT')!=null){
+          this.$router.push({
+        path: '/upgradeactivityrecord',
+        query: {
+          type:1
+        }
+      })
+        }
+      }
+    }},
     // 创建车型
     createvehicleandfunctionrecords() {
       localStorage.removeItem('otaId')

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

@@ -12,7 +12,7 @@
               <a-form-model-item class="itemModel" prop="dutyTerritory">
                 <a-input
                   :placeholder="$t('pleaseEnter')"
-                  v-model.trim="queryParam.taskname"></a-input>
+                  v-model.trim="queryParam.rwmc"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -29,7 +29,7 @@
                                @change="dateChange({db_field_name:'updatereleasetime'})"
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="queryParam.updatereleasetime"
+                               v-model="queryParam.sjfbsj"
                                :disabled="false"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -48,7 +48,7 @@
                                @change="dateChange({db_field_name:'upgradeplanexpirationtime'})"
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="queryParam.upgradeplanexpirationtime"
+                               v-model="queryParam.sjjzsj"
                                :disabled="false"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -58,7 +58,7 @@
       </a-form-model>
     </a-spin>
     <div class="bootom-button">
-      <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
+      <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
       <a-button type="primary" @click='last' style="margin-right:50px">{{$t('last')}}</a-button>
       <a-button type="primary" @click='submit'>{{$t('submit')}}</a-button>
     </div>
@@ -77,21 +77,51 @@ export default {
     return {
       confirmLoading: false,
       disabled: false,
-      queryParam:{}
+      queryParam:{
+        sjjzsj:''
+      }
     }
   },
   mounted() {
-
+  this.getData()
   },
   methods: {
+    getData(){
+      let otaIdT=localStorage.getItem('otaIdT')
+        if(otaIdT==null){
+          otaIdT=''
+        }
+        let otaId=localStorage.getItem('otaId')
+        if(otaId==null){
+          otaId=''
+        }
+        getAction('/ota/otaBaSjQtsjxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{
+          if(res.code == 200){
+            this.queryParam= res.result ==null ? {} :res.result 
+          }
+        })
+    },
+    save(){
+      let otaId = localStorage.getItem('otaId')
+      if(otaId == null || otaId == undefined){
+        otaId=''
+      }
+      this.queryParam.otaId = otaId
+      postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{
+        this.$message.success(this.$t('SavedSuccessfully'))
+        console.log(res);
+       })
+    },
+    
     last(){
+      this.save()
       this.$emit('otherup')
     },
     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') : ''
     },
     submit(){
-
+       this.$router.push('upgradeactivity')
     },
   }
 }

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

@@ -389,8 +389,11 @@ this.$forceUpdate()
         })
     },
     save(){
-      
-       this.form.otaId=localStorage.getItem('otaId')
+      let otaId = localStorage.getItem('otaId')
+      if(otaId == null || otaId == undefined){
+        otaId=''
+      }
+       this.form.otaId=otaId
        postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{
         this.$message.success(this.$t('SavedSuccessfully'))
         console.log(res);

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

@@ -179,6 +179,7 @@ import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
 import ImportFile from '@/components/ImportFileData/index'
 import uploadFile from '@/components/uploadFile/file'
 import moment from 'moment'
+import { post } from '../../../../common/lang/zh-cn'
 
 export default {
   name: 'basicInformation',
@@ -198,7 +199,7 @@ export default {
     }
   },
   mounted() {
-
+ this.getData()
   },
   methods: {// 模板下载
     handleModule() {
@@ -229,8 +230,31 @@ export default {
         }
       })
     },
+    getData(){
+      let otaIdT=localStorage.getItem('otaIdT')
+        if(otaIdT==null){
+          otaIdT=''
+        }
+        let otaId=localStorage.getItem('otaId')
+        if(otaId==null){
+          otaId=''
+        }
+        getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{
+          if(res.code == 200){
+            this.formInline= res.result ==null ? {} :res.result 
+          }
+        })
+    },
     save(){
-
+      let otaId = localStorage.getItem('otaId')
+      if(otaId == null || otaId == undefined){
+        otaId=''
+      }
+      this.formInline.otaId = otaId
+       postAction('/ota/otaBaSjGgnrfs/add' ,this.formInline).then(res=>{
+        this.$message.success(this.$t('SavedSuccessfully'))
+        console.log(res);
+       })
     },
 
     next(){

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

@@ -72,7 +72,7 @@
       </span>
 
       <span slot="softwaredevelopmententerprise" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="500"></a-input>
       </span>
       <span slot="operatingsystemversion" slot-scope="text,record">
           <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="500"></a-input>