升级活动备案维护对接

jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue

@@ -14,11 +14,11 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <!--              <span class="Required">*</span>-->
+                            <span class="Required">*</span>
               <span class="title-text-text" :title="$t('recordstatus')">
                 {{$t('recordstatus')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="recordstatus">
+            <a-form-model-item class="itemModel" prop="bazt">
               <j-dict-select-tag class="box-input" v-model="formInline.bazt"
                                  :placeholder="$t('PleaseSelect')+$t('recordstatus')"
                                  :type="'select'"
@@ -29,11 +29,11 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <!--              <span class="Required">*</span>-->
+                            <span class="Required">*</span>
               <span class="title-text-text" :title="$t('filingtime')">
                 {{$t('filingtime')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="filingtime">
+            <a-form-model-item class="itemModel" prop="batjsj">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('filingtime')"
                              @change="dateChange({db_field_name:'batjsj'})"
@@ -76,9 +76,25 @@ export default {
       visible: false,
       confirmLoading: false,
       formInline: {
+        bazt:'',
         batjsj:'',
+        bz:'',
       },
       rules: {
+        bazt: [
+          {
+            required: true,
+            message: this.$t('recordstatus') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
+        batjsj: [
+          {
+            required: true,
+            message: this.$t('filingtime') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // listConfirmation: [
         //   {
         //     required: true,
@@ -139,7 +155,7 @@ export default {
       if(row instanceof Array){
         this.ids = row.join(',')
       }else{
-        this.formInline.bazt = row.bazt
+        this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
         this.formInline.bz = row.bz
         this.ids = row.id
@@ -154,7 +170,7 @@ export default {
         if (valid) {
           let query = {
             ...this.formInline,
-            ids:this.ids.join(',')
+            ids:this.ids
           }
           this.confirmLoading = true
           postAction('ota/otaBaSjList/batchRecord', query).then((res) => {
@@ -173,8 +189,9 @@ export default {
     },
     handleCancel() {
       this.formInline = {
-        batjsj:''
+        bazt:'',
-      }
+        batjsj:'',
+        bz:'',}
       this.ids = ''
       this.visible = false
     },

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

@@ -274,7 +274,7 @@ export default {
           align: 'left',
           width: 140,
           ellipsis: true,
-          dataIndex: 'bazt'
+          dataIndex: 'bazt_dictText'
         },
         {
           title: this.$t('filingtime'),

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

@@ -132,7 +132,7 @@
                     </a-select-option>
                   </a-select>
               </a-form-model-item>
-              <a-form-model-item class="itemModel" style="width: 40%;margin-left:20px">
+              <a-form-model-item class="itemModel" style="width: 40%;margin-left:-9px">
                 <a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
                   <a-select-option v-for="(item, key) in projectNameList2"
                                    :key="key"

jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue

@@ -140,7 +140,7 @@ export default {
       if(row instanceof Array){
         this.ids = row.join(',')
       }else{
-        this.formInline.bazt = row.bazt
+        this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
         this.formInline.bz = row.bz
         this.ids = row.id