lilei 3 weeks ago
parent
commit
93a8e6c8a9

+ 8 - 5
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -376,16 +376,14 @@ export default {
           this.dataSource = await salesDetailExtPromoList({ salesPromoSnSet: this.salesPromoSnSet, ...params }).then(res => res.data || [])
           this.dataSource = await salesDetailExtPromoList({ salesPromoSnSet: this.salesPromoSnSet, ...params }).then(res => res.data || [])
         }
         }
       }
       }
-
+      console.log(this.dataSource)
       this.$emit('hideTable', this.type, this.dataSource.length)
       this.$emit('hideTable', this.type, this.dataSource.length)
 
 
       // 格式化数据
       // 格式化数据
-      let f = 0
       let str = ''
       let str = ''
       this.outStockStr = ''
       this.outStockStr = ''
       this.dataSource.map((item, i) => {
       this.dataSource.map((item, i) => {
-        if (item.id.indexOf('promo-') >= 0) { f = f - 1 }
-        item.no = i + 1 + f
+        item.no = i + 1
         // 格式化数据,产品编码、产品名称、原厂编码、包装数单位
         // 格式化数据,产品编码、产品名称、原厂编码、包装数单位
         const productCode = (item.productEntity && item.productEntity.code) || (item.dealerProductEntity && item.dealerProductEntity.code)
         const productCode = (item.productEntity && item.productEntity.code) || (item.dealerProductEntity && item.dealerProductEntity.code)
         const productName = (item.productEntity && item.productEntity.name) || (item.dealerProductEntity && item.dealerProductEntity.name)
         const productName = (item.productEntity && item.productEntity.name) || (item.dealerProductEntity && item.dealerProductEntity.name)
@@ -426,6 +424,9 @@ export default {
       } else {
       } else {
         this.tableHeight = this.maxHeight
         this.tableHeight = this.maxHeight
       }
       }
+      if (this.showEmpty) {
+        this.tableHeight = 200
+      }
       this.spinning = false
       this.spinning = false
       this.disabled = false
       this.disabled = false
     }
     }
@@ -437,8 +438,10 @@ export default {
     .empty-data{
     .empty-data{
         color: #999;
         color: #999;
         text-align: center;
         text-align: center;
-        padding: 20px;
         width: 100%;
         width: 100%;
+        position: absolute;
+        top: 50%;
+        margin-top: -50px;
     }
     }
     .table-header-cell-center{
     .table-header-cell-center{
       text-align: center!important;
       text-align: center!important;

+ 1 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -201,7 +201,7 @@
         :bordered="false"
         :bordered="false"
         class="salesEdit-cont"
         class="salesEdit-cont"
         style="margin-bottom: 6px;"
         style="margin-bottom: 6px;"
-        v-if="!hideNormalTable"
+        v-show="!hideNormalTable"
       >
       >
         <div>
         <div>
           <detailProductList
           <detailProductList