From 2cc812b9b0c285a461f96135ce73d1ce333ffa3b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 20 May 2022 14:04:53 +0800
Subject: [PATCH] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 6b67761cf..1c889d789 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -186,11 +186,18 @@
         </a-button>
       </template>
       <div class="engineeringBox" v-if="detailsList.length > 0">
-        <div style="width: calc(100% - 12px)" v-for="(item,index) in detailsList">
-          <div class="title-header-text" v-if="index == 0">
+        <div style="width: calc(100% - 12px);margin-bottom: 40px" v-for="(item,index) in detailsList">
+          <div class="title-header-text" v-if="index == 0 && detailsList[0].dataStatus == 'current'">
             {{$t('currentInformation')}}
           </div>
-          <div class="title-header-text" style="margin-top: 40px" v-if="index == 1">
+          <div class="title-header-text" style="margin-top: 40px"
+               v-if="index == 1 && detailsList[1].dataStatus == 'history'"
+          >
+            {{$t('deliveryHistory')}}
+          </div>
+          <div class="title-header-text"
+               v-if="detailsList[0].dataStatus == 'history'"
+          >
             {{$t('deliveryHistory')}}
           </div>
           <a-row :gutter="24" style="margin-bottom: 18px">
@@ -443,7 +450,8 @@
           remindDispose: '/project/projectTaskInventoryEO/remindDispose',
           page: '/project/feedbackHistory/page',
           confirmEdit: '/project/projectTaskInventoryDetailEO/edit'
-        }
+        },
+        feedbackId: ''
       }
     },
     mounted() {
@@ -641,13 +649,14 @@
       },
       detailsClick(val) {
         this.visibleDetails = true
-        this.getDetails(val)
+        this.feedbackId = val.id
+        this.getDetails()
       },
-      getDetails(row) {
+      getDetails() {
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          feedbackId: row.id
+          feedbackId: this.feedbackId
         }
         this.pageLoading = true
         getAction(this.url.page, query).then((res) => {