Sfoglia il codice sorgente

样式调整以及部分功能优化:
1、表格均改为每页20条,并显示共n条记录
2、编辑价格数量时统一更改为输入框移出光标触发更改(例 编辑销售单或采购单页)
3、表头均添加背景色
4、合计栏去掉图标
5、列表页查询条件默认展开,除超过三行条件则默认收起

chenrui 3 anni fa
parent
commit
e940fbf014
100 ha cambiato i file con 1061 aggiunte e 694 eliminazioni
  1. 1 1
      src/components/Menu/SideMenu.vue
  2. 8 1
      src/components/Menu/menu.js
  3. 1 1
      src/components/MultiTab/MultiTab.vue
  4. 3 4
      src/components/Table/index.js
  5. 129 0
      src/components/custom.less
  6. 2 2
      src/components/global.less
  7. 4 3
      src/layouts/BasicLayout.vue
  8. 1 1
      src/views/Home.vue
  9. 2 2
      src/views/allocationManagement/chainTransferIn/detail.vue
  10. 34 12
      src/views/allocationManagement/chainTransferIn/edit.vue
  11. 2 2
      src/views/allocationManagement/chainTransferIn/list.vue
  12. 2 2
      src/views/allocationManagement/chainTransferOut/detail.vue
  13. 35 13
      src/views/allocationManagement/chainTransferOut/edit.vue
  14. 2 2
      src/views/allocationManagement/chainTransferOut/list.vue
  15. 3 3
      src/views/allocationManagement/storeTransferOut/detail.vue
  16. 25 20
      src/views/allocationManagement/storeTransferOut/edit.vue
  17. 3 3
      src/views/allocationManagement/storeTransferOut/list.vue
  18. 2 2
      src/views/allocationManagement/warehouseAllocation/detail.vue
  19. 47 35
      src/views/allocationManagement/warehouseAllocation/edit.vue
  20. 3 3
      src/views/allocationManagement/warehouseAllocation/list.vue
  21. 2 2
      src/views/bulkManagement/bulkReturnGoods/edit.vue
  22. 2 2
      src/views/bulkManagement/bulkReturnGoods/list.vue
  23. 3 3
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  24. 50 34
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  25. 4 4
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  26. 5 0
      src/views/common/custList.vue
  27. 5 0
      src/views/common/rangeDate.vue
  28. 51 0
      src/views/common/tablePagination.vue
  29. 1 1
      src/views/customerManagement/customerInfo/detailModal.vue
  30. 1 1
      src/views/customerManagement/customerInfo/edit.vue
  31. 2 2
      src/views/customerManagement/customerInfo/list.vue
  32. 2 2
      src/views/financialManagement/companyCollectionPayment/detail.vue
  33. 2 2
      src/views/financialManagement/companyCollectionPayment/list.vue
  34. 3 3
      src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue
  35. 3 5
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  36. 2 2
      src/views/financialManagement/companyReceivablePayable/detail.vue
  37. 1 1
      src/views/financialManagement/companyReceivablePayable/list.vue
  38. 1 1
      src/views/financialManagement/expenseManagement/edit.vue
  39. 3 3
      src/views/financialManagement/expenseManagement/list.vue
  40. 3 13
      src/views/financialManagement/financialCollection/list.vue
  41. 3 13
      src/views/financialManagement/financialPayment/list.vue
  42. 2 2
      src/views/financialManagement/inventoryReview/detail.vue
  43. 1 1
      src/views/financialManagement/inventoryReview/list.vue
  44. 2 9
      src/views/financialManagement/ledgerRecord/list.vue
  45. 2 2
      src/views/financialManagement/warehousingAudit/detail.vue
  46. 2 2
      src/views/financialManagement/warehousingAudit/list.vue
  47. 1 1
      src/views/financialManagement/withdrawalManagement/list.vue
  48. 3 3
      src/views/inventoryManagement/inventoryChecking/detail.vue
  49. 3 3
      src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue
  50. 2 2
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  51. 3 3
      src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue
  52. 1 1
      src/views/inventoryManagement/inventoryChecking/overall.vue
  53. 3 3
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  54. 1 1
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  55. 3 3
      src/views/inventoryManagement/inventoryQuery/list.vue
  56. 3 3
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  57. 25 17
      src/views/inventoryManagement/inventoryWarning/list.vue
  58. 2 1
      src/views/inventoryManagement/satelliteWarehouseInventory/addModal.vue
  59. 21 14
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  60. 1 1
      src/views/inventoryManagement/warehouse/list.vue
  61. 2 2
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  62. 20 15
      src/views/notice/list.vue
  63. 6 10
      src/views/productManagement/priceChangeRecord/list.vue
  64. 1 1
      src/views/productManagement/productBrand/list.vue
  65. 1 1
      src/views/productManagement/productCategory/list.vue
  66. 1 1
      src/views/productManagement/productInfo/edit.vue
  67. 6 6
      src/views/productManagement/productInfo/list.vue
  68. 7 7
      src/views/productManagement/productInfoJg/list.vue
  69. 4 4
      src/views/purchasingManagement/purchaseOrder/detail.vue
  70. 5 2
      src/views/purchasingManagement/purchaseOrder/edit.vue
  71. 3 3
      src/views/purchasingManagement/purchaseOrder/list.vue
  72. 1 1
      src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue
  73. 1 1
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  74. 1 1
      src/views/purchasingManagement/purchaseReturn/detail.vue
  75. 43 30
      src/views/purchasingManagement/purchaseReturn/edit.vue
  76. 3 3
      src/views/purchasingManagement/purchaseReturn/list.vue
  77. 2 2
      src/views/reportData/chainReceivedSendStorageReport/list.vue
  78. 2 2
      src/views/reportData/chainSalesDetailReport/list.vue
  79. 2 2
      src/views/reportData/chainSalesReport/list.vue
  80. 1 1
      src/views/reportData/chainStockReport/detailModal.vue
  81. 3 3
      src/views/reportData/chainStockReport/list.vue
  82. 3 3
      src/views/reportData/customerReport/list.vue
  83. 2 2
      src/views/reportData/receivedSendStorageReport/list.vue
  84. 1 1
      src/views/reportData/stockExpenditureReport/list.vue
  85. 1 1
      src/views/reportData/stockIncomeReport/list.vue
  86. 2 2
      src/views/salesManagement/giftRecord/list.vue
  87. 17 16
      src/views/salesManagement/outboundOrder/list.vue
  88. 3 3
      src/views/salesManagement/quotation/detail.vue
  89. 2 2
      src/views/salesManagement/quotation/edit.vue
  90. 1 1
      src/views/salesManagement/quotation/list.vue
  91. 2 2
      src/views/salesManagement/salesQuery/detail.vue
  92. 102 88
      src/views/salesManagement/salesQuery/edit.vue
  93. 24 23
      src/views/salesManagement/salesQuery/list.vue
  94. 20 16
      src/views/salesManagement/salesQuery/productSalesRecordModal.vue
  95. 20 21
      src/views/salesManagement/salesQuery/queryPart.vue
  96. 2 2
      src/views/salesManagement/salesReturn/detail.vue
  97. 3 3
      src/views/salesManagement/salesReturn/list.vue
  98. 102 65
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  99. 97 64
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  100. 3 3
      src/views/salesManagement/urgentItemsOffset/detail.vue

+ 1 - 1
src/components/Menu/SideMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="256px"
+    width="230px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">

+ 8 - 1
src/components/Menu/menu.js

@@ -116,11 +116,18 @@ export default {
       return (
         <Item {...{ key: menu.path }}>
           <tag {...{ props, attrs }}>
-            {this.renderIcon(menu.meta.icon)}
             <span>{menu.meta.title}</span>
           </tag>
         </Item>
       )
+      // return (
+      //   <Item {...{ key: menu.path }}>
+      //     <tag {...{ props, attrs }}>
+      //       {this.renderIcon(menu.meta.icon)}
+      //       <span>{menu.meta.title}</span>
+      //     </tag>
+      //   </Item>
+      // )
     },
     renderSubMenu (menu) {
       const itemArr = []

+ 1 - 1
src/components/MultiTab/MultiTab.vue

@@ -165,7 +165,7 @@ export default {
 
     return (
       <div class="ant-pro-mu  lti-tab">
-        <div class="ant-pro-multi-tab-wrapper">
+        <div class="ant-pro-multi-tab-wrapper multi-tab-con">
           <a-tabs
             hideAdd
             type={'editable-card'}

+ 3 - 4
src/components/Table/index.js

@@ -5,10 +5,8 @@ export default {
   data () {
     return {
       needTotalList: [],
-
       selectedRows: [],
       selectedRowKeys: [],
-
       localLoading: false,
       localDataSource: [],
       localPagination: Object.assign({}, this.pagination)
@@ -33,7 +31,7 @@ export default {
     },
     pageSize: {
       type: Number,
-      default: 10
+      default: 20
     },
     showSizeChanger: {
       type: Boolean,
@@ -125,6 +123,7 @@ export default {
     this.localPagination = ['auto', true].includes(this.showPagination) && Object.assign({}, this.localPagination, {
       current: localPageNum,
       pageSize: this.pageSize,
+      showTotal: total => `共 ${total} 条记录`,
       showSizeChanger: this.showSizeChanger
     }) || false
     // console.log('this.localPagination', this.localPagination)
@@ -146,7 +145,7 @@ export default {
       this.loadData()
     },
     // 重置表格为空
-    clearTable(){
+    clearTable () {
       this.localDataSource = []
       this.localPagination = Object.assign({}, {
         current: 1, pageSize: this.pageSize, total: 0

+ 129 - 0
src/components/custom.less

@@ -0,0 +1,129 @@
+// 自定义样式文件   覆盖框架样式
+
+body{
+  font-size: 13px!important;
+  span,td,label,.ant-btn-sm{
+    font-size: 13px!important;
+  }
+}
+// 查询条件样式
+.table-page-search-wrapper {
+  .ant-form-inline, .ant-form {
+    .ant-form-item {
+      margin-bottom: 10px;
+      .ant-input,.ant-select-selection{
+        border-radius: 2px;
+        padding: 0px 11px;
+      }
+      .ant-form-item-label{
+        line-height: 32px!important;
+        // line-height: 24px!important;  // 小号行距
+        padding-right: 8px!important;
+      }
+      .ant-form-item-control{
+        line-height: 31px!important;
+        // height: 24px!important;  // 小号行距
+        // line-height: 24px!important;  // 小号行距
+      }
+      .ant-form-item-control-wrapper{
+        .ant-select-selection__rendered{
+          margin: 0!important;
+        }
+      }
+    }
+  }
+  .table-page-search-submitButtons {
+    margin-bottom: 10px;
+  }
+}
+// 菜单样式
+.sider {
+  .logo {
+    h1 {
+      font-size: 15px!important;
+    }
+  }
+  .ant-menu{
+    .ant-menu-item{
+      // padding-left: 10px!important;  //  只有一级菜单时的左侧缩进(例:首页)
+    }
+    .ant-menu-submenu{
+      .ant-menu-submenu-title{
+        // padding-left: 10px!important;  //  多级菜单的一级菜单左侧缩进
+      }
+      .ant-menu-item{  //  二级菜单左侧缩进
+        padding-left: 30px!important;
+      }
+    }
+  }
+}
+// 内容盒子样式
+.content {
+  .table-operator {
+    padding: 8px 0;
+  }
+  .table-operator-nobor{
+    padding: 0 0 10px 0;
+    button {
+      margin-right: 5px;
+    }
+  }
+}
+// 页签样式
+.multi-tab-con{
+  .ant-tabs-nav-container{
+    height: 25px!important;
+    .ant-tabs-tab{
+      padding: 0 8px!important;
+      height: 24px!important;
+      line-height: 24px!important;
+    }
+  }
+}
+// a-alert样式
+.ant-alert,.ant-alert-info{
+  .ant-alert-icon{
+    top: 6.5px!important;
+    left: 5px!important;
+  }
+  padding: 3px 10px!important;
+  border-radius: 2px!important;
+}
+.ant-page-header{
+  padding: 5px 10px!important;
+}
+// 折叠面板 样式
+.ant-collapse{
+  .ant-collapse-header{
+    padding-top: 8px!important;
+    padding-bottom: 8px!important;
+  }
+  .ant-collapse-content-box{
+    padding: 10px 12px 5px!important;
+    .ant-descriptions-item{
+      padding-bottom: 10px!important;
+    }
+  }
+}
+// 表格 样式
+.sTable{
+  .ant-table{
+    .ant-table-content{
+      .ant-table-header tr th, .ant-table-thead tr th{
+        background: #fafafa!important;
+        font-weight: bold;
+      }
+    }
+  }
+  .ant-table-row{
+    .ant-table-row-cell-break-word, td{
+      padding: 6px 4px!important;
+    }
+  }
+  .ant-pagination.ant-table-pagination{
+    margin: 10px 0;
+  }
+  .ant-table-small > .ant-table-content > .ant-table-body{
+    margin: 0;
+  }
+}

+ 2 - 2
src/components/global.less

@@ -133,7 +133,7 @@ body {
       transition: width 0.2s;
 
       &.ant-header-side-opened {
-        width: calc(100% - 256px);
+        width: calc(100% - 230px);
       }
 
       &.ant-header-side-closed {
@@ -151,7 +151,7 @@ body {
       right:0;
       margin: auto;
       &.ant-header-side-opened {
-        width: calc(100% - 256px);
+        width: calc(100% - 230px);
       }
       
       &.ant-header-side-closed {

+ 4 - 3
src/layouts/BasicLayout.vue

@@ -39,7 +39,7 @@
         @toggle="toggle"
       />
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: multiTab&&fixedHeader ? '85px' : (!multiTab&&fixedHeader?'45px':'0') }">
+      <a-layout-content :style="{ height: '100%', margin: '24px 20px 0', paddingTop: multiTab&&fixedHeader ? '66px' : (!multiTab&&fixedHeader?'45px':'0') }">
         <transition name="page-transition">
           <route-view/>
         </transition>
@@ -99,7 +99,7 @@ export default {
         return '0'
       }
       if (this.sidebarOpened) {
-        return '256px'
+        return '230px'
       }
       return '80px'
     }
@@ -142,7 +142,7 @@ export default {
     paddingCalc () {
       let left = ''
       if (this.sidebarOpened) {
-        left = this.isDesktop() ? '256px' : '80px'
+        left = this.isDesktop() ? '230px' : '80px'
       } else {
         left = (this.isMobile() && '0') || ((this.fixSidebar && '80px') || '0')
       }
@@ -159,6 +159,7 @@ export default {
 
 <style lang="less">
 @import url('../components/global.less');
+@import url('../components/custom.less');  //  自定义样式文件
 
 /*
  * The following styles are auto-applied to elements with

+ 1 - 1
src/views/Home.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="home">
-    <a-alert :message="message" type="info" showIcon />
+    <a-alert :message="message" type="info" />
     <!-- 重置密码 -->
     <a-modal
       class="resetPwdModal"

+ 2 - 2
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -38,7 +38,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="chainTransferInDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:10px">
+        <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
             总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
             总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -187,7 +187,7 @@ export default {
 <style lang="less">
   .chainTransferInDetail-wrap{
     .chainTransferInDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 34 - 12
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -30,7 +30,7 @@
         </a-collapse>
       </a-card>
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           总款数 <strong>{{ (basicInfoData&&(basicInfoData.productTotalCategory || basicInfoData.productTotalCategory==0)) ? basicInfoData.productTotalCategory : '--' }}</strong> ,
           总数量 <strong>{{ (basicInfoData&&(basicInfoData.productTotalQty || basicInfoData.productTotalQty==0)) ? basicInfoData.productTotalQty : '--' }}</strong> ,
@@ -66,7 +66,7 @@
                     allowClear />
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="getProductList(1)" :disabled="disabled" id="chainTransferInEdit-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInEdit-reset">重置</a-button>
               </a-col>
@@ -83,10 +83,12 @@
           :dataSource="loadData"
           :loading="loading"
           :scroll="{ x: 1415 }"
+          :pagination="false"
           bordered>
           <!-- 仓库仓位 -->
           <template slot="warehouse" slot-scope="text, record, index">
             <a-cascader
+              size="small"
               @change="e => changeWarehouseCascade(e, record, index)"
               v-model="record.warehouseCascade"
               expand-trigger="hover"
@@ -98,6 +100,14 @@
               style="width: 100%;" />
           </template>
         </a-table>
+        <!-- 分页 -->
+        <tablePagination
+          ref="tablePagination"
+          :total="paginationProps.total"
+          :current="paginationProps.current"
+          :pageSize="paginationProps.pageSize"
+          @changePageSize="changePageSize"
+          @changePage="changePage" />
       </a-card>
       <a-affix :offset-bottom="0">
         <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
@@ -118,12 +128,13 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { getOperationalPrecision } from '@/libs/tools.js'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import { warehouseCascadeList } from '@/api/warehouse'
 import { allocLinkagePutDetailSn, allocLinkagePutDetailList, allocLinkagePutDetailCount, allocLinkagePutDetailUpdate, allocLinkagePutSubmit, allocLinkagePutDetailPrint } from '@/api/allocLinkagePut'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   data () {
     return {
       spinning: false,
@@ -152,14 +163,10 @@ export default {
         { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 280, align: 'center' }
       ],
       loadData: [],
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       },
       basicInfoData: null, //  基本信息
       productTotal: null, //  合计
@@ -175,6 +182,9 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.productType = []
+      this.paginationProps.total = 0
+      this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.getProductList(1)
     },
     // 基本信息
@@ -205,8 +215,8 @@ export default {
     getProductList (pageNo) {
       this.disabled = true
       this.loading = true
-      this.pageNo = pageNo || this.pageNo
-      const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam, { allocationLinkagePutSn: this.$route.params.sn })
+      this.paginationProps.current = pageNo || this.paginationProps.current
+      const params = Object.assign({ pageNo: this.paginationProps.current, pageSize: this.paginationProps.pageSize }, this.queryParam, { allocationLinkagePutSn: this.$route.params.sn })
       allocLinkagePutDetailList(params).then(res => {
         this.loading = false
         if (res.status == 200) {
@@ -234,10 +244,22 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
     },
+    //  分页  一页多少条change
+    changePageSize (current, pageSize) {
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
+      this.getProductList()
+    },
+    //  分页 页码change
+    changePage (current) {
+      this.paginationProps.current = current
+      this.getProductList()
+    },
     // 合计
     getDetailCount (params) {
       allocLinkagePutDetailCount(params).then(res => {
@@ -378,10 +400,10 @@ export default {
 <style lang="less">
   .chainTransferInEdit-wrap{
     .chainTransferInEdit-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .chainTransferInEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 2 - 2
src/views/allocationManagement/chainTransferIn/list.vue

@@ -59,7 +59,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chainTransferInList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -126,7 +126,7 @@ export default {
     return {
       spinning: false,
       tableHeight: 0,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',

+ 2 - 2
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -42,7 +42,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -201,6 +201,6 @@ export default {
 
 <style lang="less">
   .chainTransferOutDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 35 - 13
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -77,7 +77,7 @@
                       </a-form-item>
                     </a-col>
                   </template>
-                  <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                  <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="getProductList(1)" :disabled="disabled" id="chainTransferOutEdit-refresh">查询</a-button>
                     <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="chainTransferOutEdit-reset">重置</a-button>
                     <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -99,10 +99,12 @@
               :dataSource="loadData"
               :loading="loading"
               :scroll="{ x: 1680, y: 300 }"
+              :pagination="false"
               bordered>
               <!-- 调出数量 -->
               <template slot="outQty" slot-scope="text, record">
                 <a-input-number
+                  size="small"
                   id="chainTransferOutEdit-outQty"
                   v-model="record.outQty"
                   :precision="0"
@@ -116,6 +118,14 @@
                 <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="chainTransferOutEdit-add-btn">添加</a-button>
               </template>
             </a-table>
+            <!-- 分页 -->
+            <tablePagination
+              ref="tablePagination"
+              :total="paginationProps.total"
+              :current="paginationProps.current"
+              :pageSize="paginationProps.pageSize"
+              @changePageSize="changePageSize"
+              @changePage="changePage" />
           </a-collapse-panel>
         </a-collapse>
       </a-card>
@@ -124,7 +134,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -147,7 +157,7 @@
                           <a-input id="chainTransferOutEdit-productName" v-model="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
                         </a-form-item>
                       </a-col>
-                      <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                      <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                         <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="chainTransferOutList-refresh">查询</a-button>
                         <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="chainTransferOutList-reset">重置</a-button>
                       </a-col>
@@ -197,6 +207,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { getOperationalPrecision } from '@/libs/tools.js'
 import { allocLinkageOutDetailSn, allocLinkageOutDetailList, allocLinkageOutDetailSave, allocLinkageOutDetailDel, allocLinkageOutDetailCount, allocLinkageOutSubmit, allocLinkageOutDetailDelAll, allocLinkageOutDetailPrint } from '@/api/allocLinkageOut'
 import { productQuery } from '@/api/allocWarehouse'
@@ -204,7 +215,7 @@ import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import { warehouseAllList } from '@/api/warehouse'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   data () {
     return {
       spinning: false,
@@ -242,14 +253,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       loadData: [],
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       },
       chooseQueryParam: {
         productCode: '',
@@ -306,6 +313,9 @@ export default {
       this.queryParam.productTypeSn2 = undefined
       this.queryParam.productTypeSn3 = undefined
       this.productType = []
+      this.paginationProps.total = 0
+      this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.getProductList(1)
     },
     // 已选产品  重置
@@ -436,10 +446,10 @@ export default {
     getProductList (pageNo) {
       this.disabled = true
       this.loading = true
-      this.pageNo = pageNo || this.pageNo
+      this.paginationProps.current = pageNo || this.paginationProps.current
       // 箭冠品牌 sysFlag传1,非箭冠品牌传0。与新增时所选调出产品类型有关
       this.queryParam.sysFlag = this.basicInfoData.allocationType == 'JIANGUAN' ? '1' : '0'
-      const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
+      const params = Object.assign({ pageNo: this.paginationProps.current, pageSize: this.paginationProps.pageSize }, this.queryParam)
       productQuery(params).then(res => {
         this.loading = false
         if (res.status == 200) {
@@ -455,6 +465,7 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
@@ -469,6 +480,17 @@ export default {
         }
       })
     },
+    //  分页  一页多少条change
+    changePageSize (current, pageSize) {
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
+      this.getProductList()
+    },
+    //  分页 页码change
+    changePage (current) {
+      this.paginationProps.current = current
+      this.getProductList()
+    },
     //  产品分类  change
     changeProductType (val, opt) {
       this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
@@ -553,10 +575,10 @@ export default {
 <style lang="less">
   .chainTransferOutEdit-wrap{
     .chainTransferOutEdit-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .chainTransferOutEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 2 - 2
src/views/allocationManagement/chainTransferOut/list.vue

@@ -59,7 +59,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chainTransferOutList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="chainTransferOutList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -139,7 +139,7 @@ export default {
     return {
       spinning: false,
       tableHeight: 0,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',

+ 3 - 3
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -40,7 +40,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="storeTransferOutDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:10px">
+        <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
             总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
             总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -197,10 +197,10 @@ export default {
 <style lang="less">
   .storeTransferOutDetail-wrap{
     .storeTransferOutDetail-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .storeTransferOutDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 25 - 20
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -72,7 +72,7 @@
                       </a-form-item>
                     </a-col>
                   </template>
-                  <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                  <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
                     <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
                     <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -108,7 +108,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -131,7 +131,7 @@
                           <a-input id="storeTransferOutEdit-productName" v-model="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
                         </a-form-item>
                       </a-col>
-                      <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                      <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                         <a-button type="primary" @click="getChooseProductList(1)" :disabled="chooseDisabled" id="storeTransferOutList-refresh">查询</a-button>
                         <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="storeTransferOutList-reset">重置</a-button>
                       </a-col>
@@ -153,11 +153,12 @@
               :dataSource="chooseLoadData"
               :loading="loading"
               :scroll="{ x: 1335, y: 300 }"
-              :pagination="choosePaginationProps"
+              :pagination="false"
               bordered>
               <!-- 调出数量 -->
               <template slot="outQty" slot-scope="text, record">
                 <a-input-number
+                  size="small"
                   id="storeTransferOutEdit-outQty"
                   v-model="record.outQty"
                   :precision="0"
@@ -172,6 +173,14 @@
                 <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="storeTransferOutEdit-del-btn">删除</a-button>
               </template>
             </a-table>
+            <!-- 分页 -->
+            <tablePagination
+              ref="tablePagination"
+              :total="choosePaginationProps.total"
+              :current="choosePaginationProps.current"
+              :pageSize="choosePaginationProps.pageSize"
+              @changePageSize="changeChoosePageSize"
+              @changePage="changeChoosePage" />
           </a-collapse-panel>
         </a-collapse>
       </a-card>
@@ -194,6 +203,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { getOperationalPrecision } from '@/libs/tools.js'
 import { storeCallOutDetailList, storeCallOutDetail, storeCallOutDetailCount, storeCallOutDetailSave, storeCallOutDetailDel, storeCallOutSubmit, storeCallOutDetailPrint } from '@/api/storeCallOut'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
@@ -201,7 +211,7 @@ import { dealerProductTypeList } from '@/api/dealerProductType'
 import { warehouseAllList } from '@/api/warehouse'
 import { productQuery } from '@/api/allocWarehouse'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   data () {
     return {
       spinning: false,
@@ -265,14 +275,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
-      choosePageNo: 1, //  分页页码
-      choosePageSize: 10, //  分页 每页多少条
       choosePaginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changeChoosePageSize(current, pageSize),
-        onChange: (current) => this.changeChoosePage(current)
+        pageSize: 20
       },
       basicInfoData: null, //  基本信息
       productTotal: null, //  合计
@@ -340,10 +346,9 @@ export default {
     chooseResetSearchForm () {
       this.chooseQueryParam.productCode = ''
       this.chooseQueryParam.productName = ''
-      this.choosePageNo = 1
-      this.choosePageSize = 10
       this.choosePaginationProps.total = 0
       this.choosePaginationProps.current = 1
+      this.choosePaginationProps.pageSize = 20
       this.getChooseProductList(1)
     },
     // 基本信息
@@ -450,23 +455,23 @@ export default {
     },
     //  已选产品 分页  一页多少条change
     changeChoosePageSize (current, pageSize) {
-      this.choosePageNo = current
-      this.choosePageSize = pageSize
+      this.choosePaginationProps.current = current
+      this.choosePaginationProps.pageSize = pageSize
       this.getChooseProductList()
     },
     //  已选产品 分页 页码change
     changeChoosePage (current) {
-      this.choosePageNo = current
+      this.choosePaginationProps.current = current
       this.getChooseProductList()
     },
     // 已选产品列表数据
     getChooseProductList (pageNo) {
-      this.choosePageNo = this.choosePageNo || pageNo
+      this.choosePaginationProps.current = pageNo || this.choosePaginationProps.current
       this.chooseDisabled = true
       this.loading = true
       const params = {
-        pageNo: this.choosePageNo,
-        pageSize: this.choosePageSize,
+        pageNo: this.choosePaginationProps.current,
+        pageSize: this.choosePaginationProps.pageSize,
         storeCallOutSn: this.$route.params.sn
       }
       storeCallOutDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
@@ -558,10 +563,10 @@ export default {
 <style lang="less">
   .storeTransferOutEdit-wrap{
     .storeTransferOutEdit-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .storeTransferOutEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 3 - 3
src/views/allocationManagement/storeTransferOut/list.vue

@@ -48,7 +48,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -128,7 +128,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: '',
@@ -157,7 +157,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 360
+          this.tableHeight = window.innerHeight - 330
         }
         return storeCallOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -38,7 +38,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           总款数: <strong>{{ productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0) ? productTotal.productTotalCategory : '--' }}</strong> ,
           总数量: <strong>{{ productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -187,6 +187,6 @@ export default {
 
 <style lang="less">
   .warehouseAllocationDetail-cont, .warehouseAllocationDetail-back{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 47 - 35
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -74,7 +74,7 @@
                       </a-form-item>
                     </a-col>
                   </template>
-                  <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                  <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="getProductList(1)" :disabled="disabled" id="warehouseAllocationList-refresh">查询</a-button>
                     <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="warehouseAllocationList-reset">重置</a-button>
                     <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -96,7 +96,7 @@
               :dataSource="loadData"
               :scroll="{ x: 1880, y: 300 }"
               :loading="loading"
-              :pagination="paginationProps"
+              :pagination="false"
               bordered>
               <!-- 产品分类 -->
               <template slot="productType" slot-scope="text, record">
@@ -105,13 +105,14 @@
               </template>
               <!-- 调入仓位 -->
               <template slot="putWarehouseLocationSn" slot-scope="text, record">
-                <a-select id="warehouseAllocationEdit-putWarehouseLocationSn" placeholder="请选择" v-model="record.putWarehouseLocationSn" style="width: 100%;">
+                <a-select size="small" id="warehouseAllocationEdit-putWarehouseLocationSn" placeholder="请选择" v-model="record.putWarehouseLocationSn" style="width: 100%;">
                   <a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :disabled="item.warehouseLocationSn==record.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
                 </a-select>
               </template>
               <!-- 调出数量 -->
               <template slot="outQty" slot-scope="text, record">
                 <a-input-number
+                  size="small"
                   id="warehouseAllocationEdit-outQty"
                   v-model="record.outQty"
                   :precision="0"
@@ -126,6 +127,14 @@
               </template>
               </s-table>
             </a-table>
+            <!-- 分页 -->
+            <tablePagination
+              ref="tablePagination"
+              :total="paginationProps.total"
+              :current="paginationProps.current"
+              :pageSize="paginationProps.pageSize"
+              @changePageSize="changePageSize"
+              @changePage="changePage" />
           </a-collapse-panel>
         </a-collapse>
       </a-card>
@@ -134,7 +143,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -157,7 +166,7 @@
                           <a-input id="warehouseAllocationEdit-productName" v-model="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
                         </a-form-item>
                       </a-col>
-                      <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                      <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                         <a-button type="primary" @click="getChooseProductList(1)" :disabled="chooseDisabled" id="warehouseAllocationList-refresh">查询</a-button>
                         <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="warehouseAllocationList-reset">重置</a-button>
                       </a-col>
@@ -182,7 +191,7 @@
               :dataSource="chooseLoadData"
               :scroll="{ x: 1680, y: 300 }"
               :loading="chooseLoading"
-              :pagination="choosePaginationProps"
+              :pagination="false"
               bordered>
               <!-- 产品分类 -->
               <template slot="productType" slot-scope="text, record">
@@ -192,6 +201,7 @@
               <!-- 调入仓位 -->
               <template slot="putWarehouseLocationSn" slot-scope="text, record">
                 <a-select
+                  size="small"
                   id="warehouseAllocationEdit-putWarehouseLocationSn"
                   @change="chooseWarehouseLocChange(record)"
                   placeholder="请选择"
@@ -203,6 +213,7 @@
               <!-- 调出数量 -->
               <template slot="outQty" slot-scope="text, record">
                 <a-input-number
+                  size="small"
                   id="warehouseAllocationEdit-outQty"
                   v-model="record.outQty"
                   :precision="0"
@@ -217,6 +228,14 @@
                 <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="warehouseAllocationEdit-del-btn">删除</a-button>
               </template>
             </a-table>
+            <!-- 分页 -->
+            <tablePagination
+              ref="chooseTablePagination"
+              :total="choosePaginationProps.total"
+              :current="choosePaginationProps.current"
+              :pageSize="choosePaginationProps.pageSize"
+              @changePageSize="changeChoosePageSize"
+              @changePage="changeChoosePage" />
           </a-collapse-panel>
         </a-collapse>
       </a-card>
@@ -237,13 +256,14 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { allocWarehouseDetailList, allocWarehouseDetail, productQuery, allocWarehouseDetailCount, allocWarehouseDetailSave, allocWarehouseDetailDel, allocWarehouseSubmit } from '@/api/allocWarehouse'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import { warehouseLocAllList } from '@/api/warehouse'
 
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   data () {
     return {
       spinning: false,
@@ -288,14 +308,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       loadData: [],
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       },
       // 表头
       chooseColumns: [
@@ -312,14 +328,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
-      choosePageNo: 1, //  分页页码
-      choosePageSize: 10, //  分页 每页多少条
       choosePaginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changeChoosePageSize(current, pageSize),
-        onChange: (current) => this.changeChoosePage(current)
+        pageSize: 20
       },
       basicInfoData: null, //  基本信息
       productTotal: null //  合计
@@ -337,10 +349,9 @@ export default {
       this.queryParam.productTypeSn3 = undefined
       this.queryParam.warehouseLocationSn = undefined
       this.productType = []
-      this.pageNo = 1
-      this.pageSize = 10
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.getProductList(1)
     },
     // 双击快速添加
@@ -357,10 +368,9 @@ export default {
     chooseResetSearchForm () {
       this.chooseQueryParam.productCode = ''
       this.chooseQueryParam.productName = ''
-      this.choosePageNo = 1
-      this.choosePageSize = 10
       this.choosePaginationProps.total = 0
       this.choosePaginationProps.current = 1
+      this.choosePaginationProps.pageSize = 20
       this.getChooseProductList(1)
     },
     // 基本信息
@@ -487,8 +497,8 @@ export default {
     getProductList (pageNo) {
       this.disabled = true
       this.loading = true
-      this.pageNo = pageNo || this.pageNo
-      const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
+      this.paginationProps.current = pageNo || this.paginationProps.current
+      const params = Object.assign({ pageNo: this.paginationProps.current, pageSize: this.paginationProps.pageSize }, this.queryParam)
       params.enabledFlag = 1
       params.warehouseSn = this.basicInfoData.outWarehouseSn
       productQuery(params).then(res => {
@@ -496,7 +506,7 @@ export default {
         if (res.status == 200) {
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0
-          this.paginationProps.current = this.pageNo
+          this.paginationProps.current = data.pageNo
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
@@ -506,40 +516,41 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
     },
     //  分页  一页多少条change
     changePageSize (current, pageSize) {
-      this.pageNo = current
-      this.pageSize = pageSize
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
       this.getProductList()
     },
     //  分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.getProductList()
     },
     //  已选产品 分页  一页多少条change
     changeChoosePageSize (current, pageSize) {
-      this.choosePageNo = current
-      this.choosePageSize = pageSize
+      this.choosePaginationProps.current = current
+      this.choosePaginationProps.pageSize = pageSize
       this.getChooseProductList()
     },
     //  已选产品 分页 页码change
     changeChoosePage (current) {
-      this.choosePageNo = current
+      this.choosePaginationProps.current = current
       this.getChooseProductList()
     },
     // 已选产品列表数据
     getChooseProductList (pageNo) {
-      this.choosePageNo = this.choosePageNo || pageNo
+      this.choosePaginationProps.current = this.choosePaginationProps.current || pageNo
       this.chooseDisabled = true
       this.chooseLoading = true
       const params = {
-        pageNo: this.choosePageNo,
-        pageSize: this.choosePageSize,
+        pageNo: this.choosePaginationProps.current,
+        pageSize: this.choosePaginationProps.pageSize,
         allocationWarehouseSn: this.$route.params.sn
       }
       allocWarehouseDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
@@ -561,6 +572,7 @@ export default {
         } else {
           this.choosePaginationProps.total = 0
           this.choosePaginationProps.current = 1
+          this.choosePaginationProps.pageSize = 20
           this.chooseLoadData = []
         }
       })
@@ -634,10 +646,10 @@ export default {
 <style lang="less">
   .warehouseAllocationEdit-wrap{
     .warehouseAllocationEdit-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .warehouseAllocationEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 3 - 3
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -39,7 +39,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehouseAllocationList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="warehouseAllocationList-reset">重置</a-button>
               <a @click="advanced = !advanced" style="margin-left: 8px">
@@ -116,7 +116,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       warehouseList: [], // 仓库列表
       queryParam: { //  查询条件
@@ -144,7 +144,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 360
+          this.tableHeight = window.innerHeight - 330
         }
         return allocWarehouseList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -116,7 +116,7 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>6</strong> ,退货数量合计 <strong>6</strong> ,退货金额合计¥<strong>6.33</strong></div>
             </a-alert>
             <!-- 列表 -->
@@ -314,7 +314,7 @@ export default {
 <style lang="less">
   .bulkReturnGoodsEdit-wrap{
     .bulkReturnGoodsEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 2 - 2
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -49,7 +49,7 @@
       <a-button id="bulkReturnGoodsList-add" type="primary" class="button-error" @click="handleAdd()">新增</a-button>
     </div>
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">共 <strong>6</strong> 条记录,总数量合计 <strong>14</strong> ,总金额合计 <strong>¥14</strong> </div>
     </a-alert>
     <!-- 列表 -->
@@ -91,7 +91,7 @@ export default {
   components: { STable, VSelect, basicInfoModal, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: '',

+ 3 - 3
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -58,7 +58,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -115,7 +115,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '采购单价', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'putQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
@@ -225,7 +225,7 @@ export default {
 
 <style lang="less">
   .bulkWarehousingOrderDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
     .timeline-box{
       margin-top: 30px;
       .auxiliary-txt{

+ 50 - 34
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -80,9 +80,9 @@
                           allowClear />
                       </a-form-item>
                     </a-col>
-                    <a-col :md="6" :sm="24">
-                      <a-button style="margin-bottom: 18px;" type="primary" @click="getDealerProductList(1)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
-                      <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
+                    <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                      <a-button type="primary" @click="getDealerProductList(1)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
+                      <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
                     </a-col>
                   </a-row>
                 </a-form>
@@ -98,12 +98,13 @@
                 :dataSource="loadData"
                 :loading="loading"
                 :scroll="{ x: 1600, y: 300 }"
-                :pagination="paginationProps"
+                :pagination="false"
                 @change="onTableChange"
                 bordered>
                 <!-- 成本价 -->
                 <template slot="putCost" slot-scope="text, record">
                   <a-input-number
+                    size="small"
                     id="bulkWarehousingOrderEdit-putCost"
                     v-model="record.putCost"
                     :precision="2"
@@ -115,6 +116,7 @@
                 <!-- 数量 -->
                 <template slot="putQty" slot-scope="text, record">
                   <a-input-number
+                    size="small"
                     id="bulkWarehousingOrderEdit-putQty"
                     v-model="record.putQty"
                     :precision="0"
@@ -126,6 +128,7 @@
                 <!-- 仓库仓位 -->
                 <template slot="warehouse" slot-scope="text, record, index">
                   <a-cascader
+                    size="small"
                     @change="e => changeWarehouseCascade(e, record, index, 'dealerProduct')"
                     v-model="record.warehouseCascade"
                     expand-trigger="hover"
@@ -141,6 +144,14 @@
                   <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="bulkWarehousingOrderEdit-add-btn">添加</a-button>
                 </template>
               </a-table>
+              <!-- 分页 -->
+              <tablePagination
+                ref="tablePagination"
+                :total="paginationProps.total"
+                :current="paginationProps.current"
+                :pageSize="paginationProps.pageSize"
+                @changePageSize="changePageSize"
+                @changePage="changePage" />
             </div>
           </a-collapse-panel>
         </a-collapse>
@@ -156,7 +167,7 @@
             <!-- 已选产品 -->
             <div>
               <!-- 总计 -->
-              <a-alert type="info" showIcon style="margin-bottom:10px">
+              <a-alert type="info" style="margin-bottom:10px">
                 <div slot="message">
                   总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                   总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -173,12 +184,13 @@
                 :dataSource="chooseLoadData"
                 :scroll="{ x: 1700, y: 300 }"
                 :loading="chooseLoading"
-                :pagination="choosePaginationProps"
+                :pagination="false"
                 @change="onChooseTableChange"
                 bordered>
                 <!-- 成本价 -->
                 <template slot="putCost" slot-scope="text, record">
                   <a-input-number
+                    size="small"
                     id="bulkWarehousingOrderEdit-choose-putCost"
                     v-model="record.putCost"
                     :precision="2"
@@ -191,6 +203,7 @@
                 <!-- 数量 -->
                 <template slot="putQty" slot-scope="text, record">
                   <a-input-number
+                    size="small"
                     id="bulkWarehousingOrderEdit-choose-putQty"
                     v-model="record.putQty"
                     :precision="0"
@@ -203,6 +216,7 @@
                 <!-- 仓库仓位 -->
                 <template slot="warehouse" slot-scope="text, record, index">
                   <a-cascader
+                    size="small"
                     @change="e => changeWarehouseCascade(e, record, index, 'sparePartsPurDetail')"
                     v-model="record.warehouseCascade"
                     expand-trigger="hover"
@@ -218,6 +232,14 @@
                   <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="bulkWarehousingOrderEdit-del-btn">删除</a-button>
                 </template>
               </a-table>
+              <!-- 分页 -->
+              <tablePagination
+                ref="chooseTablePagination"
+                :total="choosePaginationProps.total"
+                :current="choosePaginationProps.current"
+                :pageSize="choosePaginationProps.pageSize"
+                @changePageSize="changeChoosePageSize"
+                @changePage="changeChoosePage" />
             </div>
           </a-collapse-panel>
         </a-collapse>
@@ -243,6 +265,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import basicInfoModal from './basicInfoModal.vue'
 import { getOperationalPrecision } from '@/libs/tools.js'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
@@ -251,7 +274,7 @@ import { sparePartsPurDetail, sparePartsPurDetailList, sparePartsPurDetailCount,
 import { dealerProductList } from '@/api/dealerProduct'
 import { warehouseCascadeList } from '@/api/warehouse'
 export default {
-  components: { STable, VSelect, basicInfoModal },
+  components: { STable, VSelect, basicInfoModal, tablePagination },
   data () {
     return {
       spinning: false,
@@ -283,14 +306,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       loadData: [],
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       },
       // 表头
       chooseColumns: [
@@ -307,14 +326,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
-      choosePageNo: 1, //  分页页码
-      choosePageSize: 10, //  分页 每页多少条
       choosePaginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changeChoosePageSize(current, pageSize),
-        onChange: (current) => this.changeChoosePage(current)
+        pageSize: 20
       },
       openModal: false, // 选择基本信息弹框是否显示
       warehouseList: [], //  仓库  下拉数据
@@ -336,10 +351,9 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.productType = []
-      this.pageNo = 1
-      this.pageSize = 10
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.getDealerProductList(1)
     },
     // 打印预览/快捷打印
@@ -388,24 +402,24 @@ export default {
     },
     //  分页  一页多少条change
     changePageSize (current, pageSize) {
-      this.pageNo = current
-      this.pageSize = pageSize
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
       this.getDealerProductList()
     },
     //  分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.getDealerProductList()
     },
     //  已选产品 分页  一页多少条change
     changeChoosePageSize (current, pageSize) {
-      this.choosePageNo = current
-      this.choosePageSize = pageSize
+      this.choosePaginationProps.current = current
+      this.choosePaginationProps.pageSize = pageSize
       this.getChooseDealerProductList()
     },
     //  已选产品 分页 页码change
     changeChoosePage (current) {
-      this.choosePageNo = current
+      this.choosePaginationProps.current = current
       this.getChooseDealerProductList()
     },
     // 基本信息
@@ -584,8 +598,8 @@ export default {
     getDealerProductList (pageNo, sorter) {
       this.disabled = true
       this.loading = true
-      this.pageNo = pageNo || this.pageNo
-      const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
+      this.paginationProps.current = pageNo || this.paginationProps.current
+      const params = Object.assign({ pageNo: this.paginationProps.current, pageSize: this.paginationProps.pageSize }, this.queryParam)
       params.enabledFlag = 1
       // params.sysFlag = 0
       if (sorter) {
@@ -598,7 +612,7 @@ export default {
         if (res.status == 200) {
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0
-          this.paginationProps.current = this.pageNo
+          this.paginationProps.current = data.pageNo
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
@@ -615,16 +629,17 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
     },
     // 已选产品列表数据
     getChooseDealerProductList (pageNo, sorter) {
-      this.choosePageNo = pageNo || this.choosePageNo
+      this.choosePaginationProps.current = pageNo || this.choosePaginationProps.current
       const params = {
-        pageNo: this.choosePageNo,
-        pageSize: this.choosePageSize,
+        pageNo: this.choosePaginationProps.current,
+        pageSize: this.choosePaginationProps.pageSize,
         sparePartsPurchaseSn: this.$route.params.sn
       }
       if (sorter) {
@@ -661,6 +676,7 @@ export default {
         } else {
           this.choosePaginationProps.total = 0
           this.choosePaginationProps.current = 1
+          this.choosePaginationProps.pageSize = 20
           this.chooseLoadData = []
         }
       })
@@ -726,11 +742,11 @@ export default {
     },
     // 选择产品 表格  change
     onTableChange (pagination, filters, sorter) {
-      this.getDealerProductList(this.pageNo, sorter)
+      this.getDealerProductList(this.paginationProps.current, sorter)
     },
     // 已选产品 表格  change
     onChooseTableChange (pagination, filters, sorter) {
-      this.getChooseDealerProductList(this.choosePageNo, sorter)
+      this.getChooseDealerProductList(this.choosePaginationProps.current, sorter)
     }
   },
   beforeRouteEnter (to, from, next) {
@@ -749,7 +765,7 @@ export default {
 <style lang="less">
   .bulkWarehousingOrderEdit-wrap{
     .bulkWarehousingOrderEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 4 - 4
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -56,7 +56,7 @@
               </a-col>
             </template>
             <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons" style="margin-top: 3px;">
+              <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
                 <a-button
@@ -82,7 +82,7 @@
         <a-button v-if="$hasPermissions('B_bulkWarehousingOrder_add')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ dataTotalCount }}</strong> 条记录,
           总数量合计 <strong>{{ productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -149,7 +149,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
       openModal: false, // 基本信息弹框是否显示
@@ -181,7 +181,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 420
+          this.tableHeight = window.innerHeight - 370
         }
         return sparePartsPurList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 5 - 0
src/views/common/custList.vue

@@ -2,6 +2,7 @@
   <a-select
     show-search
     label-in-value
+    :size="size"
     :value="dealerName"
     placeholder="请输入名称搜索"
     style="width: 100%"
@@ -26,6 +27,10 @@ export default {
     isValidateEnabled: {
       type: Boolean,
       default: false
+    },
+    size: {
+      type: String,
+      default: 'default'
     }
   },
   data () {

+ 5 - 0
src/views/common/rangeDate.vue

@@ -2,6 +2,7 @@
   <a-range-picker
     style="width:100%"
     :value="date"
+    :size="size"
     :disabledDate="disabledDate"
     :format="dateFormat"
     @change="dateChange"
@@ -17,6 +18,10 @@ export default {
       default: () => {
         return []
       }
+    },
+    size: {
+      type: String,
+      default: 'default'
     }
   },
   data () {

+ 51 - 0
src/views/common/tablePagination.vue

@@ -0,0 +1,51 @@
+<template>
+  <div class="pagination-con" v-if="total!=0">
+    <a-pagination
+      size="small"
+      :total="total"
+      :current="current"
+      :pageSize="pageSize"
+      show-size-changer
+      :show-total="total => `共 ${total} 条记录`"
+      @showSizeChange="changePageSize"
+      @change="changePage" />
+  </div>
+</template>
+<script>
+export default {
+  name: 'TablePagination',
+  props: {
+    total: {
+      type: [String, Number],
+      default: 0
+    },
+    current: {
+      type: [String, Number],
+      default: 1
+    },
+    pageSize: {
+      type: [String, Number],
+      default: 20
+    }
+  },
+  data () {
+    return {}
+  },
+  methods: {
+    //  分页  一页多少条change
+    changePageSize (current, pageSize) {
+      this.$emit('changePageSize', current, pageSize)
+    },
+    //  分页 页码change
+    changePage (current) {
+      this.$emit('changePage', current)
+    }
+  }
+}
+</script>
+<style lang="less">
+  .pagination-con{
+    text-align: right;
+    margin: 10px 0;
+  }
+</style>

+ 1 - 1
src/views/customerManagement/customerInfo/detailModal.vue

@@ -105,7 +105,7 @@ export default {
       width: 145px;
     }
     .item-cont {
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       display: flex;
       .item-label {
         width: 115px;

+ 1 - 1
src/views/customerManagement/customerInfo/edit.vue

@@ -349,7 +349,7 @@ export default {
 <style lang="less">
 .customerManagementEdit-wrap {
 	.customerManagementEdit-back {
-		margin-bottom: 15px;
+		margin-bottom: 10px;
 	}
 }
 </style>

+ 2 - 2
src/views/customerManagement/customerInfo/list.vue

@@ -67,7 +67,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 15px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="customerManagementList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="customerManagementList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -166,7 +166,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 360
+          this.tableHeight = window.innerHeight - 290
         }
         return custList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -35,7 +35,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="收款明细">
           <!-- alert -->
-          <a-alert type="info" showIcon style="margin-bottom:10px">
+          <a-alert type="info" style="margin-bottom:10px">
             <div slot="message">
               共 <strong>{{ total }}</strong> 条明细,
               金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? '¥'+basicInfoData.totalSettleAmount : '--' }}</strong> ,
@@ -127,6 +127,6 @@ export default {
 
 <style lang="less">
   .companyCollectionPaymentDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 2 - 2
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -64,7 +64,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">
         共 <strong>{{ total }}</strong> 条记录,
         其中收款单 <strong>{{ (productTotal&&(productTotal.receiptCount || productTotal.receiptCount==0)) ? productTotal.receiptCount : '--' }}</strong> 条,
@@ -100,7 +100,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   data () {
     return {
-      advanced: false, //  高级搜索 展开/关闭
+      advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
       // 查询参数

+ 3 - 3
src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue

@@ -28,12 +28,12 @@
                 allowClear></v-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="7" :sm="24">
             <a-form-item label="审核时间">
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseBillModal-refresh">查询</a-button>
             <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseBillModal-reset">重置</a-button>
           </a-col>
@@ -99,7 +99,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '单据号', dataIndex: 'bizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '金额', dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '余额', dataIndex: 'unsettleAmount', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],

+ 3 - 5
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -17,7 +17,7 @@
               <a-button type="primary" size="small" class="button-error" id="collectionPayment-circle-btn" @click.stop="handleChoose">选择单据</a-button>
             </template>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 共 <strong>{{ chooseLoadData.length }}</strong>条明细 ,
                 金额合计¥<strong>{{ totalAmount }}</strong> ,
@@ -165,15 +165,13 @@ export default {
         { title: '序号', scopedSlots: { customRender: 'no' }, width: 80, align: 'center' },
         { title: '单据号', dataIndex: 'bizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '金额', dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '余额', dataIndex: 'unsettleAmount', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '本次结算金额', scopedSlots: { customRender: 'settleAmount' }, width: 140, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
-      choosePageNo: 1, //  分页页码
-      choosePageSize: 10, //  分页 每页多少条
       settleStyleList: [], //  结算方式
       formItemLayout: {
         labelCol: { span: 6 },
@@ -318,7 +316,7 @@ export default {
 
 <style lang="less">
   .collectionPayment-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
     .green{
       color: #19be6b;
     }

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -44,7 +44,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ total }}</strong> 条明细,
           金额合计 <strong>{{ (productTotal&&(productTotal.totalAmount || productTotal.totalAmount==0)) ? '¥'+productTotal.totalAmount : '--' }}</strong> ,
@@ -176,6 +176,6 @@ export default {
 
 <style lang="less">
   .companyCollectionPaymentDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -30,7 +30,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">
         共 <strong>{{ total }}</strong> 条记录,
         应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? '¥'+productTotal.receipt : '--' }}</strong> ,

+ 1 - 1
src/views/financialManagement/expenseManagement/edit.vue

@@ -207,7 +207,7 @@ export default {
 <style lang="less">
 .expenseManagementEdit-wrap {
   .expenseManagementEdit-back {
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 }
 </style>

+ 3 - 3
src/views/financialManagement/expenseManagement/list.vue

@@ -60,7 +60,7 @@
         <a-button v-if="$hasPermissions('B_expenseNew')" id="expenseManagementList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong> 条记录,
           金额共计 <strong>¥{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? '¥'+totalData.totalAmount : '--' }}</strong>
@@ -129,7 +129,7 @@ export default {
       spinning: false,
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
-      advanced: false, //  高级搜索 展开/关闭
+      advanced: true, //  高级搜索 展开/关闭
       costTypeList: [], // 费用类型
       costType: [],
       // 查询参数
@@ -162,7 +162,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 300
+          this.tableHeight = window.innerHeight - 370
         }
         return settleExpenseQuery(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 3 - 13
src/views/financialManagement/financialCollection/list.vue

@@ -55,7 +55,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong>
@@ -67,7 +67,7 @@
           <strong>{{ totalData&&(totalData.unsettleAmount || totalData.unsettleAmount==0) ? '¥'+totalData.unsettleAmount : '--' }}</strong>
         </div>
       </a-alert>
-      <div v-if="$hasPermissions('B_financialCollectionPl')" style="margin-bottom: 15px">
+      <div v-if="$hasPermissions('B_financialCollectionPl')" style="margin-bottom: 10px">
         <a-button type="primary" id="financialCollectionList-export" :loading="loading" @click="handleCollection">批量收款</a-button>
         <span style="margin-left: 8px" v-if="$hasPermissions('B_financialCollectionPl')">
           <template v-if="hasSelected">
@@ -124,7 +124,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, //  高级搜索 展开/关闭
+      advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 详情弹框
       tableHeight: 0,
@@ -300,13 +300,3 @@ export default {
   }
 }
 </script>
-<style lang="less">
-.financialCollectionList-wrap {
-  .sTable {
-    margin-top: 15px;
-  }
-  .financialCollectionList-tabs {
-    margin-bottom: 15px;
-  }
-}
-</style>

+ 3 - 13
src/views/financialManagement/financialPayment/list.vue

@@ -54,7 +54,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong>
@@ -66,7 +66,7 @@
           <strong>{{ totalData&&(totalData.unsettleAmount || totalData.unsettleAmount==0) ? '¥'+totalData.unsettleAmount : '--' }}</strong>
         </div>
       </a-alert>
-      <div v-if="$hasPermissions('B_financialPaymentPl')" style="margin-bottom: 15px">
+      <div v-if="$hasPermissions('B_financialPaymentPl')" style="margin-bottom: 10px">
         <a-button type="primary" id="finacialPay-export" :loading="loading" @click="handlePayment">批量付款</a-button>
         <span style="margin-left: 8px" v-if="$hasPermissions('B_financialPaymentPl')">
           <template v-if="hasSelected">
@@ -122,7 +122,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, //  高级搜索 展开/关闭
+      advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 详情弹框
       tableHeight: 0,
@@ -299,13 +299,3 @@ export default {
   }
 }
 </script>
-<style lang="less">
-.finacialPay-wrap {
-  .sTable {
-    margin-top: 15px;
-  }
-  .finacialPay-tabs {
-    margin-bottom: 15px;
-  }
-}
-</style>

+ 2 - 2
src/views/financialManagement/inventoryReview/detail.vue

@@ -14,7 +14,7 @@
     <!-- 内容 -->
     <a-page-header title="盘点单号:CG2021010100001" ></a-page-header>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message"><strong class="red">红色代表盘盈</strong>,<strong class="green">绿色代表盈亏</strong></div>
     </a-alert>
     <!-- 盈亏统计 -->
@@ -149,7 +149,7 @@ export default {
 <style lang="less">
   .inventoryReviewDetail-wrap{
     .inventoryReviewDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .green{
       color: #19be6b;

+ 1 - 1
src/views/financialManagement/inventoryReview/list.vue

@@ -35,7 +35,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">共 <strong>6</strong> 条记录,其中待审核 <strong>14</strong> 条 </div>
     </a-alert>
     <!-- 列表 -->

+ 2 - 9
src/views/financialManagement/ledgerRecord/list.vue

@@ -40,7 +40,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">
         总计:<strong>{{ total }}</strong>条 ,
         分账金额:<strong>{{ (totalAmount || totalAmount == 0) ? totalAmount+'元' : '--' }}</strong>
@@ -70,7 +70,7 @@ export default {
   components: { STable, VSelect, rangeDate, custSatelliteList },
   data () {
     return {
-      advanced: false, //  高级搜索 展开/关闭
+      advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       createDate: [
         getDate.getRecentday().starttime,
@@ -153,10 +153,3 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .ledgerRecordList-wrap{
-    .sTable{
-      margin-top: 15px;
-    }
-  }
-</style>

+ 2 - 2
src/views/financialManagement/warehousingAudit/detail.vue

@@ -26,7 +26,7 @@
               <a-descriptions-item label="入库时间">{{ basicInfoData&&basicInfoData.stockPutTime ? basicInfoData.stockPutTime : '--' }}</a-descriptions-item>
               <a-descriptions-item label="采购单号">{{ basicInfoData&&basicInfoData.purchaseBillNo ? basicInfoData.purchaseBillNo : '--' }}</a-descriptions-item>
             </a-descriptions>
-            <a-descriptions :column="3" bordered>
+            <a-descriptions :column="3" bordered size="small">
               <a-descriptions-item label="采购总款数">{{ basicInfoData&&(basicInfoData.totalCategory || basicInfoData.totalCategory==0) ? basicInfoData.totalCategory : '--' }}</a-descriptions-item>
               <a-descriptions-item label="采购总数量">{{ basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0) ? basicInfoData.totalQty : '--' }}</a-descriptions-item>
               <a-descriptions-item label="采购总成本">{{ basicInfoData&&(basicInfoData.totalAmount || basicInfoData.totalAmount==0) ? '¥'+basicInfoData.totalAmount : '--' }}</a-descriptions-item>
@@ -159,6 +159,6 @@ export default {
 
 <style lang="less">
   .warehousingAuditDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 2 - 2
src/views/financialManagement/warehousingAudit/list.vue

@@ -47,7 +47,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ (productTotal&&(productTotal.totalRecord || productTotal.totalRecord==0)) ? productTotal.totalRecord : '--' }}</strong> 条记录,
           其中待审核 <strong>{{ (productTotal&&(productTotal.waitAuditRecord || productTotal.waitAuditRecord==0)) ? productTotal.waitAuditRecord : '--' }}</strong> 条
@@ -102,7 +102,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, //  高级搜索 展开/关闭
+      advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       auditTime: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),

+ 1 - 1
src/views/financialManagement/withdrawalManagement/list.vue

@@ -58,7 +58,7 @@ export default {
   components: { STable, VSelect, rangeDateTime, cashOutModal },
   data () {
     return {
-      advanced: false, //  高级搜索 展开/关闭
+      advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {

+ 3 - 3
src/views/inventoryManagement/inventoryChecking/detail.vue

@@ -24,7 +24,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="inventoryCheckingDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           库存总数量:
           <strong>6</strong>
@@ -43,7 +43,7 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckingDetail-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckingDetail-reset">重置</a-button>
             </a-col>
@@ -178,6 +178,6 @@ export default {
 <style lang="less">
 .inventoryCheckingDetail-cont,
 .inventoryCheckingDetail-back {
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 </style>

+ 3 - 3
src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue

@@ -29,7 +29,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:10px">
+          <a-alert type="info" style="margin-bottom:10px">
             <div slot="message">盘盈总数量: <strong>6</strong> ,库存总成本(¥): <strong>6</strong> ,盘亏总数量: <strong>6</strong> ,盘亏总成本(¥): <strong>6</strong>,盈亏总数量: <strong>6</strong> ,盈亏总成本(¥): <strong>6</strong> </div>
           </a-alert>
           <!-- 筛选条件 -->
@@ -43,7 +43,7 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                   <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="financialAuditDetail-refresh">查询</a-button>
                   <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="financialAuditDetail-reset">重置</a-button>
                 </a-col>
@@ -140,6 +140,6 @@
 
 <style lang="less">
   .financialAuditDetail-cont, .financialAuditDetail-back{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -35,7 +35,7 @@
                 <a-cascader :options="typeData" expand-trigger="hover" id="makeInventory-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="makeInventory-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="makeInventory-reset">重置</a-button>
             </a-col>
@@ -182,6 +182,6 @@ export default {
 
 <style lang="less">
   .makeInventory-cont, .makeInventory-back{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 3 - 3
src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue

@@ -27,7 +27,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:10px">
+          <a-alert type="info" style="margin-bottom:10px">
             <div slot="message">库存总数量: <strong>6</strong> ,盈亏总数量: <strong>6</strong></div>
           </a-alert>
           <!-- 筛选条件 -->
@@ -41,7 +41,7 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                   <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="makeInventoryDetail-refresh">查询</a-button>
                   <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="makeInventoryDetail-reset">重置</a-button>
                 </a-col>
@@ -138,6 +138,6 @@
 
 <style lang="less">
   .makeInventoryDetail-cont, .makeInventoryDetail-back{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -102,7 +102,7 @@ export default {
       margin-bottom: 25px;
     }
     .inventoryCheckingOverall-cont, .inventoryCheckingOverall-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 3 - 3
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -126,7 +126,7 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>6</strong> ,采购数量合计 <strong>6</strong> ,采购金额合计¥<strong>6.33</strong></div>
             </a-alert>
             <!-- 列表 -->
@@ -314,10 +314,10 @@ export default {
 <style lang="less">
   .selfDisk-wrap{
     .selfDisk-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .selfDisk-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .import-btn{
         margin-left: 15px;
       }

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="960">
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
         现有库存总数量(个):<strong>{{ currentStock&&(currentStock.currentQty || currentStock.currentQty==0) ? currentStock.currentQty : '--' }}</strong>;
         现有库存总成本(¥):<strong>{{ currentStock&&(currentStock.putCost || currentStock.putCost==0) ? currentStock.putCost : '--' }}</strong>。

+ 3 - 3
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -75,7 +75,7 @@
         </a-form>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
           现有库存总数量(个):<strong>{{ currentStock&&(currentStock.totalCurrentStockQty || currentStock.totalCurrentStockQty==0) ? currentStock.totalCurrentStockQty : '--' }}</strong>;
           现有库存总成本(¥):<strong>{{ currentStock&&(currentStock.totalCurrentStockCost || currentStock.totalCurrentStockCost==0) ? currentStock.totalCurrentStockCost : '--' }}</strong>。
@@ -141,7 +141,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         productCode: '', //  产品编码
@@ -177,7 +177,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 350
+          this.tableHeight = window.innerHeight - 320
         }
         // 排序
         if (parameter.sortField == 'currentStockQty') {

+ 3 - 3
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -64,7 +64,7 @@
         </a-form>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
           当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong>;
           当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong>。
@@ -205,10 +205,10 @@ export default {
 <style lang="less">
   .inventoryQueryWarehouseDetail-wrap{
     .inventoryQueryWarehouseDetail-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .inventoryQueryWarehouseDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .green{
       color: #19be6b;

+ 25 - 17
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -98,7 +98,7 @@
         :columns="columns"
         :dataSource="loadData"
         :scroll="{ x: 2200, y: tableHeight }"
-        :pagination="paginationProps"
+        :pagination="false"
         :loading="loading"
         bordered>
         <!-- 产品分类 -->
@@ -121,6 +121,7 @@
           <div>
             <a-input-number
               id="inventoryWarningList-inTransit"
+              size="small"
               v-model="record.inTransit"
               :precision="0"
               :min="0"
@@ -133,6 +134,7 @@
           <div>
             <a-input-number
               id="inventoryWarningList-upperLimit"
+              size="small"
               v-model="record.upperLimit"
               :precision="0"
               :min="0"
@@ -145,6 +147,7 @@
           <div>
             <a-input-number
               id="inventoryWarningList-lowerLimit"
+              size="small"
               v-model="record.lowerLimit"
               :precision="0"
               :min="0"
@@ -164,6 +167,14 @@
           <span v-if="!$hasPermissions('B_inventoryWarningSave')">--</span>
         </template>
       </a-table>
+      <!-- 分页 -->
+      <tablePagination
+        ref="tablePagination"
+        :total="paginationProps.total"
+        :current="paginationProps.current"
+        :pageSize="paginationProps.pageSize"
+        @changePageSize="changePageSize"
+        @changePage="changePage" />
     </a-spin>
   </a-card>
 </template>
@@ -171,15 +182,16 @@
 <script>
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { stockWarnList, stockWarnSaveBatch } from '@/api/stockWarn'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         productCode: '',
@@ -213,14 +225,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       loadData: [],
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       },
       selectedRowKeys: [],
       selectedRows: [],
@@ -235,30 +243,30 @@ export default {
   methods: {
     //  分页  一页多少条change
     changePageSize (current, pageSize) {
-      this.pageNo = current
-      this.pageSize = pageSize
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
       this.pageInit()
     },
     //  分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.pageInit()
     },
     //  列表数据
     pageInit (pageNo) {
       if (this.tableHeight == 0) {
-        this.tableHeight = window.innerHeight - 360
+        this.tableHeight = window.innerHeight - 330
       }
       this.disabled = true
       this.loading = true
-      this.pageNo = pageNo || this.pageNo
-      const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
+      this.paginationProps.current = pageNo || this.paginationProps.current
+      const params = Object.assign({ pageNo: this.paginationProps.current, pageSize: this.paginationProps.pageSize }, this.queryParam)
       stockWarnList(params).then(res => {
         this.loading = false
         if (res.status == 200) {
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0
-          this.paginationProps.current = this.pageNo
+          this.paginationProps.current = data.pageNo
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
@@ -268,6 +276,7 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
@@ -345,10 +354,9 @@ export default {
       this.queryParam.productTypeSn3 = undefined
       this.queryParam.stockState = undefined
       this.productType = []
-      this.pageNo = 1
-      this.pageSize = 10
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.pageInit(1)
     },
     //  批量更新

+ 2 - 1
src/views/inventoryManagement/satelliteWarehouseInventory/addModal.vue

@@ -32,6 +32,7 @@
               size="small"
               id="satelliteWarehouseInventoryList-num-add-btn"></a-button>
             <a-input-number
+              size="small"
               v-model="record.productQty"
               :min="0"
               :max="999999"
@@ -223,7 +224,7 @@ export default {
       padding: 40px 40px 24px;
     }
     .item-cont {
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       display: flex;
       .item-label {
         width: 115px;

+ 21 - 14
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -36,7 +36,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_satelliteWarehouseInventoryDetail')" id="satelliteWarehouseInventoryList-replenishment" type="primary" @click="handleReplenishment">补货清单</a-button>
+        <a-button v-if="$hasPermissions('B_satelliteWarehouseInventoryDetail')" id="satelliteWarehouseInventoryList-replenishment" type="primary" class="button-error" @click="handleReplenishment">补货清单</a-button>
       </div>
       <!-- 列表 -->
       <a-table
@@ -46,7 +46,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data-source="loadData"
-        :pagination="paginationProps"
+        :pagination="false"
         :loading="loading"
         :scroll="{ x: 1210, y: tableHeight }"
         bordered>
@@ -56,6 +56,14 @@
           <span v-if="!$hasPermissions('B_satelliteWarehouseInventoryAdd')">--</span>
         </template>
       </a-table>
+      <!-- 分页 -->
+      <tablePagination
+        ref="tablePagination"
+        :total="paginationProps.total"
+        :current="paginationProps.current"
+        :pageSize="paginationProps.pageSize"
+        @changePageSize="changePageSize"
+        @changePage="changePage" />
     </a-spin>
     <!-- 补货单 -->
     <satellite-warehouse-inventory-add-modal :openModal="openModal" :nowData="nowData" @close="closeModal" />
@@ -64,11 +72,12 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import satelliteWarehouseInventoryAddModal from './addModal.vue'
 import custSatelliteList from '@/views/common/custSatelliteList.vue'
 import { satelliteWHStockList, satelliteWHSupplyInsert } from '@/api/satelliteWH'
 export default {
-  components: { STable, VSelect, satelliteWarehouseInventoryAddModal, custSatelliteList },
+  components: { STable, VSelect, satelliteWarehouseInventoryAddModal, custSatelliteList, tablePagination },
   data () {
     return {
       spinning: false,
@@ -99,14 +108,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       loadData: [],
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       },
       openModal: false,
       nowData: null
@@ -124,14 +129,14 @@ export default {
     },
     // 列表
     getStockList (pageNo) {
-      this.pageNo = pageNo || this.pageNo
+      this.paginationProps.current = pageNo || this.paginationProps.current
       this.disabled = true
       if (this.tableHeight == 0) {
         this.tableHeight = window.innerHeight - 380
       }
       const params = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize
+        pageNo: this.paginationProps.current,
+        pageSize: this.paginationProps.pageSize
       }
       this.loading = true
       satelliteWHStockList(Object.assign(params, this.queryParam)).then(res => {
@@ -149,19 +154,20 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
     },
     //  分页  一页多少条change
     changePageSize (current, pageSize) {
-      this.pageNo = current
-      this.pageSize = pageSize
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
       this.getStockList()
     },
     //  分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.getStockList()
     },
     //  查询
@@ -184,6 +190,7 @@ export default {
       this.nowData = null
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.loadData = []
       this.getStockList(1)
     },

+ 1 - 1
src/views/inventoryManagement/warehouse/list.vue

@@ -88,7 +88,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 360
+          this.tableHeight = window.innerHeight - 285
         }
         return warehouseList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -26,7 +26,7 @@
           </a-form>
         </div>
         <!-- 操作按钮 -->
-        <div class="table-operator" style="border: 0;padding: 0 0 15px;">
+        <div class="table-operator" style="border: 0;padding: 0 0 10px;">
           <a-button v-if="$hasPermissions('B_inventory_warehouse_storingLocation_add')" id="storingLocationList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
@@ -91,7 +91,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 330
         }
         return warehouseLocList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 20 - 15
src/views/notice/list.vue

@@ -30,7 +30,7 @@
       :columns="columns"
       :dataSource="loadData"
       :loading="listLoading"
-      :pagination="paginationProps"
+      :pagination="false"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -39,6 +39,14 @@
         </a-badge>
       </template>
     </a-table>
+    <!-- 分页 -->
+    <tablePagination
+      ref="tablePagination"
+      :total="paginationProps.total"
+      :current="paginationProps.current"
+      :pageSize="paginationProps.pageSize"
+      @changePageSize="changePageSize"
+      @changePage="changePage" />
     <!-- 公告详情 -->
     <notice-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
   </a-card>
@@ -46,11 +54,12 @@
 
 <script>
 import { STable } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { mapActions } from 'vuex'
 import noticeDetailModal from './detailModal.vue'
 export default {
-  components: { STable, noticeDetailModal, rangeDate },
+  components: { STable, noticeDetailModal, rangeDate, tablePagination },
   data () {
     return {
       queryParam: { //  查询条件
@@ -68,14 +77,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
       ],
       loadData: [],
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       },
       listLoading: false,
       openModal: false, //  查看客户详情  弹框
@@ -112,11 +117,11 @@ export default {
     },
     // 查询列表
     handelSearch (pageNo) {
-      this.pageNo = pageNo || this.pageNo
+      this.paginationProps.current = pageNo || this.paginationProps.current
       this.disabled = true
       const params = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
+        pageNo: this.paginationProps.current,
+        pageSize: this.paginationProps.pageSize,
         notice: {
           title: this.queryParam.notice.title
         },
@@ -140,19 +145,20 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
     },
     //  分页  一页多少条change
     changePageSize (current, pageSize) {
-      this.pageNo = current
-      this.pageSize = pageSize
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
       this.handelSearch()
     },
     //  分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.handelSearch()
     },
     //  重置
@@ -165,10 +171,9 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.notice.title = undefined
-      this.pageNo = 1
-      this.pageSize = 10
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
     },
     //  详情
     handleDetail (row) {

+ 6 - 10
src/views/productManagement/priceChangeRecord/list.vue

@@ -49,9 +49,9 @@
               </a-form-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24">
-            <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productChangeRecordList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productChangeRecordList-reset">重置</a-button>
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productChangeRecordList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productChangeRecordList-reset">重置</a-button>
             <!-- <a-button
               style="margin: 0 0 18px 8px"
               type="primary"
@@ -59,7 +59,7 @@
               @click="handleExport"
               :loading="exportLoading"
               id="productChangeRecordList-export">导出</a-button> -->
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -67,10 +67,6 @@
         </a-row>
       </a-form>
     </div>
-    <!-- 总计 -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
-      <div slot="message">合计:<strong>{{ total }}</strong>条</div>
-    </a-alert>
     <!-- 列表 -->
     <s-table
       class="sTable"
@@ -127,7 +123,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: getDate.getThreeMonthDays().starttime,
@@ -150,7 +146,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 400
+          this.tableHeight = window.innerHeight - 320
         }
         return productPriceChangeList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -93,7 +93,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 360
+          this.tableHeight = window.innerHeight - 290
         }
         return dealerProductBrandList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 1 - 1
src/views/productManagement/productCategory/list.vue

@@ -75,7 +75,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 230
+          this.tableHeight = window.innerHeight - 190
         }
         return dealerProductTypeList({}).then(res => {
           //  递归去除空children

+ 1 - 1
src/views/productManagement/productInfo/edit.vue

@@ -311,7 +311,7 @@ export default {
 <style lang="less">
   .productInfoEdit-wrap{
     .productInfoEdit-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 6 - 6
src/views/productManagement/productInfo/list.vue

@@ -55,9 +55,9 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
-              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
               <!-- <a-button
                 style="margin: 0 0 18px 8px"
                 type="danger"
@@ -65,7 +65,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="inventoryQueryList-export">导出</a-button> -->
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -141,7 +141,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       productType: [],
       queryParam: { //  查询条件
@@ -175,7 +175,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 360
+          this.tableHeight = window.innerHeight - 330
         }
         return dealerProductList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 7 - 7
src/views/productManagement/productInfoJg/list.vue

@@ -54,9 +54,9 @@
               </a-form-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24">
-            <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
             <!-- <a-button
               style="margin: 0 0 18px 8px"
               type="danger"
@@ -64,7 +64,7 @@
               :disabled="disabled"
               :loading="exportLoading"
               id="inventoryQueryList-export">导出</a-button> -->
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -101,7 +101,7 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       productType: [],
       queryParam: { //  查询条件
@@ -123,7 +123,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 190
+          this.tableHeight = window.innerHeight - 280
         }
         return productList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
@@ -160,7 +160,7 @@ export default {
       this.columns = [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '产品编码', dataIndex: 'code', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'origCode', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' }

+ 4 - 4
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -46,7 +46,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 产品款数:<strong>{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong>,
                 采购数量合计:<strong>{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong>,
@@ -87,7 +87,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="促销品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>{{ detail&&(detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong> ,
                 采购数量合计 <strong>{{ detail&&(detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong> ,
                 采购金额合计 <strong>{{ detail&&(detail.totalAmount || detail.totalAmount==0) ? '¥'+detail.totalAmount : '--' }}</strong></div>
@@ -151,7 +151,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购单价', dataIndex: 'discountedPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -238,7 +238,7 @@ export default {
 
 <style lang="less">
   .purchaseOrderDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
     .timeline-box{
       margin-top: 30px;
       .auxiliary-txt{

+ 5 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -116,6 +116,7 @@
                 <!-- 采购数量 -->
                 <template slot="storageQuantity" slot-scope="text, record">
                   <a-input-number
+                    size="small"
                     v-model="record.qty"
                     :precision="0"
                     :min="0"
@@ -149,7 +150,7 @@
             <!-- 已选产品 -->
             <div>
               <!-- 总计 -->
-              <a-alert type="info" showIcon style="margin-bottom:10px">
+              <a-alert type="info" style="margin-bottom:10px">
                 <div slot="message">产品款数 <strong>{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong> ,
                   采购数量合计 <strong>{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong> ,
                   采购金额合计 <strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ? '¥'+detail.discountedAmount : '--' }}</strong></div>
@@ -167,6 +168,7 @@
                 <!-- 采购数量 -->
                 <template slot="storageQuantity" slot-scope="text, record">
                   <a-input-number
+                    size="small"
                     id="purchaseOrderEdit-qty"
                     v-model="record.qty"
                     :precision="0"
@@ -504,7 +506,7 @@ export default {
       color: #666;
     }
     .purchaseOrderEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;
@@ -513,6 +515,7 @@ export default {
       .tag-txt{
         font-size: 12px;
         color: #ed1c24;
+        margin: 0;
       }
       .edit-circle-btn{
         margin-left: 15px;

+ 3 - 3
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -70,7 +70,7 @@
         <a-button id="purchaseOrderList-add" type="primary" v-if="$hasPermissions('B_purchaseNew')" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong> 条记录,
           采购数量合计 <strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong> ,
@@ -134,7 +134,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, //  高级搜索 展开/关闭
+      advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 基本信息弹框是否显示
       supplierList: [],
@@ -172,7 +172,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 420
+          this.tableHeight = window.innerHeight - 370
         }
         // 获取统计数据
         this.getTotalData(Object.assign(parameter, this.queryParam))

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -207,7 +207,7 @@ export default {
 <style lang="less">
   .chooseAddressList-modal{
     .table-operator{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .item-box{
       position: relative;

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -11,7 +11,7 @@
       <!-- 内容 -->
       <a-card size="small" v-for="(item,bindex) in detail" :key="item.id" :bordered="false" class="purchaseOrderWarehousing-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:10px">
+        <a-alert type="info" style="margin-bottom:10px">
           <div slot="message" >
             <div>产品款数 <strong>{{ item.totalPutCategory }}</strong> ,本次发货数量合计 <strong>{{ item.totalPutQty }}</strong> ,本次发货金额合计¥<strong>{{ item.totalPutAmount }}</strong></div>
           </div>

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/detail.vue

@@ -139,7 +139,7 @@ export default {
 
 <style lang="less">
   .purchaseReturnDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
     .timeline-box{
       margin-top: 30px;
       .auxiliary-txt{

+ 43 - 30
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -31,7 +31,7 @@
                       <a-input id="purchaseReturnEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                  <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="getPurchaseBillDetailList(1)" :disabled="disabled" id="purchaseReturnList-refresh">查询</a-button>
                     <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="purchaseReturnList-reset">重置</a-button>
                   </a-col>
@@ -48,11 +48,12 @@
               :dataSource="loadData"
               :loading="loading"
               :scroll="{ x: 1320, y: 300 }"
-              :pagination="paginationProps"
+              :pagination="false"
               bordered>
               <!-- 数量 -->
               <template slot="returnQty" slot-scope="text, record">
                 <a-input-number
+                  size="small"
                   id="purchaseReturnEdit-returnQty"
                   v-model="record.returnQty"
                   :precision="0"
@@ -66,6 +67,14 @@
                 <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="purchaseReturnEdit-add-btn">添加</a-button>
               </template>
             </a-table>
+            <!-- 分页 -->
+            <tablePagination
+              ref="tablePagination"
+              :total="paginationProps.total"
+              :current="paginationProps.current"
+              :pageSize="paginationProps.pageSize"
+              @changePageSize="changePageSize"
+              @changePage="changePage" />
           </a-collapse-panel>
         </a-collapse>
       </a-card>
@@ -94,11 +103,12 @@
               :dataSource="chooseLoadData"
               :loading="chooseLoading"
               :scroll="{ x: 1420, y: 300 }"
-              :pagination="choosePaginationProps"
+              :pagination="false"
               bordered>
               <!-- 退货数量 -->
               <template slot="qty" slot-scope="text, record">
                 <a-input-number
+                  size="small"
                   id="purchaseReturnEdit-qty"
                   v-model="record.qty"
                   :precision="0"
@@ -111,6 +121,7 @@
               <!-- 退货原因 -->
               <template slot="remarks" slot-scope="text, record">
                 <a-input
+                  size="small"
                   id="purchaseReturnEdit-remarks"
                   v-model="record.remarks"
                   :maxLength="30"
@@ -123,6 +134,14 @@
                 <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="purchaseReturnEdit-del-btn">删除</a-button>
               </template>
             </a-table>
+            <!-- 分页 -->
+            <tablePagination
+              ref="chooseTablePagination"
+              :total="choosePaginationProps.total"
+              :current="choosePaginationProps.current"
+              :pageSize="choosePaginationProps.pageSize"
+              @changePageSize="changeChoosePageSize"
+              @changePage="changeChoosePage" />
           </a-collapse-panel>
         </a-collapse>
       </a-card>
@@ -143,9 +162,10 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { purchaseReturnPurchaseBillDetailList, purchaseReturnDetailList, purchaseReturnDetailSave, purchaseReturnDetailDel, purchaseReturnSubmit, purchaseReturnDelAll } from '@/api/purchaseReturn'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   data () {
     return {
       spinning: false,
@@ -172,14 +192,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       loadData: [],
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       },
       // 表头
       chooseColumns: [
@@ -195,14 +211,10 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
-      choosePageNo: 1, //  分页页码
-      choosePageSize: 10, //  分页 每页多少条
       choosePaginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changeChoosePageSize(current, pageSize),
-        onChange: (current) => this.changeChoosePage(current)
+        pageSize: 20
       }
     }
   },
@@ -212,10 +224,9 @@ export default {
       this.queryParam.purchaseBillNo = ''
       this.queryParam.productCode = ''
       this.queryParam.productName = ''
-      this.pageNo = 1
-      this.pageSize = 10
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.getPurchaseBillDetailList(1)
     },
     //  添加/编辑
@@ -328,27 +339,27 @@ export default {
     },
     //  已选产品 分页  一页多少条change
     changePageSize (current, pageSize) {
-      this.pageNo = current
-      this.pageSize = pageSize
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
       this.getPurchaseBillDetailList()
     },
     //  已选产品 分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.getPurchaseBillDetailList()
     },
     // 选择产品  列表
     getPurchaseBillDetailList (pageNo) {
-      this.pageNo = this.pageNo || pageNo
+      this.paginationProps.current = pageNo || this.paginationProps.current
       this.disabled = true
       this.loading = true
-      const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
+      const params = Object.assign({ pageNo: this.paginationProps.current, pageSize: this.paginationProps.pageSize }, this.queryParam)
       purchaseReturnPurchaseBillDetailList(params).then(res => {
         this.loading = false
         if (res.status == 200) {
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0
-          this.paginationProps.current = this.pageNo
+          this.paginationProps.current = data.pageNo
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
@@ -358,27 +369,28 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
     },
     //  已选产品 分页  一页多少条change
     changeChoosePageSize (current, pageSize) {
-      this.choosePageNo = current
-      this.choosePageSize = pageSize
+      this.choosePaginationProps.current = current
+      this.choosePaginationProps.pageSize = pageSize
       this.getChooseProductList()
     },
     //  已选产品 分页 页码change
     changeChoosePage (current) {
-      this.choosePageNo = current
+      this.choosePaginationProps.current = current
       this.getChooseProductList()
     },
     // 已选产品列表数据
     getChooseProductList (pageNo) {
-      this.choosePageNo = this.choosePageNo || pageNo
+      this.choosePaginationProps.current = this.choosePaginationProps.current || pageNo
       const params = {
-        pageNo: this.choosePageNo,
-        pageSize: this.choosePageSize,
+        pageNo: this.choosePaginationProps.current,
+        pageSize: this.choosePaginationProps.pageSize,
         purchaseReturnSn: this.$route.params.sn
       }
       this.chooseLoading = true
@@ -399,6 +411,7 @@ export default {
         } else {
           this.choosePaginationProps.total = 0
           this.choosePaginationProps.current = 1
+          this.choosePaginationProps.pageSize = 20
           this.chooseLoadData = []
         }
       })
@@ -434,10 +447,10 @@ export default {
 <style lang="less">
   .purchaseReturnEdit-wrap{
     .purchaseReturnEdit-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .purchaseReturnEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 3 - 3
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -40,7 +40,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="purchaseReturnList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="purchaseReturnList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -103,7 +103,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',
@@ -128,7 +128,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 330
         }
         return purchaseReturnList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/reportData/chainReceivedSendStorageReport/list.vue

@@ -71,7 +71,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-top: 3px;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="sendStorageReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="sendStorageReportList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -121,7 +121,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [],

+ 2 - 2
src/views/reportData/chainSalesDetailReport/list.vue

@@ -142,7 +142,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-top: 3px;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesDetailReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainSalesDetailReportList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -154,7 +154,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
           产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
           总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>;

+ 2 - 2
src/views/reportData/chainSalesReport/list.vue

@@ -90,7 +90,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-top: 3px;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainSalesReportList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -102,7 +102,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
           总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
           产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;

+ 1 - 1
src/views/reportData/chainStockReport/detailModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="960">
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:10px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
         现有库存总数量(个):<strong> {{ (currentStock && currentStock.totalQty) || 0 }} </strong>;
         现有库存总成本(¥):<strong> {{ (currentStock && currentStock.totalCost) || 0 }} </strong>。

+ 3 - 3
src/views/reportData/chainStockReport/list.vue

@@ -71,7 +71,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-top: 3px;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainStockReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainStockReportList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -83,7 +83,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
           现有库存总数量(个):<strong> {{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }} </strong>;
           现有库存总成本(¥):<strong> {{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }} </strong>。
@@ -131,7 +131,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         dealerSn: undefined,

+ 3 - 3
src/views/reportData/customerReport/list.vue

@@ -60,7 +60,7 @@
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 15px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="customerReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="customerReportList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -72,7 +72,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
           总交易金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</strong>;
           总毛利率:<strong>{{ (totalData && totalData.percentage) ? totalData.percentage : '--' }}</strong>
@@ -106,7 +106,7 @@ export default {
       spinning: false,
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [],

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

@@ -57,7 +57,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-top: 3px;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="receivedSendStorageReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="receivedSendStorageReportList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -106,7 +106,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       spinning: false,
       tableHeight: 0,
       queryParam: { //  查询条件

+ 1 - 1
src/views/reportData/stockExpenditureReport/list.vue

@@ -17,7 +17,7 @@
                 <rangeDate ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24" style="margin-top: 3px;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handelSearch" id="stockExpenditureReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" id="stockExpenditureReportList-reset">重置</a-button>
             </a-col>

+ 1 - 1
src/views/reportData/stockIncomeReport/list.vue

@@ -17,7 +17,7 @@
                 <rangeDate ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24" style="margin-top: 3px;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handelSearch" id="stockIncomeReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" id="stockIncomeReportList-reset">重置</a-button>
             </a-col>

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

@@ -66,7 +66,7 @@ export default {
   data () {
     return {
       tableHeight: 0,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',
@@ -92,7 +92,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 260
+          this.tableHeight = window.innerHeight - 275
         }
         return giftsDetailList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 17 - 16
src/views/salesManagement/outboundOrder/list.vue

@@ -40,7 +40,7 @@
               </a-col>
             </template>
             <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" style="margin-bottom: 15px;">查询</a-button>
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" style="margin-bottom: 10px;">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
@@ -52,7 +52,7 @@
       </div>
       <!-- 列表 -->
       <!-- 暂不做 -->
-      <!-- <div style="margin-bottom: 15px">
+      <!-- <div style="margin-bottom: 10px">
         <a-button type="primary" id="outboundOrder-export" :disabled="!hasSelected" :loading="loading" @click="handleOutbounds">批量出库</a-button>
         <span style="margin-left: 8px">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
@@ -76,7 +76,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1720, y: tableHeight }"
+        :scroll="{ x: 1270, y: tableHeight }"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -104,6 +104,7 @@
       class="outboundOrderDetail-modal"
       :footer="null"
       :maskClosable="false"
+      :bodyStyle="{padding:'12px'}"
       title="详情"
       v-model="openModal"
       v-if="openModal"
@@ -136,7 +137,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
         beginDate: '',
@@ -147,18 +148,18 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单号', dataIndex: 'outBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'outBizNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', dataIndex: 'demanderName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'productTotalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库时间', dataIndex: 'outTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
+        { title: '总款数', dataIndex: 'productTotalCategory', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总售价', dataIndex: 'productTotalPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库时间', dataIndex: 'outTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库状态', dataIndex: 'stateDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,
@@ -166,7 +167,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 260
+          this.tableHeight = window.innerHeight - 275
         }
         return stockOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 3 - 3
src/views/salesManagement/quotation/detail.vue

@@ -29,7 +29,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="quotationDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">总款数:<strong>1</strong>,总数量:<strong>1</strong>,总赠品数量:<strong>0</strong>,总售价:<strong>14</strong>,总成本:<strong>6.33</strong>,总毛利: <strong>6</strong></div>
       </a-alert>
       <!-- 列表 -->
@@ -127,10 +127,10 @@ export default {
 <style lang="less">
   .quotationDetail-wrap{
     .quotationDetail-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .quotationDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 2 - 2
src/views/salesManagement/quotation/edit.vue

@@ -122,7 +122,7 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:10px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">总售价:<strong>6</strong> ,总款数:<strong>6</strong> ,总数量:<strong>6.33</strong></div>
             </a-alert>
             <!-- 搜索条件 -->
@@ -346,7 +346,7 @@
 <style lang="less">
   .quotationEdit-wrap{
     .quotationEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 1 - 1
src/views/salesManagement/quotation/list.vue

@@ -86,7 +86,7 @@ export default {
   components: { STable, VSelect, basicInfoModal, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',

+ 2 - 2
src/views/salesManagement/salesQuery/detail.vue

@@ -59,7 +59,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- alert -->
-        <a-alert type="info" style="margin-bottom: 15px;">
+        <a-alert type="info" style="margin-bottom: 10px;">
           <div slot="message">
             总款数:<strong>{{ detailData&&(detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }}</strong>;
             总数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
@@ -233,7 +233,7 @@ export default {
 <style lang="less">
   .salesDetail-wrap{
     .salesDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 102 - 88
src/views/salesManagement/salesQuery/edit.vue

@@ -23,7 +23,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="salesEdit-cont">
         <!-- 总计 -->
-        <a-alert style="margin-bottom: 15px;" type="info">
+        <a-alert style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
             <div>
               总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? '¥'+detailData.totalAmount : '--' }}</strong>;
@@ -44,35 +44,45 @@
             </div>
           </div>
         </a-alert>
-        <!-- 查询条件 -->
-        <a-row :gutter="15">
-          <a-col :span="18">
-            <a-form-model layout="inline" :model="productForm">
-              <a-form-model-item label="产品编码">
-                <a-input v-model="productForm.productCode" allowClear placeholder="输入产品编码" />
-              </a-form-model-item>
-              <a-form-model-item label="产品名称">
-                <a-input v-model="productForm.productName" allowClear placeholder="输入产品名称" />
-              </a-form-model-item>
-              <a-form-model-item>
-                <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
-                <a-button style="margin: 0 0 18px 8px" @click="resetForm" id="salesEdit-reset">重置</a-button>
-              </a-form-model-item>
-            </a-form-model>
-          </a-col>
-          <a-col :span="6">
-            <div style="float:right;overflow: hidden;">
-              <!-- <a-button size="small" id="salesEdit-dru">导入明细</a-button> -->
-              <a-button
-                size="small"
-                type="primary"
-                @click="delSalerDetailAll"
-                :loading="delLoading"
-                style="margin-left: 10px"
-                id="salesEdit-del-all">整单删除</a-button>
-            </div>
-          </a-col>
-        </a-row>
+        <!-- 搜索条件 -->
+        <div class="table-page-search-wrapper">
+          <a-row :gutter="15">
+            <a-col :span="18">
+              <a-form-model :model="productForm" layout="inline" @keyup.enter.native="$refs.table.refresh(true)" >
+                <a-row :gutter="15">
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item label="产品编码">
+                      <a-input v-model="productForm.productCode" allowClear placeholder="输入产品编码" />
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item label="产品名称">
+                      <a-input v-model="productForm.productName" allowClear placeholder="输入产品名称" />
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item>
+                      <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
+                      <a-button style="margin: 0 0 18px 8px" @click="resetForm" id="salesEdit-reset">重置</a-button>
+                    </a-form-model-item>
+                  </a-col>
+                </a-row>
+              </a-form-model>
+            </a-col>
+            <a-col :span="6">
+              <div style="float:right;overflow: hidden;">
+                <!-- <a-button size="small" id="salesEdit-dru">导入明细</a-button> -->
+                <a-button
+                  size="small"
+                  type="primary"
+                  @click="delSalerDetailAll"
+                  :loading="delLoading"
+                  style="margin-left: 10px"
+                  id="salesEdit-del-all">整单删除</a-button>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
         <!-- 已选配件列表 -->
         <s-table
           class="sTable"
@@ -81,7 +91,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 1940, y: 300 }"
+          :scroll="{ x: 1300, y: 300 }"
           :rowClassName="(record, index) => record.cost > record.price ? 'redBg-row':''"
           bordered>
           <!-- 产品编码 -->
@@ -93,26 +103,29 @@
           </template>
           <!-- 售价 -->
           <template slot="price" slot-scope="text, record">
-            <editable-cell
-              size="small"
-              :text="text"
+            <a-input-number
               id="salesEdit-price"
-              :max="999999"
-              :min="0"
+              size="small"
+              v-model="record.price"
               :precision="2"
-              punit="¥"
-              @change="onCellChange(record.id, 'price', $event)" />
+              :min="0"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => priceBlur(e.target.value, record)"
+              style="width: 100%;" />
           </template>
           <!-- 销售数量 -->
           <template slot="salesNums" slot-scope="text, record">
-            <editable-cell
-              size="small"
-              :text="record.qty"
+            <a-input-number
               id="salesEdit-salesNums"
-              :max="999999"
-              :min="1"
+              size="small"
+              v-model="record.qty"
               :precision="0"
-              @change="onCellChange(record.id, 'qty', $event)" />
+              :min="1"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => qtyBlur(e.target.value, record)"
+              style="width: 100%;" />
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -151,11 +164,10 @@ import { STable, VSelect } from '@/components'
 import queryPart from './queryPart.vue'
 import chooseCustomModal from './chooseCustomModal.vue'
 import { salesDetail, salesWriteSubmit, salesWriteDiscount, salesDetailPrint } from '@/api/sales'
-import EditableCell from '@/views/common/editInput.js'
 import { salesDetailList, salesDetailInsert, salesDetailUpdatePrice, salesDetailUpdateQty, salesDetailDel, salesDetailDelAll } from '@/api/salesDetail'
 export default {
   name: 'SalesDetail',
-  components: { STable, VSelect, queryPart, chooseCustomModal, EditableCell },
+  components: { STable, VSelect, queryPart, chooseCustomModal },
   data () {
     return {
       spinning: false,
@@ -174,18 +186,18 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', scopedSlots: { customRender: 'productCode' }, width: 220, align: 'center', sorter: true },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'dealerProductEntity.productBrandName', width: 200, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'warehouseEntity.name', width: 150, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '售价', dataIndex: 'price', scopedSlots: { customRender: 'price' }, width: 150, align: 'center' },
-        { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
-        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '售价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '折后小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', scopedSlots: { customRender: 'productCode' }, width: 150, align: 'center', sorter: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'dealerProductEntity.productBrandName', width: 100, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseEntity.name', width: 100, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '售价', dataIndex: 'price', scopedSlots: { customRender: 'price' }, width: 100, align: 'center' },
+        { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '售价小计', dataIndex: 'totalAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '折后小计', dataIndex: 'discountedAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -196,6 +208,8 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
+            data.list[i].qtyBackups = data.list[i].qty
+            data.list[i].priceBackups = data.list[i].price
           }
           this.disabled = false
           this.dataSource = data.list
@@ -206,39 +220,47 @@ export default {
     }
   },
   methods: {
-    onCellChange (id, key, value) {
-      const dataSource = [...this.dataSource]
-      const row = dataSource.find(item => item.id === id)
-      if (row) {
-        row[key] = Number(value)
-        this.dataSource = dataSource
-      }
-      // 修改价格
-      if (key == 'price') {
+    // 已选产品 销售数量  blur
+    qtyBlur (val, record) {
+      this.dataSource = record
+      if (val && val != record.qtyBackups) {
         this.spinning = true
-        salesDetailUpdatePrice({
-          salesBillSn: row.salesBillSn,
-          productSn: row.productSn,
-          price: row.price
+        salesDetailUpdateQty({
+          id: record.id,
+          qty: record.qty
         }).then(res => {
           this.resetSearchForm(true)
-          this.$message.info(res.message)
+          if (res.status == 200) {
+            this.$refs.partQuery.resetCurForm()
+            this.$message.info(res.message)
+          }
           this.spinning = false
         })
+      } else {
+        record.qty = record.qtyBackups
       }
-      if (key == 'qty') {
+    },
+    // 已选产品 售价  blur
+    priceBlur (val, record) {
+      this.dataSource = record
+      //  光标移出,值发生改变再调用编辑接口
+      if (val && val != record.priceBackups) {
         this.spinning = true
-        salesDetailUpdateQty({
-          id: row.id,
-          qty: row.qty
+        salesDetailUpdatePrice({
+          salesBillSn: record.salesBillSn,
+          productSn: record.productSn,
+          price: record.price
         }).then(res => {
           this.resetSearchForm(true)
           if (res.status == 200) {
-            this.$refs.partQuery.resetCurForm()
+            this.$message.info(res.message)
+            this.spinning = false
+          } else {
+            this.spinning = false
           }
-          this.$message.info(res.message)
-          this.spinning = false
         })
+      } else {
+        record.price = record.priceBackups
       }
     },
     // 打印预览/快捷打印
@@ -275,13 +297,6 @@ export default {
         window.frames['printf'].print()
       }
     },
-    // 编辑客户信息
-    handleEdit () {
-      this.openModal = true
-      setTimeout(() => {
-        this.$refs.custModal.editCust(this.detailData)
-      }, 500)
-    },
     // 更新产品列表
     updateData (priceType) {
       // 价格类型变更
@@ -383,7 +398,6 @@ export default {
         this.$message.info('该产品已在当前销售单中存在!')
         return
       }
-
       // 库存不足时
       if (row.currentQty < row.salesNums) {
         this.$confirm({
@@ -478,7 +492,7 @@ export default {
 <style lang="less">
   .salesEdit-wrap{
     .salesEdit-cont{
-      margin-top: 15px;
+      margin-top: 10px;
     }
     .total-bar{
       display: flex;

+ 24 - 23
src/views/salesManagement/salesQuery/list.vue

@@ -76,7 +76,7 @@
         <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd">新增(零售)</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:10px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;
           总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
@@ -92,7 +92,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 2050, y:tableHeight }"
+        :scroll="{ x: 1400, y:tableHeight }"
         bordered>
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
@@ -162,7 +162,7 @@
     <!-- 选择客户弹框 -->
     <choose-custom-modal :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('WAIT_OUT_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_OUT_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </template>
 
@@ -181,7 +181,7 @@ export default {
     return {
       spinning: false,
       tableHeight: 0,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 选择客户弹框是否显示
       settleStyleList: [], // 收款方式
@@ -206,26 +206,26 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '来源', dataIndex: 'salesBillSourceDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 210, align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 210, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '总款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '收款方式', dataIndex: 'settleStyleEntity.name', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: 100, align: 'center' },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
+        { title: '创建时间', dataIndex: 'createDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '来源', dataIndex: 'salesBillSourceDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 120, align: 'center' },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'totalCategory', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总售价', dataIndex: 'totalAmount', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款方式', dataIndex: 'settleStyleEntity.name', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: 60, align: 'center' },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 420
+          this.tableHeight = window.innerHeight - 365
         }
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {
@@ -242,7 +242,8 @@ export default {
         })
       },
       visibleAudit: false,
-      auditInfo: null
+      auditInfo: null,
+      spinningAudit: false
     }
   },
   methods: {
@@ -265,7 +266,7 @@ export default {
       this.visibleAudit = true
     },
     auditOrder (billStatus) {
-      this.spinning = true
+      this.spinningAudit = true
       salesWriteAudit({
         id: this.auditInfo.id,
         billStatus: billStatus
@@ -274,10 +275,10 @@ export default {
           this.visibleAudit = false
           this.$message.success(res.message)
           this.$refs.table.refresh()
-          this.spinning = false
+          this.spinningAudit = false
         } else {
           this.visibleAudit = false
-          this.spinning = false
+          this.spinningAudit = false
         }
       })
     },

+ 20 - 16
src/views/salesManagement/salesQuery/productSalesRecordModal.vue

@@ -24,9 +24,17 @@
         :columns="columns"
         :dataSource="list"
         :loading="loading"
-        :pagination="paginationProps"
+        :pagination="false"
         bordered>
       </a-table>
+      <!-- 分页 -->
+      <tablePagination
+        ref="tablePagination"
+        :total="paginationProps.total"
+        :current="paginationProps.current"
+        :pageSize="paginationProps.pageSize"
+        @changePageSize="changePageSize"
+        @changePage="changePage" />
     </div>
   </a-modal>
 </template>
@@ -34,9 +42,10 @@
 <script>
 import { salesRecordlList } from '@/api/salesDetail.js'
 import { STable } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 export default {
   name: 'SalesRecordModal',
-  components: { STable },
+  components: { STable, tablePagination },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -67,17 +76,12 @@ export default {
         { title: '客户名称', dataIndex: 'salesBillEntity.buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       list: [],
-      pagination: {},
       loading: false,
       curTab: '1',
-      pageNo: 1, //  分页页码
-      pageSize: 10, //  分页 每页多少条
       paginationProps: {
-        showSizeChanger: true, //  是否可以改变 pageSize
         total: 0, //  分页总条数
         current: 1,
-        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
-        onChange: (current) => this.changePage(current)
+        pageSize: 20
       }
     }
   },
@@ -95,10 +99,10 @@ export default {
     },
     // 查询列表
     handelSearch (pageNo) {
-      this.pageNo = pageNo || this.pageNo
+      this.paginationProps.current = pageNo || this.paginationProps.current
       const params = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize
+        pageNo: this.paginationProps.current,
+        pageSize: this.paginationProps.pageSize
       }
       // 开始查询
       this.loading = true
@@ -112,19 +116,20 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.list = []
         }
       })
     },
     //  分页  一页多少条change
     changePageSize (current, pageSize) {
-      this.pageNo = current
-      this.pageSize = pageSize
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
       this.handelSearch()
     },
     //  分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.handelSearch()
     },
     callback (key) {
@@ -141,10 +146,9 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-        this.pageNo = 1
-        this.pageSize = 10
         this.paginationProps.total = 0
         this.paginationProps.current = 1
+        this.paginationProps.pageSize = 20
         this.curTab = '1'
         this.list = []
       }

+ 20 - 21
src/views/salesManagement/salesQuery/queryPart.vue

@@ -14,13 +14,13 @@
               <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="原厂编码">
               <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
+            <a-col :md="7" :sm="24">
               <a-form-model-item label="车架号(VIN)" prop="vinNo">
                 <a-input id="productInfoList-vinNo" v-model.trim="queryParam.vinNo" @change="vinNoChange" allowClear placeholder="请输入车架号(VIN)"/>
               </a-form-model-item>
@@ -58,7 +58,7 @@
                 <v-select code="CHECK_ENABLE_STATE" id="productInfoList-state" v-model="queryParam.state" allowClear placeholder="请选择车型"></v-select>
               </a-form-item>
             </a-col> -->
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-model-item label="仓库">
                 <a-select
                   placeholder="请选择仓库"
@@ -73,7 +73,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24">
+          <a-col :md="7" :sm="24">
             <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin:0 15px 0 8px">
@@ -86,7 +86,7 @@
             </a-popover>
             <a-popover>
               <template slot="content">点击设置列的显示</template>
-              <a-icon style="margin:0 15px;cursor: pointer;" @click="showSetting = true" type="setting" theme="twoTone" />
+              <a-icon style="margin:0 5px;cursor: pointer;" @click="showSetting = true" type="setting" theme="twoTone" />
             </a-popover>
           </a-col>
         </a-row>
@@ -107,7 +107,6 @@
       <!-- 售价 -->
       <template slot="salePrice" slot-scope="text, record">
         <div @dblclick.stop>
-          ¥
           <a-input-number
             size="small"
             v-model="record.salePrice"
@@ -143,7 +142,7 @@
           class="button-success"
           @click="handleDetail(record)"
           id="productInfoList-detail-btn"
-          style="margin-left: 15px;">销售记录</a-button>
+          style="margin-left: 5px;">销售记录</a-button>
       </template>
     </s-table>
     <!-- 销售记录 -->
@@ -230,20 +229,20 @@ export default {
       productTypeList: [], //  产品分类  下拉数据
       warehouseList: [], // 仓库列表
       columnsBak: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'brandName', width: 200, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'warehouseName', width: 150, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存数量', dataIndex: 'currentQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '市级价', dataIndex: 'dealerProduct.cityPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '售价', dataIndex: 'salePrice', scopedSlots: { customRender: 'salePrice' }, width: 150, align: 'center' },
-        { title: '销售数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: 150, align: 'center' },
-        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
+        // { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'brandName', width: 100, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存数量', dataIndex: 'currentQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价', dataIndex: 'putCost', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '市级价', dataIndex: 'dealerProduct.cityPrice', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价', dataIndex: 'salePrice', scopedSlots: { customRender: 'salePrice' }, width: 100, align: 'center' },
+        { title: '销售数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: 100, align: 'center' },
+        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       columns: [],
       // 加载数据方法 必须为 Promise 对象

+ 2 - 2
src/views/salesManagement/salesReturn/detail.vue

@@ -39,7 +39,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- alert -->
-        <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
+        <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
           <div slot="message">
             总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : '--' }}</strong>;
             总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : '--' }}</strong>;
@@ -191,7 +191,7 @@ export default {
 <style lang="less">
   .salesReturnDetail-wrap{
     .salesReturnDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 3 - 3
src/views/salesManagement/salesReturn/list.vue

@@ -56,7 +56,7 @@
         <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom: 15px;">
+      <a-alert type="info" style="margin-bottom: 10px;">
         <div slot="message">
           退货总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? countData.totalAmount : '--' }}</strong>元;
           总单数:<strong>{{ countData&&(countData.totalBillNumber || countData.totalBillNumber==0) ? countData.totalBillNumber : '--' }}</strong>;
@@ -131,7 +131,7 @@ export default {
       spinning: false,
       tableHeight: 0,
       // 高级搜索 展开/关闭
-      advanced: false,
+      advanced: true,
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 选择客户弹框是否显示
       // 查询参数
@@ -164,7 +164,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 420
+          this.tableHeight = window.innerHeight - 370
         }
         // 查询总计
         this.getQueryCount(Object.assign(parameter, this.queryParam))

+ 102 - 65
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -23,7 +23,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- alert -->
-        <a-alert style="margin-bottom: 15px;" type="info">
+        <a-alert style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
             <div>
               <span>退货总金额:{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? countData.totalAmount : '--' }}元;</span>
@@ -44,35 +44,45 @@
             </div>
           </div>
         </a-alert>
-        <!-- 查询条件 -->
-        <a-row :gutter="15">
-          <a-col :span="18">
-            <a-form-model layout="inline" :model="productForm" @keyup.enter.native="$refs.table.refresh(true)">
-              <a-form-model-item label="产品编码">
-                <a-input v-model="productForm.productCode" allowClear placeholder="输入产品编码" />
-              </a-form-model-item>
-              <a-form-model-item label="产品名称">
-                <a-input v-model="productForm.productName" allowClear placeholder="输入产品名称" />
-              </a-form-model-item>
-              <a-form-model-item>
-                <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesReturn-refresh">查询</a-button>
-                <a-button style="margin: 0 0 18px 8px" @click="resetForm" id="salesReturn-reset">重置</a-button>
-              </a-form-model-item>
-            </a-form-model>
-          </a-col>
-          <a-col :span="6">
-            <div style="float:right;overflow: hidden;">
-              <!-- <a-button id="salesReturn-dru">导入明细</a-button> -->
-              <a-button
-                size="small"
-                type="primary"
-                @click="salesReturnDelAll"
-                :loading="delLoading"
-                style="margin-left: 10px"
-                id="salesReturn-del-all">整单删除</a-button>
-            </div>
-          </a-col>
-        </a-row>
+        <!-- 搜索条件 -->
+        <div class="table-page-search-wrapper">
+          <a-row :gutter="15">
+            <a-col :span="18">
+              <a-form-model layout="inline" :model="productForm" @keyup.enter.native="$refs.table.refresh(true)">
+                <a-row :gutter="15">
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item label="产品编码">
+                      <a-input v-model="productForm.productCode" allowClear placeholder="输入产品编码" />
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item label="产品名称">
+                      <a-input v-model="productForm.productName" allowClear placeholder="输入产品名称" />
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item>
+                      <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesReturn-refresh">查询</a-button>
+                      <a-button style="margin: 0 0 18px 8px" @click="resetForm" id="salesReturn-reset">重置</a-button>
+                    </a-form-model-item>
+                  </a-col>
+                </a-row>
+              </a-form-model>
+            </a-col>
+            <a-col :span="6">
+              <div style="float:right;overflow: hidden;">
+                <!-- <a-button id="salesReturn-dru">导入明细</a-button> -->
+                <a-button
+                  size="small"
+                  type="primary"
+                  @click="salesReturnDelAll"
+                  :loading="delLoading"
+                  style="margin-left: 10px"
+                  id="salesReturn-del-all">整单删除</a-button>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
         <!-- 已选配件列表 -->
         <s-table
           class="sTable"
@@ -81,38 +91,46 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 1830, y: 300 }"
+          :scroll="{ x: 1620, y: 300 }"
           bordered>
           <!-- 本次退货数量 -->
           <template slot="qty" slot-scope="text, record">
-            <editable-cell
+            <a-input-number
+              id="salesReturn-qty"
               size="small"
-              :text="record.qty"
-              :max="999999"
-              :min="0"
+              v-model="record.qty"
               :precision="0"
-              @change="onCellChange(record.id, 'qty', $event)" />
+              :min="0"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => onCellBlur(e.target.value, record, 'qty')"
+              style="width: 100%;" />
           </template>
           <!-- 废品数量 -->
           <template slot="celQty" slot-scope="text, record">
-            <editable-cell
+            <a-input-number
+              id="salesReturn-celQty"
               size="small"
-              :text="record.celQty"
-              :max="999999"
-              :min="0"
+              v-model="record.celQty"
               :precision="0"
-              @change="onCellChange(record.id, 'celQty', $event)" />
+              :min="0"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => onCellBlur(e.target.value, record, 'celQty')"
+              style="width: 100%;" />
           </template>
           <!-- 价格 -->
           <template slot="price" slot-scope="text, record">
-            <editable-cell
+            <a-input-number
+              id="salesReturn-price"
               size="small"
-              :text="text"
-              :max="999999"
-              :min="0"
+              v-model="record.price"
               :precision="2"
-              punit="¥"
-              @change="onCellChange(record.id, 'price', $event)" />
+              :min="0"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => onCellBlur(e.target.value, record, 'price')"
+              style="width: 100%;" />
           </template>
           <!-- 退货金额小计 -->
           <template slot="returnAmount" slot-scope="text, record">
@@ -121,6 +139,7 @@
           <!-- 仓库仓位 -->
           <template slot="warehouse" slot-scope="text, record, index">
             <a-cascader
+              size="small"
               @change="e => changeWarehouseCascade(e, record, index)"
               v-model="record.warehouseCascade"
               expand-trigger="hover"
@@ -165,7 +184,6 @@
 <script>
 import { STable, VSelect } from '@/components'
 import queryPart from './queryPart.vue'
-import EditableCell from '@/views/common/editInput.js'
 import chooseCustomModal from './chooseCustomModal.vue'
 import { warehouseCascadeList } from '@/api/warehouse'
 import { salesReturnDetail, salesReturnQueryCount, salesReturnDetailList, salesReturnDiscount, salesReturnDelAll, salesReturnDetailDel, salesReturnSaveProduct, salesReturnSubmit, salesReturnDetailPrint } from '@/api/salesReturn'
@@ -175,7 +193,6 @@ export default {
     STable,
     VSelect,
     queryPart,
-    EditableCell,
     chooseCustomModal
   },
   data () {
@@ -203,14 +220,14 @@ export default {
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', align: 'center', width: 220, customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', align: 'center', width: 220, customRender: function (text) { return text || '--' } },
-        { title: '售价', dataIndex: 'price', align: 'center', width: 150, scopedSlots: { customRender: 'price' } },
-        { title: '单位', dataIndex: 'dealerProductEntity.unit', align: 'center', width: 100, customRender: function (text) { return text || '--' } },
+        { title: '售价', dataIndex: 'price', align: 'center', width: 100, scopedSlots: { customRender: 'price' } },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', align: 'center', width: 60, customRender: function (text) { return text || '--' } },
         { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 200, align: 'center' },
-        { title: '退货数量', dataIndex: 'qty', align: 'center', width: 150, scopedSlots: { customRender: 'qty' } },
-        { title: '废品数量', dataIndex: 'celQty', align: 'center', width: 150, scopedSlots: { customRender: 'celQty' } },
+        { title: '退货数量', dataIndex: 'qty', align: 'center', width: 100, scopedSlots: { customRender: 'qty' } },
+        { title: '废品数量', dataIndex: 'celQty', align: 'center', width: 100, scopedSlots: { customRender: 'celQty' } },
         { title: '退货金额小计', align: 'center', scopedSlots: { customRender: 'returnAmount' }, width: 120 },
         { title: '折后金额小计', dataIndex: 'discountedAmount', align: 'center', width: 120, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
       // 加载数据方法 必须为 Promise 对象
@@ -224,6 +241,9 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
+            data.list[i].qtyBackups = data.list[i].qty
+            data.list[i].celQtyBackups = data.list[i].celQty
+            data.list[i].priceBackups = data.list[i].price
             const warehouseSn = data.list[i].warehouseSn || undefined
             const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
             if (warehouseSn || warehouseLocationSn) {
@@ -254,16 +274,35 @@ export default {
     handleEditCustom () {
       this.openModal = true
     },
-    onCellChange (id, key, value) {
-      const chooseLoadData = [...this.chooseLoadData]
-      const row = chooseLoadData.find(item => item.id === id)
-      if (row) {
-        row[key] = Number(value)
-        if (row.celQty > row.qty) {
+    // 已选产品  blur
+    onCellBlur (val, record, type) {
+      let valBackups
+      if (type == 'qty') {
+        valBackups = record.qtyBackups
+      } else if (type == 'celQty') {
+        valBackups = record.celQtyBackups
+      } else if (type == 'price') {
+        valBackups = record.priceBackups
+      }
+      //  光标移出,值发生改变再调用编辑接口
+      if (val && val != valBackups) {
+        if (Number(record.celQty) > Number(record.qty)) {
           this.$message.info('废品数量不可大于本次退货数量')
+          this.reductionVal(record, type, valBackups)
         } else {
-          this.saveProduct(row, 'edit')
+          this.saveProduct(record, 'edit')
         }
+      } else {
+        this.reductionVal(record, type, valBackups)
+      }
+    },
+    reductionVal (record, type, valBackups) {
+      if (type == 'qty') {
+        record.qty = valBackups
+      } else if (type == 'celQty') {
+        record.celQty = valBackups
+      } else if (type == 'price') {
+        record.price = valBackups
       }
     },
     //  仓库仓位  级联  列表
@@ -286,7 +325,6 @@ export default {
     },
     // 修改仓库仓位
     changeWarehouseCascade (val, opt, ind) {
-      console.log(val, opt, ind)
       let loadData = this.chooseLoadData[ind]
       if (val.length < 2) {
         this.$message.warning('当前仓库无仓位,请选择其他仓库')
@@ -305,7 +343,6 @@ export default {
         loadData.warehouseSnBackups = val[0] ? val[0] : ''
         loadData.warehouseLocationSnBackups = val[1] ? val[1] : ''
         loadData = this.chooseLoadData[ind]
-        console.log(loadData)
         this.saveProduct(loadData, 'edit')
       }
     },
@@ -498,9 +535,9 @@ export default {
 
 <style lang="less">
   .pages-wrap{
-    margin-top: 15px;
+    margin-top: 10px;
     .sTable{
-      margin-top: 15px;
+      margin-top: 10px;
     }
     .total-bar{
       display: flex;

+ 97 - 64
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -23,7 +23,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- alert -->
-        <a-alert style="margin-bottom: 15px;" type="info">
+        <a-alert style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
             <div>
               <span>退货总金额:{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? countData.totalAmount+'元' : '--' }};</span>
@@ -34,8 +34,14 @@
             <div>
               <div>
                 折扣金额:
-                <a-input-number id="discount" v-model="ordeDetail.discountAmount" :min="0" :precision="2" :max="999999"/>
-                <a-button type="primary" @click="salesReturnDiscount" class="button-info">打折</a-button>
+                <a-input-number
+                  size="small"
+                  id="discount"
+                  v-model="ordeDetail.discountAmount"
+                  :min="0"
+                  :precision="2"
+                  :max="999999"/>
+                <a-button size="small" type="primary" @click="salesReturnDiscount" class="button-info">打折</a-button>
               </div>
               <div>
                 折扣:<strong>{{ ordeDetail&&(ordeDetail.discountRate || ordeDetail.discountRate==0) ? ordeDetail.discountRate+'%' : '--' }}</strong>;
@@ -44,35 +50,45 @@
             </div>
           </div>
         </a-alert>
-        <!-- 查询条件 -->
-        <a-row :gutter="15">
-          <a-col :span="18">
-            <a-form-model layout="inline" :model="productForm" @keyup.enter.native="$refs.table.refresh(true)">
-              <a-form-model-item label="产品编码">
-                <a-input v-model="productForm.productCode" allowClear placeholder="输入产品编码" />
-              </a-form-model-item>
-              <a-form-model-item label="产品名称">
-                <a-input v-model="productForm.productName" allowClear placeholder="输入产品名称" />
-              </a-form-model-item>
-              <a-form-model-item>
-                <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesReturn-refresh">查询</a-button>
-                <a-button style="margin: 0 0 18px 8px" @click="resetForm" id="salesReturn-reset">重置</a-button>
-              </a-form-model-item>
-            </a-form-model>
-          </a-col>
-          <a-col :span="6">
-            <div style="float:right;overflow: hidden;">
-              <!-- <a-button id="salesReturn-dru">导入明细</a-button> -->
-              <a-button
-                size="small"
-                type="primary"
-                @click="salesReturnDelAll"
-                :loading="delLoading"
-                style="margin-left: 10px"
-                id="salesReturn-del-all">整单删除</a-button>
-            </div>
-          </a-col>
-        </a-row>
+        <!-- 搜索条件 -->
+        <div class="table-page-search-wrapper">
+          <a-row :gutter="15">
+            <a-col :span="18">
+              <a-form-model layout="inline" :model="productForm" @keyup.enter.native="$refs.table.refresh(true)">
+                <a-row :gutter="15">
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item label="产品编码">
+                      <a-input v-model="productForm.productCode" allowClear placeholder="输入产品编码" />
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item label="产品名称">
+                      <a-input v-model="productForm.productName" allowClear placeholder="输入产品名称" />
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item>
+                      <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesReturn-refresh">查询</a-button>
+                      <a-button style="margin-left: 5px" @click="resetForm" id="salesReturn-reset">重置</a-button>
+                    </a-form-model-item>
+                  </a-col>
+                </a-row>
+              </a-form-model>
+            </a-col>
+            <a-col :span="6">
+              <div style="float:right;overflow: hidden;">
+                <!-- <a-button id="salesReturn-dru">导入明细</a-button> -->
+                <a-button
+                  size="small"
+                  type="primary"
+                  @click="salesReturnDelAll"
+                  :loading="delLoading"
+                  style="margin-left: 10px"
+                  id="salesReturn-del-all">整单删除</a-button>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
         <!-- 已选配件列表 -->
         <s-table
           class="sTable"
@@ -81,27 +97,33 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 2070, y: 300 }"
+          :scroll="{ x: 1840, y: 300 }"
           bordered>
           <!-- 本次退货数量 -->
           <template slot="qty" slot-scope="text, record">
-            <editable-cell
+            <a-input-number
+              id="salesReturns-qty"
               size="small"
-              :text="record.qty"
-              :max="999999"
-              :min="0"
+              v-model="record.qty"
               :precision="0"
-              @change="onCellChange(record.id, 'qty', $event)" />
+              :min="0"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => onCellBlur(e.target.value, record, 'qty')"
+              style="width: 100%;" />
           </template>
           <!-- 废品数量 -->
           <template slot="celQty" slot-scope="text, record">
-            <editable-cell
+            <a-input-number
+              id="salesReturns-celQty"
               size="small"
-              :text="record.celQty"
-              :max="999999"
-              :min="0"
+              v-model="record.celQty"
               :precision="0"
-              @change="onCellChange(record.id, 'celQty', $event)" />
+              :min="0"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => onCellBlur(e.target.value, record, 'celQty')"
+              style="width: 100%;" />
           </template>
           <!-- 退货金额小计 -->
           <template slot="returnAmount" slot-scope="text, record">
@@ -110,6 +132,7 @@
           <!-- 仓库仓位 -->
           <template slot="warehouse" slot-scope="text, record, index">
             <a-cascader
+              size="small"
               @change="e => changeWarehouseCascade(e, record, index)"
               v-model="record.warehouseCascade"
               expand-trigger="hover"
@@ -155,7 +178,6 @@
 <script>
 import { STable, VSelect } from '@/components'
 import queryPart from './queryPart.vue'
-import EditableCell from '@/views/common/editInput.js'
 import chooseCustomModal from './chooseCustomModal.vue'
 import { warehouseCascadeList } from '@/api/warehouse'
 import { salesReturnDetail, salesReturnQueryCount, salesReturnDetailList, salesReturnDiscount, salesReturnDelAll, salesReturnDetailDel, salesReturnSaveProduct, salesReturnSubmit, salesReturnDetailPrint } from '@/api/salesReturn'
@@ -165,7 +187,6 @@ export default {
     STable,
     VSelect,
     queryPart,
-    EditableCell,
     chooseCustomModal
   },
   data () {
@@ -194,15 +215,15 @@ export default {
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', align: 'center', width: 220, customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', align: 'center', width: 200, customRender: function (text) { return text || '--' } },
-        { title: '售价', dataIndex: 'price', align: 'center', width: 100, scopedSlots: { customRender: 'price' } },
-        { title: '单位', dataIndex: 'dealerProductEntity.unit', align: 'center', width: 100, customRender: function (text) { return text || '--' } },
+        { title: '售价', dataIndex: 'price', align: 'center', width: 80, scopedSlots: { customRender: 'price' } },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', align: 'center', width: 60, customRender: function (text) { return text || '--' } },
         { title: '销售数量', dataIndex: 'salesQty', align: 'center', width: 100, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '本次退货数量', dataIndex: 'qty', align: 'center', width: 150, scopedSlots: { customRender: 'qty' } },
-        { title: '废品数量', dataIndex: 'celQty', align: 'center', width: 150, scopedSlots: { customRender: 'celQty' } },
-        { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 200, align: 'center' },
+        { title: '本次退货数量', dataIndex: 'qty', align: 'center', width: 100, scopedSlots: { customRender: 'qty' } },
+        { title: '废品数量', dataIndex: 'celQty', align: 'center', width: 100, scopedSlots: { customRender: 'celQty' } },
+        { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 150, align: 'center' },
         { title: '退货金额小计', align: 'center', scopedSlots: { customRender: 'returnAmount' }, width: 120 },
         { title: '折后金额小计', dataIndex: 'discountedAmount', align: 'center', width: 120, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
       // 加载数据方法 必须为 Promise 对象
@@ -216,6 +237,8 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
+            data.list[i].qtyBackups = data.list[i].qty
+            data.list[i].celQtyBackups = data.list[i].celQty
             const warehouseSn = data.list[i].warehouseSn || undefined
             const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
             if (warehouseSn || warehouseLocationSn) {
@@ -246,18 +269,31 @@ export default {
     handleEditCustom () {
       this.openModal = true
     },
-    onCellChange (id, key, value) {
-      const chooseLoadData = [...this.chooseLoadData]
-      const row = chooseLoadData.find(item => item.id === id)
-      if (row) {
-        row[key] = Number(value)
-        console.log(row.celQty, row.qty)
-        if (row.celQty > row.qty) {
+    // 已选产品  blur
+    onCellBlur (val, record, type) {
+      let valBackups
+      if (type == 'qty') {
+        valBackups = record.qtyBackups
+      } else if (type == 'celQty') {
+        valBackups = record.celQtyBackups
+      }
+      //  光标移出,值发生改变再调用编辑接口
+      if (val && val != valBackups) {
+        if (Number(record.celQty) > Number(record.qty)) {
           this.$message.info('废品数量不可大于本次退货数量')
-          this.$refs.table.refresh(true)
+          this.reductionVal(record, type, valBackups)
         } else {
-          this.saveProduct(row, 'edit')
+          this.saveProduct(record, 'edit')
         }
+      } else {
+        this.reductionVal(record, type, valBackups)
+      }
+    },
+    reductionVal (record, type, valBackups) {
+      if (type == 'qty') {
+        record.qty = valBackups
+      } else if (type == 'celQty') {
+        record.celQty = valBackups
       }
     },
     //  仓库仓位  级联  列表
@@ -491,10 +527,7 @@ export default {
 
 <style lang="less">
   .pages-wrap{
-    margin-top: 15px;
-    .sTable{
-      margin-top: 15px;
-    }
+    margin-top: 10px;
     .total-bar{
       display: flex;
       align-items: center;

+ 3 - 3
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -40,7 +40,7 @@
       <!-- 表格 -->
       <a-card size="small" :bordered="false" class="urgentItemsOffsetDetail-table-wrapper">
         <!-- 合计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px" v-if="detailData">
+        <a-alert type="info" style="margin-bottom:15px" v-if="detailData">
           <div class="ftext" slot="message">
             总款数:<strong>{{ (detailData&&(detailData.totalCategory || detailData.totalCategory == 0)) ? detailData.totalCategory : '--' }}</strong>;
             总数量:<strong>{{ (detailData&&(detailData.totalQty || detailData.totalQty == 0)) ? detailData.totalQty : '--' }}</strong>。
@@ -181,9 +181,9 @@ export default {
 <style lang="less">
   .urgentItemsOffsetDetail-page-wrapper{
     .urgentItemsOffsetDetail-info-wrapper{
-      margin: 15px 0;
+      margin: 10px 0;
       .item-cont {
-        margin-bottom: 15px;
+        margin-bottom: 10px;
         display: flex;
         .item-label {
           width: 115px;

Some files were not shown because too many files changed in this diff