From 1c3829874eb42882cb1672d6457948d98c1be3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 26 Jul 2023 16:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86+=E6=98=8E=E7=BB=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AEbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/commonTabel-drawer/index.vue              | 5 +++++
 .../src/components/filterForDetailPage/index.vue             | 3 ++-
 PC/InterFace.Dash/src/mixins/TableMixins.js                  | 2 +-
 PC/InterFace.Dash/src/views/menuList/AsnMstr.vue             | 2 --
 PC/InterFace.Dash/src/views/menuList/PoMstr.vue              | 1 -
 PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue         | 1 -
 PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue          | 1 -
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
index a1d7c1b..9e66c5f 100644
--- a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
+++ b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
@@ -69,6 +69,7 @@
             @rowDrop="rowDrop"
             :searchOverallCoverHeight="'calc(100vh - 345px)'"
             :rowSource="'detail_api'"
+            :rowMaxHeight="rowMaxHeight"
             :totalCount="totalCountForDetail"
             :MaxResultCount="MaxResultCount"
             @sortChange="sortChangeForDetail"
@@ -179,6 +180,10 @@ export default {
     LoadingMixins,
   ],
   props: {
+    rowMaxHeight:{
+      type:String,
+      default:'calc(90vh - 450px)'
+    },
     // 操作列按钮
     buttonOperationList_left:{
       type: Array,
diff --git a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
index db61bae..dcbfd51 100644
--- a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
+++ b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
@@ -229,6 +229,7 @@ mounted(){
 },
 methods: {
     rowDropForDetail(data,type){
+        this.listColumns = data
         this.$emit("rowDropForDetail", data,type)
     },
     // 初始化显示按钮
@@ -262,7 +263,7 @@ methods: {
                 // 表头处理
                 let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
                 let _Columns = this.initApiColumnsForDto(res.items[0],_parentName)
-                this.listColumns = this.initTableColumns(_Columns)
+                this.listColumns = this.initTableColumns(_Columns,'detailPage_api')
                 // 页面数据处理
                 if(res){
                     this.Loading.tableLoading = false
diff --git a/PC/InterFace.Dash/src/mixins/TableMixins.js b/PC/InterFace.Dash/src/mixins/TableMixins.js
index 54a3a24..201a177 100644
--- a/PC/InterFace.Dash/src/mixins/TableMixins.js
+++ b/PC/InterFace.Dash/src/mixins/TableMixins.js
@@ -189,7 +189,7 @@ export const tableMixins = {
         .then(res=>{
           // 表头处理
           let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
-          this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(res.details[0],_parentName))
+          this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(res.details[0],_parentName),'detail_api')
           // 打印使用的全部数据存储
           this.tableDataDetails = JSON.parse(JSON.stringify(res))
           this.propsData = res
diff --git a/PC/InterFace.Dash/src/views/menuList/AsnMstr.vue b/PC/InterFace.Dash/src/views/menuList/AsnMstr.vue
index 27e4e34..833ccd6 100644
--- a/PC/InterFace.Dash/src/views/menuList/AsnMstr.vue
+++ b/PC/InterFace.Dash/src/views/menuList/AsnMstr.vue
@@ -48,9 +48,7 @@
       :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
     <!-- 明细查询页面 -->
-      <!-- :listColumns="apiColumns_DetailsPage" -->
     <filterForDetailPage
-      @rowDropForDetail="rowDrop"
       v-if="filterForDetailShow"
       :parentColumns="apiColumns_Table"
       @closeDialog="changeFilterForDetailShow"
diff --git a/PC/InterFace.Dash/src/views/menuList/PoMstr.vue b/PC/InterFace.Dash/src/views/menuList/PoMstr.vue
index 39663bd..824c527 100644
--- a/PC/InterFace.Dash/src/views/menuList/PoMstr.vue
+++ b/PC/InterFace.Dash/src/views/menuList/PoMstr.vue
@@ -49,7 +49,6 @@
     ></curren-Drawer>
     <!-- 明细查询页面 -->
     <filterForDetailPage
-      @rowDropForDetail="rowDrop"
       v-if="filterForDetailShow"
       :parentColumns="apiColumns_Table"
       @closeDialog="changeFilterForDetailShow"
diff --git a/PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue b/PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue
index 9ccb1be..250d1d4 100644
--- a/PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue
+++ b/PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue
@@ -49,7 +49,6 @@
     ></curren-Drawer>
     <!-- 明细查询页面 -->
     <filterForDetailPage
-      @rowDropForDetail="rowDrop"
       v-if="filterForDetailShow"
       :parentColumns="apiColumns_Table"
       @closeDialog="changeFilterForDetailShow"
diff --git a/PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue b/PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue
index 9bee812..4aa2d62 100644
--- a/PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue
+++ b/PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue
@@ -49,7 +49,6 @@
     ></curren-Drawer>
     <!-- 明细查询页面 -->
     <filterForDetailPage
-      @rowDropForDetail="rowDrop"
       v-if="filterForDetailShow"
       :parentColumns="apiColumns_Table"
       @closeDialog="changeFilterForDetailShow"