lilei 1 yıl önce
ebeveyn
işleme
66dcd28187

+ 4 - 3
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -172,7 +172,6 @@ export default {
       spinning: false,
       dataSource: [],
       tableData: [],
-      tableHeight: this.maxHeight,
       cellStyleOption: {
         bodyCellClass: ({ row, column, rowIndex }) => {
             if (row.id.indexOf('promo-')>=0 && column.field === "no") {
@@ -198,8 +197,11 @@ export default {
     }
   },
   computed: {
+    tableHeight(){
+      return (this.showEmpty ? 200 : this.maxHeight) + 'px'
+    },
     hasPrompActive(){
-      return this.detailData&&this.detailData.promoFlag==1&&!this.detailData.totalCancelQty
+      return this.detailData&&this.detailData.promoFlag==1
     },
     hasNoPushedActive(){
       const a = this.dataSource.filter(item => item.promotionFlag != 0).filter(item => item.pushedQty>0)
@@ -491,7 +493,6 @@ export default {
           }
         })
         this.showEmpty = this.dataSource.length <= 0
-        this.tableHeight = (this.showEmpty ? 200 : this.maxHeight) + 'px'
         this.tableData = this.dataSource
         this.spinning = false
         this.disabled = false