소스 검색

Merge branch 'develop_yh28' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh28

chenrui 1 년 전
부모
커밋
bf185b9c4e
24개의 변경된 파일144개의 추가작업 그리고 195개의 파일을 삭제
  1. 2 2
      src/views/reportData/expenseAccountReport/bearerList.vue
  2. 2 2
      src/views/reportData/expenseAccountReport/categoryList.vue
  3. 10 13
      src/views/reportData/productRebateReport/detailList.vue
  4. 9 2
      src/views/reportData/productRebateReport/index.vue
  5. 17 2
      src/views/reportData/productRebateReport/list.vue
  6. 7 6
      src/views/reportData/receivedSendStorageReport/index.vue
  7. 3 2
      src/views/reportData/receivedSendStorageReport/list.vue
  8. 2 11
      src/views/salesManagement/backorder/list.vue
  9. 1 7
      src/views/salesManagement/examineVerify/list.vue
  10. 2 9
      src/views/salesManagement/matchSendOutOrder/list.vue
  11. 1 7
      src/views/salesManagement/outboundOrder/list.vue
  12. 2 11
      src/views/salesManagement/priceInquiry/list.vue
  13. 2 11
      src/views/salesManagement/pushOrderManagement/list.vue
  14. 23 21
      src/views/salesManagement/receiptPrint/list.vue
  15. 4 14
      src/views/salesManagement/salesCollection/list.vue
  16. 3 8
      src/views/salesManagement/salesList/list.vue
  17. 4 4
      src/views/salesManagement/salesOrderWarehouse/detail.vue
  18. 2 2
      src/views/salesManagement/salesOrderWarehouse/list.vue
  19. 2 3
      src/views/salesManagement/salesQueryNew/list.vue
  20. 2 8
      src/views/salesManagement/sendOutOrder/list.vue
  21. 2 8
      src/views/salesManagement/shortageStatisticsC/list.vue
  22. 2 8
      src/views/salesManagement/shortageStatisticsP/list.vue
  23. 32 29
      src/views/salesManagement/stockPrint/list.vue
  24. 8 5
      src/views/salesManagement/stockPrint/sendTypeModal.vue

+ 2 - 2
src/views/reportData/expenseAccountReport/bearerList.vue

@@ -67,7 +67,7 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :defaultLoadData="false"
@@ -318,7 +318,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 260
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   mounted () {

+ 2 - 2
src/views/reportData/expenseAccountReport/categoryList.vue

@@ -46,7 +46,7 @@
     <a-card>
       <a-spin :spinning="spinning" tip="Loading...">
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
           :defaultLoadData="false"
@@ -289,7 +289,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 260
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   mounted () {

+ 10 - 13
src/views/reportData/productRebateReport/detailList.vue

@@ -2,7 +2,7 @@
   <div>
     <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper" ref="tableSearch1">
         <a-form-model
           id="rebateDetailReport-form"
           ref="ruleForm"
@@ -98,7 +98,8 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :pageSize="30"
+          :style="{ height: tableHeight+75+'px' }"
           :scroll="{ x: 2200,y: tableHeight-20 }"
           :defaultLoadData="false"
           bordered>
@@ -213,10 +214,7 @@ export default {
   },
   watch: {
     advanced (newValue, oldValue) {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
+      this.setTableH()
     },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
       this.setTableH()
@@ -307,16 +305,15 @@ export default {
     pageInit () {
       this.disabled = false
       this.spinning = false
-      this.setTableStartH()
+      this.setTableH()
     },
     setTableH () {
-      const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        const tableSearchH = this.$refs.tableSearch1.offsetHeight
+        console.log(tableSearchH)
+        this.tableHeight = window.innerHeight - tableSearchH - 250
+      })
     },
-    setTableStartH () {
-      const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 360
-    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用

+ 9 - 2
src/views/reportData/productRebateReport/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="tabsReportList-wrap">
     <div style="background-color: #fff;margin-bottom: 5px;">
-      <a-tabs default-active-key="1" v-model="curTab">
+      <a-tabs default-active-key="1" v-model="curTab" @change="changeTab">
         <a-tab-pane key="1" tab="返利表"></a-tab-pane>
         <a-tab-pane key="2" tab="返利明细报表" force-render></a-tab-pane>
       </a-tabs>
     </div>
     <div>
       <report v-show="curTab==1"></report>
-      <detailReport v-show="curTab==2"></detailReport>
+      <detailReport ref="detailList" v-show="curTab==2"></detailReport>
     </div>
   </div>
 </template>
@@ -26,6 +26,13 @@ export default {
     return {
       curTab: '1'
     }
+  },
+  methods:{
+    changeTab(v){
+      if(v==2){
+        this.$refs.detailList.setTableH()
+      }
+    }
   }
 }
 </script>

+ 17 - 2
src/views/reportData/productRebateReport/list.vue

@@ -74,11 +74,12 @@
           class="sTable fixPagination"
           ref="table"
           size="small"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+75+'px' }"
           :scroll="{ y: tableHeight-20 }"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :defaultLoadData="false"
           bordered>
           <template slot="footer">
@@ -260,7 +261,21 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 270
+      this.tableHeight = window.innerHeight - tableSearchH - 250
+    }
+  },
+  watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
     }
   },
   mounted () {

+ 7 - 6
src/views/reportData/receivedSendStorageReport/index.vue

@@ -78,14 +78,15 @@
         <!-- 列表 -->
         <a-card size="small" :bordered="false">
           <s-table
-            class="sTable"
+            class="sTable fixPagination"
             ref="table"
             size="small"
             :rowKey="(record) => record.no"
             rowKeyName="no"
             :columns="columns"
             :data="loadData"
-            :style="{ height: tableHeight+84.5+'px' }"
+            :pageSize="30"
+            :style="{ height: tableHeight+70+'px' }"
             :scroll="{ y: tableHeight-50 }"
             :defaultLoadData="false"
             bordered>
@@ -334,7 +335,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 270
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   mounted () {
@@ -361,7 +362,7 @@ export default {
       text-align:center;
     }
   }
-/deep/.ant-tabs-tabpane.ant-tabs-tabpane-active{
-  margin-top:-11px;
-}
+  /deep/ .ant-tabs-bar{
+    margin:0;
+  }
 </style>

+ 3 - 2
src/views/reportData/receivedSendStorageReport/list.vue

@@ -2,7 +2,7 @@
   <div class="productInfoList-wrap">
     <!-- 列表 -->
     <s-table
-      class="sTable"
+      class="sTable fixPagination"
       ref="table"
       size="small"
       :rowKey="(record) => record.no"
@@ -10,7 +10,8 @@
       :columns="columns"
       :data="loadData"
       :showPagination="false"
-      :style="{ height: tableHeight+84.5+'px' }"
+      :pageSize="30"
+      :style="{ height: tableHeight+70+'px' }"
       :scroll="{ y: tableHeight }"
       :defaultLoadData="false"
       bordered>

+ 2 - 11
src/views/salesManagement/backorder/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="backorderList-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -206,13 +206,4 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .backorderList-wrap{
-    margin-bottom: 6px;
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
-  }
-</style>
+ 

+ 1 - 7
src/views/salesManagement/examineVerify/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="examineVerifyList-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -415,14 +415,8 @@ export default {
 </script>
 <style lang="less">
   .examineVerifyList-wrap{
-    margin-bottom: 6px;
     .sTable{
       margin-top: 8px;
     }
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
   }
 </style>

+ 2 - 9
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="matchSoo-wrap">
-    <a-card size="small" class="search-box" :bordered="false">
+    <a-card size="small" class="searchBoxNormal" :bordered="false">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
@@ -110,6 +110,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y:tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -383,13 +384,5 @@ export default {
     .sTable{
       margin-top: 10px;
     }
-    .ant-tabs-bar{
-      margin:0;
-    }
-    .search-box{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
   }
 </style>

+ 1 - 7
src/views/salesManagement/outboundOrder/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="outboundOrderList-wrap">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -520,14 +520,8 @@ export default {
 </script>
 <style lang="less">
   .outboundOrderList-wrap{
-     margin-bottom: 6px;
      .sTable{
        margin-top: 8px;
      }
-     &:first-child{
-       .ant-card-body{
-         padding-bottom: 0;
-       }
-     }
   }
 </style>

+ 2 - 11
src/views/salesManagement/priceInquiry/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="priceInquiryList-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form-model
@@ -355,13 +355,4 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .priceInquiryList-wrap{
-     margin-bottom: 6px;
-     &:first-child{
-       .ant-card-body{
-         padding-bottom: 0;
-       }
-     }
-  }
-</style>
+ 

+ 2 - 11
src/views/salesManagement/pushOrderManagement/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
      <!-- 搜索条件 -->
-    <a-card size="small" :bordered="false" class="pushOrder-wrap">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="15">
@@ -427,13 +427,4 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .pushOrder-wrap{
-    margin-bottom: 6px;
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 2px;
-      }
-    }
-  }
-</style>
+ 

+ 23 - 21
src/views/salesManagement/receiptPrint/list.vue

@@ -1,14 +1,6 @@
 <template>
   <div class="receiptPrint-wrap">
-    <div style="background-color: #fff;">
-      <a-tabs v-model="currentTab" @change="changeTab">
-        <a-tab-pane :key="1" tab="全部">
-        </a-tab-pane>
-        <a-tab-pane :key="2" tab="待打印">
-        </a-tab-pane>
-      </a-tabs>
-    </div>
-    <a-card style="margin-top: 5px;" size="small" class="search-box" :bordered="false">
+    <a-card size="small" class="searchBoxNormal" :bordered="false">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
@@ -70,20 +62,30 @@
         </a-form>
       </div>
     </a-card>
-    <a-card style="margin-top: 5px;" size="small" :bordered="false">
+    <a-card class="receiptPrint-body" size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 操作按钮 -->
-        <div class="table-operator" v-if="$hasPermissions('B_SkPrint')">
-          <a-button type="primary" :loading="spinning" @click="handlePlPrint()" class="button-error">批量打印</a-button>
-          <span style="margin-left: 8px">
-            <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-          </span>
+        <div class="flex-center" style="justify-content: space-between;">
+          <div style="flex-grow:1;">
+            <a-tabs v-model="currentTab" @change="changeTab">
+              <a-tab-pane :key="1" tab="全部">
+              </a-tab-pane>
+              <a-tab-pane :key="2" tab="待打印">
+              </a-tab-pane>
+            </a-tabs>
+          </div>
+          <!-- 操作按钮 -->
+          <div class="table-operator" v-if="$hasPermissions('B_SkPrint')">
+            <span style="margin:0 10px">
+              <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+            </span>
+            <a-button type="primary" :loading="spinning" @click="handlePlPrint()">批量打印</a-button>
+          </div>
         </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+80.5+'px' }"
+          :style="{ height: tableHeight+85+'px' }"
           :row-selection="$hasPermissions('B_SkPrint')?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: (record.printStatus !== 'NO_PRINT'&&record.printStatus !== 'PRINT') } })}:null"
           @rowSelection="rowSelectionFun"
           size="small"
@@ -448,7 +450,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 296
+      this.tableHeight = window.innerHeight - tableSearchH - 258
     }
   },
   watch: {
@@ -482,11 +484,11 @@ export default {
 <style lang="less">
   .receiptPrint-wrap{
     .ant-tabs-bar{
-      margin:0;
+      margin-bottom: 10px;
     }
-    .search-box{
+    .receiptPrint-body{
       .ant-card-body{
-        padding-bottom: 0;
+        padding-top:5px;
       }
     }
   }

+ 4 - 14
src/views/salesManagement/salesCollection/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
   <!-- 搜索条件 -->
-  <a-card size="small" :bordered="false" class="salesCollectionList-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
@@ -139,7 +139,7 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+65+'px' }"
+        :style="{ height: tableHeight+68+'px' }"
         size="small"
         :row-selection="showSelect?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.settleState=='FINISH' } })}:null"
         @rowSelection="rowSelectionFun"
@@ -483,7 +483,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 237
     }
   },
   watch: {
@@ -520,14 +520,4 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .salesCollectionList-wrap{
-    margin-bottom: 6px;
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
-  }
-</style>
+ 

+ 3 - 8
src/views/salesManagement/salesList/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesList-wrap">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form-model
@@ -105,13 +105,13 @@
         </a-form-model>
       </div>
     </a-card>
-    <a-card size="small" :bordered="false" style="margin-top:8px;">
+    <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+85+'px' }"
+          :style="{ height: tableHeight+87+'px' }"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
@@ -443,11 +443,6 @@ export default {
 </script>
 <style lang="less">
   .salesList-wrap{
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
     .statusBox{
       span{
         vertical-align:top;

+ 4 - 4
src/views/salesManagement/salesOrderWarehouse/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="salesDetail-wrap">
+  <div class="salesDetail-warehouse-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont">
         <template slot="subTitle">
@@ -140,7 +140,7 @@ export default {
   },
   methods: {
     getTableHeight(){
-      this.tableHeight =  window.innerHeight - (this.showDetail ? 390 : 275)
+      this.tableHeight =  window.innerHeight - (this.showDetail ? 376 : 265)
     },
     handlePrint(){
       this.openModal = true
@@ -208,9 +208,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  .salesDetail-wrap{
+  .salesDetail-warehouse-wrap{
     .salesDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .footer-cont{
       margin-top: 5px;

+ 2 - 2
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
   <!-- 搜索条件 -->
-  <a-card size="small" :bordered="false" class="salesOrderWarehouseList-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form-model
         id="salesOrderWarehouseList-form"
@@ -76,7 +76,7 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+65+'px' }"
+        :style="{ height: tableHeight+68+'px' }"
         size="small"
         :rowKey="(record) => record.no"
         rowKeyName="no"

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="salesManagementList-wrap">
+    <a-card size="small" :bordered="false" class="searchBox">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
@@ -151,7 +151,7 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+82+'px' }"
+          :style="{ height: tableHeight+87+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -701,7 +701,6 @@ export default {
 </script>
 <style lang="less" scoped>
   .salesManagementList-wrap{
-    margin-bottom: 6px;
     .sTable{
       .badge-con-t{
         .ant-badge-count{

+ 2 - 8
src/views/salesManagement/sendOutOrder/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="sendOut-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline">
@@ -367,14 +367,8 @@ export default {
 </script>
 <style lang="less">
   .sendOut-wrap{
-    margin-bottom: 6px;
     .sTable{
-      margin-top: 8px;
-    }
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
+      margin-top: 10px;
     }
   }
 </style>

+ 2 - 8
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="shortageStatisticsCList-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -408,14 +408,8 @@ export default {
 </script>
 <style lang="less">
   .shortageStatisticsCList-wrap{
-     margin-bottom: 6px;
      .sTable{
-       margin-top: 8px;
-     }
-     &:first-child{
-       .ant-card-body{
-         padding-bottom: 0;
-       }
+       margin-top: 10px;
      }
   }
 </style>

+ 2 - 8
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="shortageStatisticsPList-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -318,14 +318,8 @@ export default {
 </script>
 <style lang="less">
   .shortageStatisticsPList-wrap{
-     margin-bottom: 6px;
      .sTable{
-       margin-top: 8px;
-     }
-     &:first-child{
-       .ant-card-body{
-         padding-bottom: 0;
-       }
+       margin-top: 10px;
      }
   }
 </style>

+ 32 - 29
src/views/salesManagement/stockPrint/list.vue

@@ -1,15 +1,7 @@
 <template>
   <div class="stockPrint-wrap">
-    <div style="background-color: #fff;">
-      <a-tabs v-model="currentTab" @change="changeTab">
-        <a-tab-pane :key="1" tab="全部">
-        </a-tab-pane>
-        <a-tab-pane :key="2" tab="待打印">
-        </a-tab-pane>
-      </a-tabs>
-    </div>
       <!-- 搜索条件 -->
-    <a-card style="margin-top: 5px;" class="search-box" size="small" :bordered="false">
+    <a-card class="searchBoxNormal" size="small" :bordered="false">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="15">
@@ -102,21 +94,32 @@
         </a-form>
       </div>
     </a-card>
-    <a-card style="margin-top: 5px;" size="small" :bordered="false">
+    
+    <a-card class="stockPrint-body" size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
-        <div style="display:flex;align-items:center;justify-content: flex-end;">
-          <span>显示:</span>
-          <a-tree-select
-              size="small"
-              v-model="showCols"
-              style="min-width: 200px"
-              dropdownMatchSelectWidth
-              :maxTagCount="3"
-              :tree-data="colsArr"
-              tree-checkable
-              :show-checked-strategy="SHOW_PARENT"
-              placeholder="请选择要显示的列"
-            />
+        <div class="flex-center" style="justify-content: space-between;">
+          <div style="flex-grow:1;">
+            <a-tabs v-model="currentTab" @change="changeTab">
+              <a-tab-pane :key="1" tab="全部">
+              </a-tab-pane>
+              <a-tab-pane :key="2" tab="待打印">
+              </a-tab-pane>
+            </a-tabs>
+          </div>
+          <div>
+            <span>显示:</span>
+            <a-tree-select
+                size="small"
+                v-model="showCols"
+                style="min-width: 200px"
+                dropdownMatchSelectWidth
+                :maxTagCount="3"
+                :tree-data="colsArr"
+                tree-checkable
+                :show-checked-strategy="SHOW_PARENT"
+                placeholder="请选择要显示的列"
+              />
+          </div>
         </div>
         <!-- 列表 -->
         <s-table
@@ -496,7 +499,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 295
+      this.tableHeight = window.innerHeight - tableSearchH - 260
     }
   },
   watch: {
@@ -538,13 +541,13 @@ export default {
     .sTable{
       margin-top: 10px;
     }
-    .ant-tabs-bar{
-      margin:0;
-    }
-    .search-box{
+    .stockPrint-body{
       .ant-card-body{
-        padding-bottom: 0;
+        padding-top:5px;
       }
     }
+    .ant-tabs-bar{
+      margin:0;
+    }
   }
 </style>

+ 8 - 5
src/views/salesManagement/stockPrint/sendTypeModal.vue

@@ -17,19 +17,19 @@
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol"
       >
-        <a-form-model-item label="销售单号" style="margin-bottom: 0;">
+        <a-form-model-item label="销售单号">
           {{ detailData&&detailData.salesBillNo || '--' }}
         </a-form-model-item>
-        <a-form-model-item label="备货单号" style="margin-bottom: 0;">
+        <a-form-model-item label="备货单号">
           {{ detailData&&detailData.dispatchBillNo || '--' }}
         </a-form-model-item>
-        <a-form-model-item label="发货编号" style="margin-bottom: 0;">
+        <a-form-model-item label="发货编号">
           {{ detailData&&detailData.sendNo || '--' }}
         </a-form-model-item>
-        <a-form-model-item label="客户名称" style="margin-bottom: 0;">
+        <a-form-model-item label="客户名称">
           {{ detailData&&detailData.buyerName || '--' }}
         </a-form-model-item>
-        <a-form-model-item label="收货客户名称" style="margin-bottom: 0;">
+        <a-form-model-item label="收货客户名称">
           {{ detailData&&detailData.receiverName || '--' }}
         </a-form-model-item>
         <a-form-model-item label="产品分类" prop="id">
@@ -201,5 +201,8 @@ export default {
       text-align: center;
       margin: 35px 0 10px;
     }
+    .ant-form-item{
+      margin-bottom: 0;
+    }
   }
 </style>