From dcaf73d2863e8fa071ec6e18ee08ffa30fbffc3c Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sat, 11 May 2024 11:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue           | 18 ++++++++++++++----
 .../supplierdeliverRecordMain/index.vue        |  9 ++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 9ce1534df..3ebe261c5 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -129,10 +129,10 @@
 
         </div>
         <!-- 附件/备注/变更记录 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
           <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <Annex v-show="tabsList[current].label==annexAlias.label"
+            <Annex
                 :annexData="annexData"
                 :showDownload = "annexAlias.showDownload"
                 :hiddenDelete = "annexAlias.hiddenDelete"
@@ -141,15 +141,25 @@
                 :upData="remarksData.data" 
                 :key="count"
               />
+          </ElScrollbar> 
+        </ContentWrap>
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='备注'" :style="{height:remarkHeight+'px'}">
+          <!-- 附件组件 -->
+          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 备注组件 -->
-            <Remarks v-show="tabsList[current].label=='备注'"
+            <Remarks
               :remarksData="remarksData"
               class="mt-20px"
               @remarksSubmitScuess="remarksSubmitScuess"
               :key="count"
             />
+          </ElScrollbar> 
+        </ContentWrap>
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+          <!-- 附件组件 -->
+          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 变更记录组件 -->
-            <ChangeRecord v-show="tabsList[current].label=='变更记录'" :changeRecordData="changeRecordData" class="mt-20px"  :key="count"/>
+            <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px"  :key="count"/>
           </ElScrollbar> 
         </ContentWrap>
       </div>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index 41cc2505d..ca1ab82ee 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -233,10 +233,13 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
     getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
   })
   const { getList:requestGetList } = requestTableMethods
-  requestTableObject.params.number = 'REQ0120240506-0002'
+  requestTableObject.params.requestNumber = row.requestNumber
   await requestGetList()
-  row.annexMasterId = requestTableObject.tableList[0].masterId
-  detailRef.value.openDetail(row, titleName, titleValue,'recordSupplierdeliverMain')
+  if(requestTableObject.tableList.length>0){
+    row.annexMasterId = requestTableObject.tableList[0].masterId
+    detailRef.value.openDetail(row, titleName, titleValue,'recordSupplierdeliverMain')
+  }
+  
 }
 
 // 详情 table 操作扩展 按钮