lilei 3 weeks ago
parent
commit
362d5aff19

+ 3 - 2
src/views/salesManagement/salesCollection/list.vue

@@ -144,13 +144,14 @@
         <v-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+68+'px' }"
+          :style="{ height: tableHeight+36+'px' }"
           size="small"
           :row-selection="showSelect?{ columnWidth: 40 }:null"
           @rowSelection="rowSelectionFun"
           :disableSelectedRowKeys="disableSelectedRowKeys"
           :rowKey="(record) => record.id"
           :columns="columns"
+          :pagination="{pageSize:20}"
           :data="loadData"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
@@ -507,7 +508,7 @@ export default {
     // 表格高度计算
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 237
+      this.tableHeight = window.innerHeight - tableSearchH - 205
     }
   },
   watch: {

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

@@ -329,7 +329,7 @@ export default {
     },
     // 表格高度
     tableHeight () {
-      return window.innerHeight - 335
+      return window.innerHeight - (this.showTotal ? 335 : 300)
     },
     w1 () {
       return window.innerWidth - 200

+ 8 - 3
src/views/salesManagement/salesQueryNew/detail.vue

@@ -67,7 +67,12 @@
           </a-descriptions>
         </div>
       </a-card>
-      <a-card size="small" :bordered="false" class="pages-wrap" style="margin-bottom: 6px;" >
+      <a-card
+        size="small"
+        :bordered="false"
+        class="pages-wrap"
+        style="margin-bottom: 6px;"
+        :bodyStyle="{padding:'10px 10px 0'}">
         <!-- 统计信息 -->
         <a-alert type="info" style="margin-bottom: 10px;">
           <div slot="message">
@@ -278,7 +283,7 @@
         </detailProductList>
       </a-card>
     </a-spin>
-    <div class="affix-cont" :class="bizSn?'affix-footer-bar':''" :style="{padding:hideFooter?0:'7px 0 4px'}">
+    <div class="affix-cont" :class="bizSn?'affix-footer-bar':''" :style="{padding:hideFooter?0:'10px 0'}">
       <a-button
         style="width: 100px;margin: 0 10px;"
         :disabled="spinning"
@@ -510,7 +515,7 @@ export default {
     // 表格高度计算
     pageHeight () {
       if (!this.bizSn && (this.hideNormalTable || this.hideActiveTable || this.activeList.length == 0)) {
-        return window.innerHeight - 320 + (this.hideFooter ? 45 : 0)
+        return window.innerHeight - 330 + (this.hideFooter ? 45 : 0)
       }
       return 'auto'
     },

+ 6 - 6
src/views/salesManagement/salesQueryNew/edit.vue

@@ -33,11 +33,11 @@
       </a-card>
       <!-- 正常产品 -->
       <a-card size="small" :bordered="false" class="salesEdit-cont" v-if="salesBillSn">
-        <div slot="title" style="display: flex;justify-content: space-between;align-items: center;">
+        <div slot="title" style="display: flex;justify-content: space-between;align-items: center;" v-if="showTotal">
           <strong>产品列表</strong>
           <a-button size="small" @click="showNormalList=!showNormalList" type="link" class="button-info"><a-icon :type="showNormalList?'up':'down'"/> {{ showNormalList?'收起':'展开' }}</a-button>
         </div>
-        <div style="padding: 10px 10px 0;position: relative;">
+        <div style="padding: 10px;position: relative;">
           <productNormalList
             v-show="showNormalList"
             ref="productNormalList"
@@ -264,10 +264,6 @@ export default {
     }
   },
   computed: {
-    // 是否显示统计信息
-    showTotal () {
-      return this.activeList.length > 0
-    },
     // 详细地址
     shippingAddress () {
       const shippingAddrProvinceName = this.detailData && this.detailData.salesBillExtEntity && this.detailData.salesBillExtEntity.shippingAddrProvinceName ? this.detailData.salesBillExtEntity.shippingAddrProvinceName : ''
@@ -280,6 +276,10 @@ export default {
         return shippingAddrProvinceName + shippingAddrCityName + shippingAddrCountyName + shippingAddr
       }
     },
+    // 是否显示统计信息
+    showTotal () {
+      return this.activeList.length > 0
+    },
     hasActive () {
       const list = this.activeList.filter(item => item.enabledFlag == 1)
       return list.length > 0

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

@@ -261,9 +261,9 @@ export default {
       this.showEmpty = this.dataSource.length <= 0
       const len = this.dataSource.length
       if (len < 8) {
-        this.tableHeight = this.showEmpty ? 200 : (len + 1) * 34 - 1
+        this.tableHeight = this.showEmpty ? 200 : (len + 1) * 34 - 1 + 'px'
       } else {
-        this.tableHeight = this.maxHeight
+        this.tableHeight = this.maxHeight + 'px'
       }
       this.$emit('upStockType', hasLt)
       this.spinning = false