From db1f4a084ed8f6ad16a60ad9ba0cb935083ba1ae Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Tue, 28 Mar 2023 17:50:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B+=E7=BB=93=E6=9D=9F=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/upgradecompletion.vue          | 73 ++++++++++---------
 .../otamanagement/upgradeactivity/index.vue   |  9 ++-
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue
index ace445a90..2440d63b6 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue
@@ -19,11 +19,11 @@
                   <span class="title-text-text" :title="$t ('implementedupgrade')">{{$t('implementedupgrade')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="implementedupgrade">
-                  <a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.implementedupgrade"  :disabled="disabled">
-                    <a-radio value="0">
+                  <a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.sfyz"  :disabled="disabled">
+                    <a-radio :value="0">
                       {{$t('yes')}}
                     </a-radio>
-                    <a-radio value="1">
+                    <a-radio :value="1">
                       {{$t('not')}}
                     </a-radio>
                   </a-radio-group>
@@ -43,7 +43,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="numberofvehicles">
                   <a-input class="box-input"
-                           v-model='formInline.numberofvehicles'
+                           v-model='formInline.wccls'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('numberofvehicles')"/>
                 </a-form-model-item>
@@ -59,9 +59,9 @@
                 <a-form-model-item class="itemModel" prop="VINcodelist">
                   <a-button type="primary" class="button-text"
                   :disabled="disabled"
-                            @click="clickButtonToUpload('VINcodelist')">
-                    {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
-                    formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                            @click="clickButtonToUpload('csv')">
+                    {{ (formInline.csv === 'null' || formInline.csv === '' ||
+                    formInline.csv == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                   <p>{{$t('notecsv')}}</p>
@@ -69,11 +69,11 @@
               </div>
             </a-col>
           </a-row>
-          <div v-for="(item,index) in formInline.dataList" :key="index">
+          <div v-for="(item,index) in formInline.list" :key="index">
             <div class="header-text">
               {{$t('vehicleshavenotcompletedonlineupgrade')}}
               <a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
-              <a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
+              <a-icon class="icon-text" v-if="formInline.list.length > 1" @click="deleteClick(index)"
                       type="minus-circle"  :disabled="disabled"/>
             </div>
             <div style='margin-left: 25px'>
@@ -86,7 +86,7 @@
                     <a-form-model-item class="itemModel">
                       <a-input class="box-input"
                       :disabled="disabled"
-                                  v-model="item.cause"
+                                  v-model="item.wwcyy"
                                   :placeholder="$t('PleaseEnter')+$t('cause')"/>
                     </a-form-model-item>
                   </div>
@@ -96,13 +96,13 @@
                     <div class="title-text">
                       <span class="title-text-text" :title="$t('Quantity')">{{$t('Quantity')}}</span>
                     </div>
-                    <!--                  :prop="'dataList.'+index+'.inspectionItem'"-->
+                    <!--                  :prop="'list.'+index+'.inspectionItem'"-->
                     <!--                  :rules="[{ required: true, message: $t('inspectionItems') + $t('cannotEmpty'), trigger: 'blur'},-->
                     <!--                  {max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]"-->
                     <a-form-model-item class="itemModel">
                       <a-input class="box-input"
                       :disabled="disabled"
-                               v-model="item.Quantity"
+                               v-model="item.wwcsl"
                                :placeholder="$t('PleaseEnter')+$t('Quantity')"/>
                     </a-form-model-item>
                   </div>
@@ -114,15 +114,15 @@
                     <div class="title-text">
                       <span class="title-text-text"></span>
                     </div>
-                    <!--                  :prop="'dataList.'+index+'.inspectionItem'"-->
+                    <!--                  :prop="'list.'+index+'.inspectionItem'"-->
                     <!--                  :rules="[{ required: true, message: $t('inspectionItems') + $t('cannotEmpty'), trigger: 'blur'},-->
                     <!--                  {max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]"-->
                     <a-form-model-item class="itemModel">
                       <a-button type="primary" class="button-text"
                       :disabled="disabled"
-                                @click="clickButtonToUpload('VINcodelist')">
-                        {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
-                        formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                                @click="clickButtonToUpload('wwcfj')">
+                        {{ (formInline.wwcfj === 'null' || formInline.wwcfj === '' ||
+                        formInline.wwcfj == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                         }}
                       </a-button>
                       <p style='width: 243px'>{{$t('format')}}</p>
@@ -142,7 +142,7 @@
                 <a-form-model-item class="itemModel" prop="implementationrecords">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('implementationrecords')"
                   :disabled="disabled"
-                              :rows="2" v-model="formInline.remarks"/>
+                              :rows="2" v-model="formInline.ssjl"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -155,9 +155,9 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="VINcodelist">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('VINcodelist1')">
-                    {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
-                    formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                            @click="clickButtonToUpload('ssjlfj')">
+                    {{ (formInline.ssjlfj === 'null' || formInline.ssjlfj === '' ||
+                    formInline.ssjlfj == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                   <p>{{$t('format')}}</p>
@@ -192,7 +192,9 @@ export default {
       visible: false,
       disabled: false,
       showButton:false,
-      formInline: {},
+      formInline: {
+        list:[{}]
+      },
       confirmLoading: false,
       acceptcode:'',
       projectNameList: [],
@@ -237,6 +239,8 @@ export default {
   methods: {
     ...mapGetters(['userInfo']),
     addModel(record,flag) {
+      this.disabled=false
+        this.showButton=false
       if(flag=='1'){
         this.disabled=true
         this.showButton=true
@@ -244,12 +248,11 @@ export default {
       this.record=record
       this.visible = true
       this.confirmLoading = false
-      this.formInline = {}
-      this.formInline.dataList = [{}]
+      // this.formInline = {}
+      // this.formInline.list = [{}]
       this.$nextTick(() => {
         this.formInline = { ...this.formInline }
         this.$refs.ruleForm.clearValidate()
-        // this.$refs.codeNumber.number()
       })
     },
     handleCancel() {
@@ -267,27 +270,27 @@ export default {
           this.formInline.authDummyInventoryBaseId = this.$route.query.id
           let query = JSON.parse(JSON.stringify(this.formInline))
           this.confirmLoading = true
-          // postAction(this.url.addModel, query).then((res) => {
-          //   if (res.success) {
-          //     this.confirmLoading = false
-          //     this.$message.success(this.$t('OperationSuccessful'))
+          postAction('/ota/otaBaSjJssj/add',{otaId:this.record.id,...this.formInline}).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
              
-          //   } else {
-          //     this.$message.warning(res.message)
-          //     this.confirmLoading = false
-          //   }
-          // })
+            } else {
+              this.$message.warning(res.message)
+              this.confirmLoading = false
+            }
+          })
               this.visible = false
               this.$emit('addModelList',this.record)
         }
       })
     },
     addClick(index){
-      this.formInline.dataList.splice(index + 1, 0, {})
+      this.formInline.list.splice(index + 1, 0, {})
       this.formInline = { ...this.formInline }
     },
     deleteClick(index) {
-      this.formInline.dataList.splice(index, 1)
+      this.formInline.list.splice(index, 1)
       this.formInline = { ...this.formInline }
     },
     getRegulationNo() {
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index 39f523d9c..b2330f285 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -444,11 +444,18 @@ export default {
     },
     // 结束升级
     endUpgrade(record,flag){
+      console.log('model',record);
       this.$refs.upgradecompletionRef.addModel(record,flag)
     },
     // 查看
     detailclick(record){
-
+      localStorage.removeItem('otaIdT')
+       localStorage.removeItem('otaId')
+       localStorage.setItem('otaId',record.id)
+       this.$router.push({
+        path: '/upgradeactivityrecord',
+        query: {}
+      })
     },
     // 维护
     maintenanceClick(row){