From d8d40b2acd072fc45cff4f79a2b3ff52e85c70b4 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Sun, 20 Aug 2023 15:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=9B=9E=E6=8F=90=E7=A4=BA=20?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=AF=B9=E6=8E=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otaAuthentication/components/detil.vue    | 31 ++++++++++++-------
 .../components/rejectReason.vue               |  3 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index f5eb6678b..5b62f98bc 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -249,7 +249,7 @@
     </div>
     <batSetting :url="url" @getList="getList" ref="batSettingRef"/>
     <applyforrematch :url="url" @getList="getList" ref="applyforrematchRef"/>
-    <rejectReason :url="url" @getList="getList" ref="rejectReasonRef"/>
+    <rejectReason :url="url" @getList="getList" @msgForm='msgForm' ref="rejectReasonRef"/>
     <remark @remarkForm='remarkForm' ref="remarkRef"/>
     <vdrDetial @vdrDetial='vdrDetial' ref="vdrDetialRef"/>
     <!--    历史记录-->
@@ -291,7 +291,7 @@
           show-quick-jumper
           show-size-changer
           :page-size.sync="pageSizehistory"
-          :total="total"
+          :total="historytotal"
           :current="pageNohistory"
           @change="onChangehistory"
           @showSizeChange="SizeChangehistory"
@@ -378,6 +378,7 @@ export default {
       checkedList: [],
       serialNumber: '',
       total: 0,
+      historytotal: 0,
       pageSize: 10,
       pageNo: 1,
       pageNohistory: 1,
@@ -397,7 +398,7 @@ export default {
       columnshistory: [
         {
           title: this.$t('OperationDetails'),
-          dataIndex: 'logContent',
+          dataIndex: 'content',
           align: 'left',
           width: 320,
           ellipsis: true,
@@ -1098,22 +1099,21 @@ export default {
       let query = {
         pageNo: this.pageNohistory,
         pageSize: this.pageSizehistory,
-        paramsManifestId: this.$route.query.id,
-        paramsCollectManifestId: this.paramsReportDetailId
+        applyId: this.paramsReportDetailId
       }
-      this.loading = true
-      getAction('paramsCollectManifestLog/paramsCollectManifestLogEO/page', query).then((res) => {
+      // this.loading = true
+      getAction('/ota/otaManageHistory/page', query).then((res) => {
         if (res.success) {
           this.dataSourcehistory = res.result.records
           if (this.dataSourcehistory && this.dataSourcehistory.length > 0) {
             this.dataSourcehistory.forEach(val => {
-              val.logContent = val.logContent.replace(/\"/g, '<span class=\'textData\'>"</span>')
+              val.content = val.content.replace(/\"/g, '<span class=\'textData\'>"</span>')
             })
           }
-          this.total = res.result.total
-          this.loading = false
+          this.historytotal = res.result.total
+          // this.loading = false
         } else {
-          this.loading = false
+          // this.loading = false
         }
       })
     },
@@ -1200,6 +1200,15 @@ export default {
         this.$message.warning(this.$t('selectLeastOne'))
       }
     },
+    msgForm(data){
+      if(data && data.length !== 0){
+        this.NotSelectedRowKeysValue = data
+        this.visibleoperationFailed = true
+      }else{
+        this.selectedRowKeys = []
+        this.getList()
+      }
+    },
     // 备注编辑
     getremark(item){
       this.$refs.remarkRef.edit(JSON.parse(JSON.stringify(item)))
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
index d7e8fc903..8eb00e75b 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
@@ -106,7 +106,8 @@ export default {
               this.visible = false
               this.confirmLoading = false
               this.ids = []
-              this.$emit('getList')
+              this.$emit('msgForm',res.result.msgList)
+              // this.$emit('getList')
             } else {
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false