lilei 5 miesięcy temu
rodzic
commit
99c3a880bf

+ 0 - 1
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -6,7 +6,6 @@
         border-y
         border-x
         border-around
-        :max-height="300"
         row-key-field-name="salesPromoSn"
         :checkbox-option="checkboxOption"
         :column-width-resize-option="columnWidthResizeOption"

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -399,7 +399,7 @@ export default {
       this.showEmpty = listLen <= 0
       // 高度自适应
       if (this.maxHeight == 'auto') {
-        this.tableHeight = (listLen + 1) * 30
+        this.tableHeight = (listLen + 1) * 34
         this.tableHeight = this.tableHeight > 300 ? 300 : this.tableHeight
       } else {
         this.tableHeight = this.maxHeight

+ 1 - 10
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -142,7 +142,6 @@
         :checkbox-option="checkboxOption"
         :cell-style-option="cellStyleOption"
       />
-      <div v-show="dataSource.length==0" class="empty-data"><a-empty description="暂无数据" :image="simpleImage"/></div>
     </a-spin>
     <!-- 仓库设置 -->
     <setWarehouse :title="warehouseTit" :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
@@ -267,7 +266,7 @@ export default {
     tableHeight () {
       const len = this.dataSource.length
       if (len == 0) return 300
-      return len <= 10 ? ((len + 1) * 35) + 'px' : '350px'
+      return len <= 10 ? ((len + 1) * 36) + 'px' : '360px'
     },
     // 表格复选框设置
     checkboxOption () {
@@ -950,14 +949,6 @@ export default {
 </script>
 
 <style lang="less">
-  .empty-data{
-      color: #999;
-      text-align: center;
-      padding: 20px;
-      position: absolute;
-      bottom: 50px;
-      width: 100%;
-  }
   .table-header-cell-center{
     text-align: center!important;
   }

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -106,7 +106,7 @@
       class="sTable"
       ref="table"
       size="small"
-      :scroll="showTotal ? {y:300} :{ y: tableHeight }"
+      :scroll="showTotal ? {y:200} :{ y: tableHeight }"
       :columns="columns"
       :data="loadData"
       :row-selection="{ columnWidth: 30 }"

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

@@ -573,7 +573,7 @@ export default {
     },
     // 打开缺货明细弹框
     openStockOut () {
-      if (this.$refs.productList.outStockStr != '' || this.activeList.length && this.$refs.productActiveList.outStockStr != '') {
+      if (this.$refs.productList && this.$refs.productList.outStockStr != '' || this.activeList.length && this.$refs.productActiveList.outStockStr != '') {
         this.showStockOut = true
       } else {
         this.$info({

+ 2 - 2
src/views/salesManagement/waitDispatchNew/detailProductList.vue

@@ -25,7 +25,7 @@
         row-key-field-name="id"
         :checkbox-option="checkboxOption"
       />
-      <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
+      <div v-show="showEmpty" class="empty-data1"><a-empty description="暂无产品" :image="simpleImage"/></div>
     </a-spin>
 
   </div>
@@ -363,7 +363,7 @@ export default {
 }
 </script>
   <style lang="less">
-  .empty-data{
+  .empty-data1{
         color: #999;
         text-align: center;
         padding: 20px;