From 523f6bfcb7a64910a10de82dbdaa4ef6ccac9958 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Sat, 19 Aug 2023 14:01:49 +0800
Subject: [PATCH] =?UTF-8?q?OTA=E5=AF=B9=E6=8E=A5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otaAuthentication/components/detil.vue    | 62 ++++++++++++++++---
 .../components/historyTable.vue               |  1 -
 .../components/vdrDetial.vue                  | 24 ++++---
 3 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index 293accb11..9d6047516 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -207,13 +207,14 @@
         </template>
         <!--        Vdr详情-->
         <template slot="vdr" slot-scope="text, record">
-          <span @click="getcdr(record)">{{text}}</span>
+          <a @click="getcdr(record)">{{text}}</a>
         </template>
         <!--        项目版本编辑-->
         <template slot="projectVersionName" slot-scope="text, record">
           <a-select :placeholder="$t('PleaseSelect')"
                     class="box-input"
                     style="width: 90%"
+                    :disabled="record.disabled"
                     :getPopupContainer="triggerNode=> triggerNode.parentNode"
                     allowClear
                     showSearch
@@ -221,11 +222,11 @@
                     :autoClearSearchValue="false"
                     v-model="record.projectVersionName">
             <a-select-option v-for="(item, key) in projectVersionList"
-                             :label='item'
+                             :label='item.versionName'
                              :key="key"
-                             :value="item">
-                  <span style="display: inline-block;width: 100%" :title=" item">
-                    {{ item }}
+                             :value="item.projectId">
+                  <span style="display: inline-block;width: 100%" :title=" item.versionName">
+                    {{ item.versionName }}
                   </span>
             </a-select-option>
           </a-select>
@@ -233,6 +234,7 @@
         <!--        认证进度编辑-->
         <template slot="attestationSchedule" slot-scope="text, record">
           <j-dict-select-tag class="box-input" v-model="record.attestationSchedule"
+                             :disabled="record.disabled"
                              :placeholder="$t('PleaseSelect')"
                              :type="'select'"
                              style="width: 90%"
@@ -296,6 +298,31 @@
         />
       </div>
     </a-modal>
+    <!--    错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      :footer="null"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <!--          状态不符合，导致不能操作按钮，没有权限-->
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue'>
+            <div>
+              <span>{{ item.nioNumber }}</span>
+            </div>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
   </a-card>
 </template>
 
@@ -342,6 +369,8 @@ export default {
       confirmLoading: false,
       indeterminate: false,
       checkAll: false,
+      visibleoperationFailed: false, // 数据失败的弹框
+      NotSelectedRowKeysValue:[],
       dataSource: [],
       selectedRowKeys: [],
       selectedRowKeysRecord: [],
@@ -706,7 +735,8 @@ export default {
           align: 'left',
           dataIndex: 'vdr',
           ellipsis: true,
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'vdr' }
         },
         {
           title: this.$t('theme'),
@@ -832,8 +862,6 @@ export default {
   watch:{
     // 监听车型变化
     vehicleTypeCode(){
-      console.log(this.customizeSeList)
-      console.log(this.customizeList)
       if(this.vehicleTypeCode !== '全部'){
         this.cuList = this.customizeSeList
         this.$forceUpdate()
@@ -841,6 +869,7 @@ export default {
         this.cuList = this.customizeList
         this.$forceUpdate()
       }
+      this.getprojectList()
     }
   },
   mounted() {
@@ -861,6 +890,16 @@ export default {
       getAction('/ota/otaManageApplyEO/getPullDownList', {}).then((res) => {
         if (res.success) {
           this.vehicleTypeList = res.result.carSet
+          this.getprojectList()
+          console.log(this.userInfo())
+        } else {
+        }
+      })
+    },
+    getprojectList(){
+      getAction('/ota/otaManageApplyEO/getProjectVersionList', {carMarket:this.vehicleTypeCode}).then((res) => {
+        if (res.success) {
+          this.projectVersionList = res.result
         } else {
         }
       })
@@ -1190,6 +1229,13 @@ export default {
         // this.queryParamOne[item + '_name'] = []
       }
     },
+    // 错误数据的弹框
+    cancleoperationFailed() {
+      this.selectedRowKeysValue = []
+      this.visibleoperationFailed = false
+      this.getList()
+      // this.GetgetTableList()
+    },
   }
 }
 </script>
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue
index 4c6a80a74..ecf385b74 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue
@@ -6,7 +6,6 @@
   :pagination="false"
   :scroll="{x: '100%',y: 400}"
   :data-source="dataSourcehistory"
-  :loading="loading"
   >
   <span slot="content" slot-scope="text,record">
           <a-tooltip placement="topLeft">
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue
index 019847eb0..975f0920d 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue
@@ -66,7 +66,7 @@
           <a-row :gutter="24">
             <a-col :span="24">
               <div class='detail-box'>
-                <span class='detail-text'>{{item.title}}</span>
+                <span class='detail-text'>{{item.versionName}}</span>
               </div>
             </a-col>
           </a-row>
@@ -74,15 +74,15 @@
             <a-col :span="12">
               <div class='detail-box'>
                 <span class='detail-text'>{{$t('certificationStartOne')}}</span>
-                <span class="title-text-text" :title="item.certificationStartOne">
-                {{item.certificationStartOne}}</span>
+                <span class="title-text-text" :title="item.attestationStartTime">
+                {{item.attestationStartTime}}</span>
               </div>
             </a-col>
             <a-col :span="12">
               <div class='detail-box'>
                 <span class='detail-text'>{{$t('certificationdeclaration')}}</span>
-                <span class="title-text-text" :title="item.certificationdeclaration">
-                {{item.certificationdeclaration}}</span>
+                <span class="title-text-text" :title="item.certificationSubmission">
+                {{item.certificationSubmission}}</span>
               </div>
             </a-col>
           </a-row>
@@ -90,15 +90,15 @@
             <a-col :span="12">
               <div class='detail-box'>
                 <span class='detail-text'>{{$t('certificationEnd')}}</span>
-                <span class="title-text-text" :title="item.certificationEnd">
-                {{item.certificationEnd}}</span>
+                <span class="title-text-text" :title="item.attestationEndTime">
+                {{item.attestationEndTime}}</span>
               </div>
             </a-col>
             <a-col :span="12">
               <div class='detail-box'>
                 <span class='detail-text'>{{$t('CertificationProgress')}}</span>
-                <span class="title-text-text" :title="item.CertificationProgress">
-                {{item.CertificationProgress}}</span>
+                <span class="title-text-text" :title="item.attestationSchedule">
+                {{item.attestationSchedule}}</span>
               </div>
             </a-col>
           </a-row>
@@ -170,6 +170,12 @@ export default {
     ...mapGetters(['userInfo']),
     addModel(record) {
       this.form=record
+      getAction('/ota/otaManageApplyEO/getVersionInfo', {vdr:this.form.vdr}).then((res) => {
+        if (res.success) {
+          this.vdrList = res.result
+        } else {
+        }
+      })
       this.visible = true
       this.confirmLoading = false
       console.log('555',record);