瀏覽代碼

样式修改

lilei 1 年之前
父節點
當前提交
caf23cd765

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

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div>
   <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">
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -206,13 +206,4 @@ export default {
   }
   }
 }
 }
 </script>
 </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>
 <template>
   <div>
   <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">
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -415,14 +415,8 @@ export default {
 </script>
 </script>
 <style lang="less">
 <style lang="less">
   .examineVerifyList-wrap{
   .examineVerifyList-wrap{
-    margin-bottom: 6px;
     .sTable{
     .sTable{
       margin-top: 8px;
       margin-top: 8px;
     }
     }
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
   }
   }
 </style>
 </style>

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

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

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

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

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

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div>
   <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">
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form-model
       <a-form-model
@@ -355,13 +355,4 @@ export default {
   }
   }
 }
 }
 </script>
 </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>
 <template>
   <div>
   <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">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
         <a-form layout="inline">
           <a-row :gutter="15">
           <a-row :gutter="15">
@@ -427,13 +427,4 @@ export default {
   }
   }
 }
 }
 </script>
 </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>
 <template>
   <div class="receiptPrint-wrap">
   <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">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
         <a-form layout="inline">
@@ -70,20 +62,30 @@
         </a-form>
         </a-form>
       </div>
       </div>
     </a-card>
     </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...">
       <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>
         </div>
         <!-- 列表 -->
         <!-- 列表 -->
         <s-table
         <s-table
           class="sTable fixPagination"
           class="sTable fixPagination"
           ref="table"
           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"
           :row-selection="$hasPermissions('B_SkPrint')?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: (record.printStatus !== 'NO_PRINT'&&record.printStatus !== 'PRINT') } })}:null"
           @rowSelection="rowSelectionFun"
           @rowSelection="rowSelectionFun"
           size="small"
           size="small"
@@ -448,7 +450,7 @@ export default {
     },
     },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 296
+      this.tableHeight = window.innerHeight - tableSearchH - 258
     }
     }
   },
   },
   watch: {
   watch: {
@@ -482,11 +484,11 @@ export default {
 <style lang="less">
 <style lang="less">
   .receiptPrint-wrap{
   .receiptPrint-wrap{
     .ant-tabs-bar{
     .ant-tabs-bar{
-      margin:0;
+      margin-bottom: 10px;
     }
     }
-    .search-box{
+    .receiptPrint-body{
       .ant-card-body{
       .ant-card-body{
-        padding-bottom: 0;
+        padding-top:5px;
       }
       }
     }
     }
   }
   }

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

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div>
   <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">
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
         <a-row :gutter="15">
@@ -139,7 +139,7 @@
       <s-table
       <s-table
         class="sTable fixPagination"
         class="sTable fixPagination"
         ref="table"
         ref="table"
-        :style="{ height: tableHeight+65+'px' }"
+        :style="{ height: tableHeight+68+'px' }"
         size="small"
         size="small"
         :row-selection="showSelect?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.settleState=='FINISH' } })}:null"
         :row-selection="showSelect?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.settleState=='FINISH' } })}:null"
         @rowSelection="rowSelectionFun"
         @rowSelection="rowSelectionFun"
@@ -483,7 +483,7 @@ export default {
     },
     },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 237
     }
     }
   },
   },
   watch: {
   watch: {
@@ -520,14 +520,4 @@ export default {
   }
   }
 }
 }
 </script>
 </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>
 <template>
   <div>
   <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">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
@@ -105,13 +105,13 @@
         </a-form-model>
         </a-form-model>
       </div>
       </div>
     </a-card>
     </a-card>
-    <a-card size="small" :bordered="false" style="margin-top:8px;">
+    <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <!-- 列表 -->
         <s-table
         <s-table
           class="sTable fixPagination"
           class="sTable fixPagination"
           ref="table"
           ref="table"
-          :style="{ height: tableHeight+85+'px' }"
+          :style="{ height: tableHeight+87+'px' }"
           size="small"
           size="small"
           :rowKey="(record) => record.no"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           rowKeyName="no"
@@ -443,11 +443,6 @@ export default {
 </script>
 </script>
 <style lang="less">
 <style lang="less">
   .salesList-wrap{
   .salesList-wrap{
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
     .statusBox{
     .statusBox{
       span{
       span{
         vertical-align:top;
         vertical-align:top;

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

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

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

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div>
   <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">
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form-model
       <a-form-model
         id="salesOrderWarehouseList-form"
         id="salesOrderWarehouseList-form"
@@ -76,7 +76,7 @@
       <s-table
       <s-table
         class="sTable fixPagination"
         class="sTable fixPagination"
         ref="table"
         ref="table"
-        :style="{ height: tableHeight+65+'px' }"
+        :style="{ height: tableHeight+68+'px' }"
         size="small"
         size="small"
         :rowKey="(record) => record.no"
         :rowKey="(record) => record.no"
         rowKeyName="no"
         rowKeyName="no"

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

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

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

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div>
   <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">
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline">
       <a-form layout="inline">
@@ -367,14 +367,8 @@ export default {
 </script>
 </script>
 <style lang="less">
 <style lang="less">
   .sendOut-wrap{
   .sendOut-wrap{
-    margin-bottom: 6px;
     .sTable{
     .sTable{
-      margin-top: 8px;
-    }
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
+      margin-top: 10px;
     }
     }
   }
   }
 </style>
 </style>

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

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

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

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

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

@@ -1,15 +1,7 @@
 <template>
 <template>
   <div class="stockPrint-wrap">
   <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">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
         <a-form layout="inline">
           <a-row :gutter="15">
           <a-row :gutter="15">
@@ -102,21 +94,32 @@
         </a-form>
         </a-form>
       </div>
       </div>
     </a-card>
     </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...">
       <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>
         </div>
         <!-- 列表 -->
         <!-- 列表 -->
         <s-table
         <s-table
@@ -496,7 +499,7 @@ export default {
     },
     },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 295
+      this.tableHeight = window.innerHeight - tableSearchH - 260
     }
     }
   },
   },
   watch: {
   watch: {
@@ -538,13 +541,13 @@ export default {
     .sTable{
     .sTable{
       margin-top: 10px;
       margin-top: 10px;
     }
     }
-    .ant-tabs-bar{
-      margin:0;
-    }
-    .search-box{
+    .stockPrint-body{
       .ant-card-body{
       .ant-card-body{
-        padding-bottom: 0;
+        padding-top:5px;
       }
       }
     }
     }
+    .ant-tabs-bar{
+      margin:0;
+    }
   }
   }
 </style>
 </style>

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

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