Browse Source

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

chenrui 3 years ago
parent
commit
f88cc7a88d
100 changed files with 966 additions and 749 deletions
  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. 6 6
      src/components/Table/index.js
  5. 129 0
      src/components/custom.less
  6. 4 3
      src/components/global.less
  7. 4 3
      src/layouts/BasicLayout.vue
  8. 1 1
      src/views/Home.vue
  9. 1 2
      src/views/allocationManagement/transferOut/detail.vue
  10. 39 33
      src/views/allocationManagement/transferOut/edit.vue
  11. 8 7
      src/views/allocationManagement/transferOut/list.vue
  12. 1 1
      src/views/basicData/transferTypeManagement/list.vue
  13. 1 1
      src/views/basicData/warehouse/list.vue
  14. 2 2
      src/views/basicData/warehouse/storingLocation/list.vue
  15. 0 1
      src/views/bnSetting/menu/adminMenus.vue
  16. 0 1
      src/views/bnSetting/menu/storeMenus.vue
  17. 3 3
      src/views/common/chooseCustomerModal.vue
  18. 23 18
      src/views/common/chooseProductsModal.vue
  19. 24 18
      src/views/common/chooseSupplierModal.vue
  20. 5 0
      src/views/common/custList.vue
  21. 5 0
      src/views/common/rangeDate.vue
  22. 5 0
      src/views/common/rangeDateTime.vue
  23. 51 0
      src/views/common/tablePagination.vue
  24. 1 1
      src/views/dealerManagement/dealerAccountManagement/list.vue
  25. 25 20
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  26. 1 1
      src/views/dealerManagement/marketingDivisionSet/list.vue
  27. 6 5
      src/views/dealerManagement/merchantInfoManagement/detailModal.vue
  28. 7 7
      src/views/dealerManagement/merchantInfoManagement/list.vue
  29. 24 20
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  30. 4 4
      src/views/dealerManagement/rebateSettings/list.vue
  31. 23 26
      src/views/financialManagement/financialCollection/list.vue
  32. 1 1
      src/views/financialManagement/inventoryReview/detail.vue
  33. 1 1
      src/views/financialManagement/inventoryReview/list.vue
  34. 11 14
      src/views/financialManagement/returnConfirmation/list.vue
  35. 16 21
      src/views/financialManagement/warehousingConfirmation/list.vue
  36. 1 1
      src/views/inventoryManagement/intelligentReplenishment/detailModal.vue
  37. 1 1
      src/views/inventoryManagement/intelligentReplenishment/list.vue
  38. 2 2
      src/views/inventoryManagement/inventoryChecking/detail.vue
  39. 2 2
      src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue
  40. 1 1
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  41. 2 2
      src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue
  42. 4 4
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  43. 1 1
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  44. 3 3
      src/views/inventoryManagement/inventoryQuery/list.vue
  45. 1 1
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  46. 28 20
      src/views/inventoryManagement/inventoryWarning/list.vue
  47. 0 1
      src/views/power/menu/menu.vue
  48. 8 8
      src/views/productManagement/priceChangeRecord/list.vue
  49. 2 2
      src/views/productManagement/productBrand/list.vue
  50. 1 1
      src/views/productManagement/productCategory/list.vue
  51. 6 6
      src/views/productManagement/productInfo/list.vue
  52. 5 13
      src/views/productManagement/productLaunchAudit/list.vue
  53. 9 9
      src/views/productManagement/productLevel/list.vue
  54. 7 10
      src/views/productManagement/productOfflineAudit/list.vue
  55. 7 7
      src/views/productManagement/productPricing/list.vue
  56. 6 6
      src/views/productManagement/productUniversal/list.vue
  57. 5 5
      src/views/productManagement/purchaseBaseLimit/list.vue
  58. 5 12
      src/views/promotionRulesManagement/orderStatistics/list.vue
  59. 7 8
      src/views/promotionRulesManagement/productStatistics/list.vue
  60. 5 6
      src/views/promotionRulesManagement/promotionRules/list.vue
  61. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  62. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  63. 3 3
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  64. 1 1
      src/views/reportData/actualSalesReport/list.vue
  65. 5 5
      src/views/reportData/allocationDetails/list.vue
  66. 5 6
      src/views/reportData/allocationOrderTotal/list.vue
  67. 1 1
      src/views/reportData/billingReturnReport/list.vue
  68. 0 1
      src/views/reportData/districtTypeSalesDetails/list.vue
  69. 4 5
      src/views/reportData/priceDifferenceDetailReport/list.vue
  70. 1 1
      src/views/reportData/returnSlipReport/list.vue
  71. 1 1
      src/views/reportData/salesAmountReport/list.vue
  72. 4 4
      src/views/reportData/salesDetails/list.vue
  73. 4 5
      src/views/reportData/salesReturnDetailReport/list.vue
  74. 1 1
      src/views/reportData/salesReturnReport/list.vue
  75. 6 7
      src/views/reportData/salesReturnsReport/list.vue
  76. 1 1
      src/views/reportData/salesSlipReport/list.vue
  77. 1 1
      src/views/salesManagement/backorder/detailModal.vue
  78. 1 1
      src/views/salesManagement/backorder/list.vue
  79. 12 11
      src/views/salesManagement/examineVerify/list.vue
  80. 11 11
      src/views/salesManagement/outboundOrder/list.vue
  81. 4 5
      src/views/salesManagement/pushOrderManagement/list.vue
  82. 8 8
      src/views/salesManagement/salesQuery/chooseActive.vue
  83. 40 39
      src/views/salesManagement/salesQuery/edit.vue
  84. 18 12
      src/views/salesManagement/salesQuery/list.vue
  85. 15 15
      src/views/salesManagement/salesQuery/queryPart.vue
  86. 22 19
      src/views/salesManagement/salesQuery/queryPromotable.vue
  87. 6 5
      src/views/salesManagement/salesReturn/detail.vue
  88. 8 7
      src/views/salesManagement/salesReturn/list.vue
  89. 19 19
      src/views/salesManagement/salesReturn/queryPart.vue
  90. 29 28
      src/views/salesManagement/salesReturn/salesReturnCheck.vue
  91. 26 25
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  92. 31 30
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  93. 6 6
      src/views/salesManagement/shortageStatisticsC/list.vue
  94. 6 6
      src/views/salesManagement/shortageStatisticsP/list.vue
  95. 40 43
      src/views/salesManagement/waitDispatch/edit.vue
  96. 19 19
      src/views/salesManagement/waitDispatch/queryPart.vue
  97. 20 15
      src/views/setting/notice/list.vue
  98. 4 4
      src/views/setting/noticeManagement/list.vue
  99. 5 5
      src/views/supplierManagement/associatedProduct/add.vue
  100. 15 15
      src/views/supplierManagement/associatedProductDetails/list.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'}

+ 6 - 6
src/components/Table/index.js

@@ -5,13 +5,11 @@ export default {
   data () {
     return {
       needTotalList: [],
-
       selectedRows: [],
       selectedRowKeys: [],
-
       localLoading: false,
       localDataSource: [],
-      localPagination: Object.assign({'show-total':total => `共 ${total} 条`}, this.pagination)
+      localPagination: Object.assign({}, this.pagination)
     }
   },
   props: Object.assign({}, T.props, {
@@ -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)
@@ -140,13 +139,14 @@ export default {
      * @param Boolean bool
      */
     refresh (bool = false) {
+      console.log(this.showSizeChanger, '-----showSizeChanger', this.pageSize)
       bool && (this.localPagination = Object.assign({}, {
-        current: 1, pageSize: this.pageSize
+        current: 1, pageSize: this.pageSize, showSizeChanger: this.showSizeChanger
       }))
       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;
+  }
+}

+ 4 - 3
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 {
@@ -480,7 +480,8 @@ body {
   padding: 4px 0;
 
   .ant-dropdown-menu-item {
-    width: 160px;
+    // width: 160px;
+    width: 100%;
   }
 
   .ant-dropdown-menu-item > .anticon:first-child,

+ 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"

+ 1 - 2
src/views/allocationManagement/transferOut/detail.vue

@@ -34,7 +34,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" style="margin-bottom:15px">
+        <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
             总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
             总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong> ,
@@ -61,7 +61,6 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { getOperationalPrecision } from '@/libs/tools.js'
 import { allocateBillDetailList, allocateBillDetail, allocateBillDetailCount, allocateBillDetailPrint } from '@/api/allocateBill'
 export default {
   components: { STable, VSelect },

+ 39 - 33
src/views/allocationManagement/transferOut/edit.vue

@@ -36,7 +36,7 @@
                       <a-input id="allocateBillEdit-productOrigCode" v-model="queryParam.productOrigCode" 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.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-col>
@@ -52,7 +52,7 @@
               :columns="columns"
               :customRow="handleClickRow"
               :data="loadData"
-              :scroll="{ x: 1240, y: 300 }"
+              :scroll="{ x: 1120, y: 300 }"
               bordered>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
@@ -67,7 +67,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
                 总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong> ,
@@ -90,7 +90,7 @@
                           <a-input id="allocateBillEdit-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>
@@ -111,13 +111,14 @@
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :dataSource="chooseLoadData"
-              :scroll="{ x: 1335, y: 300 }"
+              :scroll="{ x: 955, y: 300 }"
               :loading="loading"
-              :pagination="choosePaginationProps"
+              :pagination="false"
               bordered>
               <!-- 调出数量 -->
               <template slot="qty" slot-scope="text, record">
                 <a-input-number
+                  size="small"
                   id="allocateBillEdit-qty"
                   v-model="record.qty"
                   :precision="0"
@@ -132,6 +133,14 @@
                 <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="allocateBillEdit-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>
@@ -154,10 +163,11 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { queryStockProductPage } from '@/api/stock'
 import { allocateBillDetailList, allocateBillDetailCount, allocateBillDetailSave, allocateBillSubmit, allocateBillDetailDel, allocateBillDetailDelAll, allocateBillDetailPrint } from '@/api/allocateBill'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   data () {
     return {
       spinning: false,
@@ -184,11 +194,11 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'lastStockCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价', dataIndex: 'productPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存数量', dataIndex: 'currentStockQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '成本价', dataIndex: 'lastStockCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价', dataIndex: 'productPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存数量', dataIndex: 'currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -206,25 +216,21 @@ export default {
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'cost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存数量', dataIndex: 'currentStockQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: 140, align: 'center' },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价', dataIndex: 'cost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存数量', dataIndex: 'currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, 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
       },
       productTotal: null //  合计
     }
@@ -251,10 +257,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)
     },
     //  添加/编辑
@@ -356,23 +361,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 = this.choosePaginationProps.current || pageNo
       this.chooseDisabled = true
       this.loading = true
       const params = {
-        pageNo: this.choosePageNo,
-        pageSize: this.choosePageSize,
+        pageNo: this.choosePaginationProps.current,
+        pageSize: this.choosePaginationProps.pageSize,
         allocateSn: this.$route.params.sn
       }
       allocateBillDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
@@ -393,6 +398,7 @@ export default {
         } else {
           this.choosePaginationProps.total = 0
           this.choosePaginationProps.current = 1
+          this.choosePaginationProps.pageSize = 20
           this.chooseLoadData = []
         }
       })

+ 8 - 7
src/views/allocationManagement/transferOut/list.vue

@@ -52,7 +52,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="allocateBillList-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>
@@ -108,7 +108,7 @@
     <!-- 新增 -->
     <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
     <!-- 审核 -->
-    <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>
 
@@ -126,7 +126,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       time: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
         moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
@@ -172,13 +172,14 @@ export default {
       },
       visibleAudit: false,
       auditInfo: null,
+      spinningAudit: false,
       allocateTypeList: [], //  调拨类型
       openModal: false //  新增编辑  弹框
     }
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 425 : 370)
+      return window.innerHeight - (this.advanced ? 330 : 290)
     }
   },
   methods: {
@@ -231,16 +232,16 @@ export default {
     // 审核
     auditOrder (state) {
       const _this = this
-      _this.spinning = true
+      _this.spinningAudit = true
       allocateBillAudit({ sn: this.auditInfo.allocateSn, state: state }).then(res => {
         if (res.status == 200) {
           _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
         }
       })
     },

+ 1 - 1
src/views/basicData/transferTypeManagement/list.vue

@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - 310
+      return window.innerHeight - 240
     }
   },
   methods: {

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

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

+ 2 - 2
src/views/basicData/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 id="storingLocationList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
@@ -89,7 +89,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

+ 0 - 1
src/views/bnSetting/menu/adminMenus.vue

@@ -23,7 +23,6 @@
             :autoExpandParent="autoExpandParent"
             @select="onSelect"
             :selectedKeys="selectedKeys"
-            showIcon
           >
             <template slot="title" slot-scope="{title}">
               <span v-if="title.indexOf(searchValue) > -1">

+ 0 - 1
src/views/bnSetting/menu/storeMenus.vue

@@ -23,7 +23,6 @@
             :autoExpandParent="autoExpandParent"
             @select="onSelect"
             :selectedKeys="selectedKeys"
-            showIcon
           >
             <template slot="title" slot-scope="{title}">
               <span v-if="title.indexOf(searchValue) > -1">

+ 3 - 3
src/views/common/chooseCustomerModal.vue

@@ -45,9 +45,9 @@
                 </a-form-item>
               </a-row>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="promotionRulesList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="promotionRulesList-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="promotionRulesList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="promotionRulesList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>

+ 23 - 18
src/views/common/chooseProductsModal.vue

@@ -54,9 +54,9 @@
                     allowClear />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-button style="margin-bottom: 18px;" type="primary" @click="handleSearch" :disabled="disabled" id="chooseProducts-refresh">查询</a-button>
-                <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseProducts-reset">重置</a-button>
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chooseProducts-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chooseProducts-reset">重置</a-button>
               </a-col>
             </a-row>
           </a-form-model></a-form>
@@ -79,11 +79,19 @@
           }"
           :data-source="loadData"
           :columns="columns"
-          :pagination="paginationProps"
+          :pagination="false"
           :loading="loading"
           :scroll="{ y: 450 }"
           bordered>
         </a-table>
+        <!-- 分页 -->
+        <tablePagination
+          ref="tablePagination"
+          :total="paginationProps.total"
+          :current="paginationProps.current"
+          :pageSize="paginationProps.pageSize"
+          @changePageSize="changePageSize"
+          @changePage="changePage" />
       </div>
       <!-- 按钮 -->
       <div class="btn-con">
@@ -107,13 +115,14 @@
 
 <script>
 import { STable } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery, productTypeQueryAll } from '@/api/productType'
 import { dealerScopeValidProduct } from '@/api/dealerScope'
 import { productPricedList, productPricingList } from '@/api/product'
 export default {
   name: 'ChooseProductsModal',
-  components: { STable },
+  components: { STable, tablePagination },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -161,14 +170,10 @@ export default {
         { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } }
       ],
       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
       },
       productBrandList: [], //  品牌下拉数据
       productTypeList: [], //  分类下拉数据
@@ -234,10 +239,9 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.productType = []
-      this.pageNo = 1
-      this.pageSize = 10
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
     },
     //  重置
     resetSearchForm () {
@@ -301,11 +305,11 @@ export default {
     },
     // 产品列表
     getProductList (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
       }
       this.loading = true
       let url = productPricedList //  获取定过价的产品
@@ -330,19 +334,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.getProductList()
     },
     //  已选产品 分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.getProductList()
     },
     //  产品分类  change

+ 24 - 18
src/views/common/chooseSupplierModal.vue

@@ -31,9 +31,9 @@
                   <v-select code="ENABLE_FLAG" id="chooseSupplier-enabledFlag" v-model="queryParam.enabledFlag" allowClear placeholder="请选择状态"></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-button style="margin-bottom: 18px;" type="primary" @click="handleSearch" :disabled="disabled" id="chooseSupplier-refresh">查询</a-button>
-                <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseSupplier-reset">重置</a-button>
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chooseSupplier-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chooseSupplier-reset">重置</a-button>
               </a-col>
             </a-row>
           </a-form-model></a-form>
@@ -53,11 +53,19 @@
           }"
           :data-source="loadData"
           :columns="columns"
-          :pagination="paginationProps"
+          :pagination="false"
           :loading="loading"
           :scroll="{ y: 450 }"
           bordered>
         </a-table>
+        <!-- 分页 -->
+        <tablePagination
+          ref="tablePagination"
+          :total="paginationProps.total"
+          :current="paginationProps.current"
+          :pageSize="paginationProps.pageSize"
+          @changePageSize="changePageSize"
+          @changePage="changePage" />
       </div>
       <!-- 按钮 -->
       <div class="btn-con">
@@ -81,10 +89,11 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { supplierList } from '@/api/supplier'
 export default {
   name: 'ChooseSupplierModal',
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -121,14 +130,10 @@ export default {
         { title: '状态', dataIndex: 'enableFlagDictValue', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       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: []
@@ -150,10 +155,10 @@ export default {
     resetData () {
       this.queryParam.supplierName = ''
       this.queryParam.enabledFlag = undefined
-      this.pageNo = 1
-      this.pageSize = 10
+      this.paginationProps.total = 0
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
     },
     //  重置
     resetSearchForm () {
@@ -202,11 +207,11 @@ export default {
     },
     // 供应商列表
     getSupplierList (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
       }
       this.loading = true
       supplierList(Object.assign(params, this.queryParam)).then(res => {
@@ -224,19 +229,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.getSupplierList()
     },
     //  已选产品 分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.getSupplierList()
     }
   },

+ 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%"
@@ -22,6 +23,10 @@ import debounce from 'lodash/debounce'
 import { dealerQueryList, dealerFindUpdateInfoBySn } from '@/api/dealer'
 export default {
   props: {
+    size: {
+      type: String,
+      default: 'default'
+    }
   },
   data () {
     this.lastFetchId = 0

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

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

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

@@ -2,6 +2,7 @@
   <a-range-picker
     style="width:100%"
     :value="date"
+    :size="size"
     show-time
     :disabledDate="disabledDate"
     :format="dateFormat"
@@ -18,6 +19,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/dealerManagement/dealerAccountManagement/list.vue

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

+ 25 - 20
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -10,9 +10,9 @@
                 <a-input id="relationshipBindingList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button style="margin-bottom: 18px;" type="primary" @click="getList()" :disabled="disabled" id="relationshipBindingList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm()" :disabled="disabled" id="relationshipBindingList-reset">重置</a-button>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="getList(1)" :disabled="disabled" id="relationshipBindingList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="relationshipBindingList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -28,7 +28,7 @@
         size="small"
         :rowKey="(record) => record.dealerSn"
         :columns="columns"
-        :pagination="paginationProps"
+        :pagination="false"
         :data-source="list"
         @expand="expand"
         :expandedRowKeys="expandedRowKeys"
@@ -67,6 +67,14 @@
           <span v-else>--</span>
         </template>
       </a-table>
+      <!-- 分页 -->
+      <tablePagination
+        ref="tablePagination"
+        :total="paginationProps.total"
+        :current="paginationProps.current"
+        :pageSize="paginationProps.pageSize"
+        @changePageSize="changePageSize"
+        @changePage="changePage" />
     </a-spin>
     <!-- 关联下级 -->
     <associate-modal :openModal="openModal" :nowData="nowData" :tabInd="tabInd" @ok="addItemOk" @close="openModal=false" />
@@ -75,10 +83,11 @@
 I
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import associateModal from './associateModal.vue'
 import { dealerRelationList, querySubList, unbindRelation } from '@/api/dealerRelation'
 export default {
-  components: { STable, VSelect, associateModal },
+  components: { STable, VSelect, associateModal, tablePagination },
   data () {
     return {
       tableHeight: 0,
@@ -98,14 +107,10 @@ export default {
       ],
       expandedRowKeys: [],
       list: [],
-      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
       },
       innerColumns: [
         { title: '经销商名称', dataIndex: 'dealerName', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -119,7 +124,7 @@ export default {
     }
   },
   mounted () {
-    this.tableHeight = window.innerHeight - 370
+    this.tableHeight = window.innerHeight - 290
     this.getList()
   },
   methods: {
@@ -151,11 +156,11 @@ export default {
     // 获取列表数据
     getList (pageNo) {
       this.disabled = true
-      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
       }
       this.loading = true
       dealerRelationList(Object.assign(params, this.queryParam, { dealerLevelList: this.tabInd == 1 ? ['PROVINCE'] : ['PROVINCE', 'CITY'] })).then(res => {
@@ -173,6 +178,7 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.list = []
         }
       })
@@ -182,22 +188,21 @@ export default {
       if (!flag) {
         this.queryParam.dealerName = ''
         this.expandedRowKeys = []
-        this.pageNo = 1
-        this.pageSize = 10
         this.paginationProps.total = 0
         this.paginationProps.current = 1
+        this.paginationProps.pageSize = 20
       }
       this.getList()
     },
     //  分页  一页多少条change
     changePageSize (current, pageSize) {
-      this.pageNo = current
-      this.pageSize = pageSize
+      this.paginationProps.current = current
+      this.paginationProps.pageSize = pageSize
       this.getList()
     },
     //  分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.getList()
     },
     tabChange (key) {
@@ -205,9 +210,9 @@ export default {
       //  不能共用resetSearchForm方法,因切换tab时,每页多少条数据更改后,不能同步tab两边页码
       this.queryParam.dealerName = ''
       this.expandedRowKeys = []
-      this.pageNo = 1
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.getList()
     },
     // 关联下级

+ 1 - 1
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -88,7 +88,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - 260
+      return window.innerHeight - 200
     }
   },
   methods: {

+ 6 - 5
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -95,7 +95,7 @@
       </div>
     </a-spin>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('PASS')" @fail="auditOrder('REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('PASS')" @fail="auditOrder('REJECT')" />
   </a-modal>
 </template>
 
@@ -122,13 +122,14 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       form: null,
       title: '',
-      visibleAudit: false
+      visibleAudit: false,
+      spinningAudit: false
     }
   },
   methods: {
     // 审核
     auditOrder (auditState) {
-      this.spinning = true
+      this.spinningAudit = true
       dealerAudit({
         dealerAuditSn: this.form.dealerAuditSn,
         auditState: auditState
@@ -137,10 +138,10 @@ export default {
           this.visibleAudit = false
           this.$message.success(res.message)
           this.$emit('ok')
-          this.spinning = false
+          this.spinningAudit = false
         } else {
           this.visibleAudit = false
-          this.spinning = false
+          this.spinningAudit = false
         }
       })
     },

+ 7 - 7
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -32,9 +32,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="merchantInfoManagementList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 5px" @click="resetSearchForm" :disabled="disabled" id="merchantInfoManagementList-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="merchantInfoManagementList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="merchantInfoManagementList-reset">重置</a-button>
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -44,7 +44,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="merchantInfoManagementList-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>
@@ -57,7 +57,7 @@
         <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- 总计 -->
-      <!-- <a-alert type="info" showIcon style="margin-bottom:15px">
+      <!-- <a-alert type="info" style="margin-bottom:15px">
         <div slot="message">合计:<strong>{{ total }}</strong>条</div>
       </a-alert> -->
       <!-- 列表 -->
@@ -115,7 +115,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
@@ -167,7 +167,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 430 : 375)
+      return window.innerHeight - (this.advanced ? 330 : 290)
     }
   },
   methods: {

+ 24 - 20
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -33,9 +33,9 @@
                   <a-input id="permissionSetting-goodsCode" v-model.trim="queryParam.goodsCode" allowClear placeholder="请输入产品编码"/>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-button style="margin-bottom: 18px;" type="primary" @click="handleSearch" :disabled="disabled" id="permissionSetting-refresh">查询</a-button>
-                <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="permissionSetting-reset">重置</a-button>
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                <a-button type="primary" @click="handleSearch" :disabled="disabled" id="permissionSetting-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="permissionSetting-reset">重置</a-button>
               </a-col>
             </a-row>
           </a-form-model>
@@ -54,7 +54,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data-source="loadData"
-          :pagination="paginationProps"
+          :pagination="false"
           :loading="loading"
           :scroll="{ x: 1200, y: tableHeight }"
           bordered>
@@ -63,6 +63,14 @@
             <a-button size="small" type="link" class="button-error" @click="handleDel(record)">删除</a-button>
           </template>
         </a-table>
+        <!-- 分页 -->
+        <tablePagination
+          ref="tablePagination"
+          :total="paginationProps.total"
+          :current="paginationProps.current"
+          :pageSize="paginationProps.pageSize"
+          @changePageSize="changePageSize"
+          @changePage="changePage" />
       </a-card>
     </a-spin>
     <!-- 选择产品品牌 -->
@@ -82,16 +90,16 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import ChooseProductsModal from '@/views/common/chooseProductsModal.vue'
 import ChooseBrandModal from '@/views/common/chooseBrandModal.vue'
 import ChooseTypeModal from '@/views/common/chooseTypeModal.vue'
 import { dealerScopeList, dealerScopeSave, dealerScopeDel, dealerScopeQueryList } from '@/api/dealerScope'
 export default {
-  components: { STable, VSelect, ChooseProductsModal, ChooseBrandModal, ChooseTypeModal },
+  components: { STable, VSelect, ChooseProductsModal, ChooseBrandModal, ChooseTypeModal, tablePagination },
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         goodsType: undefined,
@@ -113,14 +121,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
       },
       openBrandModal: false, //  选择产品品牌
       openTypeModal: false, //  选择产品分类
@@ -144,14 +148,14 @@ export default {
     },
     // 经销权 列表
     getProductList (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
+        this.tableHeight = window.innerHeight - 320
       }
       const params = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize
+        pageNo: this.paginationProps.current,
+        pageSize: this.paginationProps.pageSize
       }
       this.loading = true
       dealerScopeList(Object.assign(params, this.queryParam, { dealerSn: this.$route.params.sn })).then(res => {
@@ -171,19 +175,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.getProductList()
     },
     //  分页 页码change
     changePage (current) {
-      this.pageNo = current
+      this.paginationProps.current = current
       this.getProductList()
     },
     // 选择产品
@@ -306,10 +311,9 @@ export default {
       this.queryParam.goodsType = undefined
       this.queryParam.goodsName = ''
       this.queryParam.goodsCode = ''
-      this.pageNo = 1
-      this.pageSize = 10
       this.paginationProps.total = 0
       this.paginationProps.current = 1
+      this.paginationProps.pageSize = 20
       this.getProductList(1)
     },
     // 返回

+ 4 - 4
src/views/dealerManagement/rebateSettings/list.vue

@@ -9,9 +9,9 @@
               <a-input id="rebateSettingsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="rebateSettingsList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="rebateSettingsList-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="rebateSettingsList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="rebateSettingsList-reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -91,7 +91,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 320
+          this.tableHeight = window.innerHeight - 240
         }
         return queryRebatePage(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 23 - 26
src/views/financialManagement/financialCollection/list.vue

@@ -98,10 +98,10 @@
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="financialCollectionList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="financialCollectionList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="financialCollectionList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -110,7 +110,7 @@
         </a-form>
       </div>
       <!-- 总计 -->
-      <!-- <a-alert type="info" showIcon style="margin-bottom:15px">
+      <!-- <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">合计:<strong>{{ total }}</strong>条</div>
       </a-alert> -->
       <!-- 列表 -->
@@ -121,7 +121,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1820, y: tableHeight }"
+        :scroll="{ x: 1440, y: tableHeight }"
         bordered>
         <!-- 单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
@@ -178,19 +178,19 @@ export default {
       ], //  审核时间
       advanced: false,
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '审核时间', dataIndex: 'auditDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 220, align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '审核时间', dataIndex: 'auditDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 180, align: 'center' },
         { title: '经销商名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: 140, align: 'center', customRender: function (text) { return 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: 'settleDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售数量', dataIndex: 'totalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '订单金额', dataIndex: 'totalAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款时间', dataIndex: 'settleDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'remarks', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -214,7 +214,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 440 : 330)
+      return window.innerHeight - (this.advanced ? 340 : 255)
     }
   },
   methods: {
@@ -333,15 +333,12 @@ export default {
 
 <style lang="less">
   .financialCollectionList-wrap{
-    .sTable{
-      margin-top: 10px;
+    .active{
+      color: #ed1c24;
+      cursor: pointer;
+    }
+    .common{
+      color: rgba(0, 0, 0, 0.65);
     }
-	.active{
-		color: #ed1c24;
-		cursor: pointer;
-	}
-	.common{
-		color: rgba(0, 0, 0, 0.65);
-	}
   }
 </style>

+ 1 - 1
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:15px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message"><strong class="red">红色代表盘盈</strong>,<strong class="green">绿色代表盈亏</strong></div>
     </a-alert>
     <!-- 盈亏统计 -->

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

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

+ 11 - 14
src/views/financialManagement/returnConfirmation/list.vue

@@ -44,10 +44,10 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="returnConfirmationList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="returnConfirmationList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnConfirmationList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -107,7 +107,7 @@ export default {
         billStatus: undefined //  状态
       },
       disabled: false, //  查询、重置按钮是否可操作
-      advanced: false,
+      advanced: true,
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
@@ -140,7 +140,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 375 : 320)
+      return window.innerHeight - (this.advanced ? 280 : 240)
     }
   },
   methods: {
@@ -214,15 +214,12 @@ export default {
 
 <style lang="less">
   .returnConfirmationList-wrap{
-    .sTable{
-      margin-top: 10px;
+    .active{
+      color: #ed1c24;
+      cursor: pointer;
+    }
+    .common{
+      color: rgba(0, 0, 0, 0.65);
     }
-	.active{
-		color: #ed1c24;
-		cursor: pointer;
-	}
-	.common{
-		color: rgba(0, 0, 0, 0.65);
-	}
   }
 </style>

+ 16 - 21
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -21,17 +21,17 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehousingConfirmationList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="warehousingConfirmationList-reset">重置</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="warehousingConfirmationList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
       </div>
       <!-- 列表 -->
-      <div v-if="$hasPermissions('B_warehousingConfirmationpl')" style="margin-bottom: 15px">
-        <a-button type="primary" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
-        <span style="margin-left: 8px">
+      <div v-if="$hasPermissions('B_warehousingConfirmationpl')" style="margin-bottom: 10px">
+        <a-button type="primary" class="button-error" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
+        <span style="margin-left: 5px">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
@@ -121,7 +121,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 370
+          this.tableHeight = window.innerHeight - 280
         }
         return stockPutList(Object.assign(parameter, this.queryParam, { confirm: true })).then(res => {
           const data = res.data
@@ -144,16 +144,16 @@ export default {
     rowSelection () {
       if (this.$hasPermissions('B_warehousingConfirmationpl')) {
         return {
-			  selectedRowKeys: this.selectedRowKeys,
-			  onChange: (selectedRowKeys, selectedRows) => {
-			    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
-			    this.onSelectChange(selectedRowKeys)
-			  },
-			  getCheckboxProps: record => ({
-			    props: {
-			      disabled: record.auditState != 'WAIT'
-			    }
-			  })
+          selectedRowKeys: this.selectedRowKeys,
+          onChange: (selectedRowKeys, selectedRows) => {
+            console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+            this.onSelectChange(selectedRowKeys)
+          },
+          getCheckboxProps: record => ({
+            props: {
+              disabled: record.auditState != 'WAIT'
+            }
+          })
         }
       } else {
         return null
@@ -246,11 +246,6 @@ export default {
 </script>
 
 <style lang="less">
-  .warehousingConfirmationList-wrap{
-    .sTable{
-      margin-top: 20px;
-    }
-  }
 	.active{
 		color: #ed1c24;
 		cursor: pointer;

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

@@ -10,7 +10,7 @@
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
       <div>
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">此预测单的各项参数信息如下</div>
         </a-alert>
         <div class="module-cont" v-if="detailData">

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

@@ -6,7 +6,7 @@
         <a-button v-if="$hasPermissions('B_intelligentReplenishment_add')" id="intelligentReplenishmentList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
         <a-button v-if="$hasPermissions('B_intelligentReplenishment_set')" id="intelligentReplenishmentList-set" type="primary" class="button-warning" @click="handleSet">基础信息设置</a-button>
       </div>
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">为保证系统性能,仅保留最近10次的预测结果</div>
       </a-alert>
       <!-- 列表 -->

+ 2 - 2
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:15px">
+      <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>

+ 2 - 2
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:15px">
+          <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>

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

@@ -35,7 +35,7 @@
                 <a-cascader :options="typeData" 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>

+ 2 - 2
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:15px">
+          <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>

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

@@ -86,9 +86,9 @@
                     </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="selfDisk-refresh">查询</a-button>
-                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="selfDisk-reset">重置</a-button>
-                    <a @click="advanced=!advanced" style="margin-left: 8px">
+                    <a-button style="margin-bottom: 10px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="selfDisk-refresh">查询</a-button>
+                    <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="selfDisk-reset">重置</a-button>
+                    <a @click="advanced=!advanced" style="margin-left: 5px">
                       {{ advanced ? '收起' : '展开' }}
                       <a-icon :type="advanced ? 'up' : 'down'"/>
                     </a>
@@ -126,7 +126,7 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>6</strong> ,采购数量合计 <strong>6</strong> ,采购金额合计¥<strong>6.33</strong></div>
             </a-alert>
             <!-- 列表 -->

+ 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:15px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">现有库存总数量(个):<strong>{{ stockQty }}</strong>;现有库存总成本(¥):<strong>{{ stockCost }}</strong>。</div>
     </a-alert>
     <!-- 库存详情 -->

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

@@ -78,7 +78,7 @@
         </a-form>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">现有库存总数量(个):<strong>{{ stockQty }}</strong>;现有库存总成本(¥):<strong>{{ stockCost }}</strong>。</div>
       </a-alert>
       <!-- 列表 -->
@@ -136,7 +136,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         productCode: '', //  产品编码
         productName: '', //  产品名称
@@ -206,7 +206,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 425 : 370)
+      return window.innerHeight - (this.advanced ? 315 : 275)
     },
     stockQty () { //  库存总数量 合计
       const currentStockQty = this.currentStock && this.currentStock.currentStockQty ? Number(this.currentStock.currentStockQty) : 0

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

@@ -64,7 +64,7 @@
         </a-form>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <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>。

+ 28 - 20
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -64,7 +64,7 @@
             </template>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="pageInit(1)" :disabled="disabled" id="inventoryWarningList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryWarningList-reset">重置</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryWarningList-reset">重置</a-button>
               <!-- <a-button
                 style="margin-left: 8px"
                 type="danger"
@@ -72,7 +72,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="inventoryWarningList-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>
@@ -82,7 +82,7 @@
       </div>
       <!-- 操作按钮 -->
       <div v-if="$hasPermissions('B_inventoryWarning_refresh')" class="table-operator">
-        <a-button type="primary" id="inventoryWarningList-update" :loading="loading" @click="handleupdate">批量更新</a-button>
+        <a-button class="button-error" type="primary" id="inventoryWarningList-update" :loading="loading" @click="handleupdate">批量更新</a-button>
         <span style="margin-left: 8px">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
@@ -97,7 +97,7 @@
         :columns="columns"
         :dataSource="loadData"
         :scroll="{ x: 2220, y: tableHeight }"
-        :pagination="paginationProps"
+        :pagination="false"
         :loading="tableLoading"
         bordered>
         <!-- 产品分类 -->
@@ -119,6 +119,7 @@
         <template slot="inTransit" slot-scope="text, record" >
           <div>
             <a-input-number
+              size="small"
               id="inventoryWarningList-inTransit"
               v-model="record.inTransit"
               :precision="0"
@@ -131,6 +132,7 @@
         <template slot="upperLimit" slot-scope="text, record" >
           <div>
             <a-input-number
+              size="small"
               id="inventoryWarningList-upperLimit"
               v-model="record.upperLimit"
               :precision="0"
@@ -143,6 +145,7 @@
         <template slot="lowerLimit" slot-scope="text, record" >
           <div>
             <a-input-number
+              size="small"
               id="inventoryWarningList-lowerLimit"
               v-model="record.lowerLimit"
               :precision="0"
@@ -163,6 +166,14 @@
           <span v-else>--</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>
@@ -170,15 +181,16 @@
 <script>
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
+import tablePagination from '@/views/common/tablePagination.vue'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
 import { stockWarnList, stockWarnSaveBatch } from '@/api/stock'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, tablePagination },
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         productCode: '',
         productName: '',
@@ -212,14 +224,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: [],
@@ -228,7 +236,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 425 : 370)
+      return window.innerHeight - (this.advanced ? 330 : 290)
     },
     hasSelected () {
       return this.selectedRowKeys.length > 0
@@ -237,27 +245,27 @@ 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) {
       this.disabled = 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)
       this.tableLoading = true
       stockWarnList(params).then(res => {
         this.tableLoading = 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
@@ -267,6 +275,7 @@ export default {
         } else {
           this.paginationProps.total = 0
           this.paginationProps.current = 1
+          this.paginationProps.pageSize = 20
           this.loadData = []
         }
       })
@@ -370,10 +379,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)
     },
     //  批量更新

+ 0 - 1
src/views/power/menu/menu.vue

@@ -23,7 +23,6 @@
             :autoExpandParent="autoExpandParent"
             @select="onSelect"
             :selectedKeys="selectedKeys"
-            showIcon
           >
             <template slot="title" slot-scope="{title}">
               <span v-if="title.indexOf(searchValue) > -1">

+ 8 - 8
src/views/productManagement/priceChangeRecord/list.vue

@@ -50,18 +50,18 @@
                 </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"
+                style="margin-left: 5px"
                 type="primary"
                 v-if="$hasPermissions('B_priceChangeRecord_export')"
                 class="button-warning"
                 @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>
@@ -70,7 +70,7 @@
         </a-form>
       </div>
       <!-- 总计 -->
-      <!-- <a-alert type="info" showIcon style="margin-bottom:15px">
+      <!-- <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">合计:<strong>{{ total }}</strong>条</div>
       </a-alert> -->
       <!-- 列表 -->
@@ -131,7 +131,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: getDate.getThreeMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
@@ -230,7 +230,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 425 : 370)
+      return window.innerHeight - (this.advanced ? 320 : 280)
     }
   },
   methods: {

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

@@ -24,7 +24,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productBrandList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="productBrandList-reset">重置</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productBrandList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -124,7 +124,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 290
         }
         return productBrandList(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 - 250
+          this.tableHeight = window.innerHeight - 200
         }
         return productTypeQuery({}).then(res => {
           //  递归去除空children

+ 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 5px" @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
                 v-if="$hasPermissions('B_productInfo_export')"
                 style="margin-left: 5px"
@@ -67,7 +67,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="productInfoList-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>
@@ -202,7 +202,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         name: '', //  产品名称
         queryWord: '', // 产品编码/原厂编码
@@ -258,7 +258,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 425 : 370)
+      return window.innerHeight - (this.advanced ? 330 : 290)
     },
     hasSelected () {
       return this.selectedRowKeys.length > 0

+ 5 - 13
src/views/productManagement/productLaunchAudit/list.vue

@@ -26,17 +26,17 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productLaunchAuditList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productLaunchAuditList-reset">重置</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productLaunchAuditList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
       </div>
       <!-- 列表 -->
-      <div style="margin-bottom: 15px">
+      <div style="margin-bottom: 10px">
         <a-button type="primary" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')" id="productLaunchAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
-        <span style="margin-left: 8px" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')">
+        <span style="margin-left: 5px" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
@@ -103,7 +103,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 370
+          this.tableHeight = window.innerHeight - 280
         }
         return productOnlineList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
@@ -200,11 +200,3 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .productLaunchAuditList-wrap{
-    .sTable{
-      margin-top: 20px;
-    }
-  }
-</style>

+ 9 - 9
src/views/productManagement/productLevel/list.vue

@@ -49,10 +49,10 @@
               </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="productLevelList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productLevelList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productLevelList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productLevelList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -61,9 +61,9 @@
       </a-form>
     </div>
     <!-- 操作按钮 -->
-    <!-- <div class="table-operator">
-      <a-button style="margin: 0 0 18px 0" id="productLevelList-import" type="primary" @click="handleImport">导入</a-button>
-      <a-button style="margin: 0 0 18px 8px" id="productLevelList-export" type="danger" @click="handleExport" :loading="exportLoading">导出</a-button>
+    <!-- <div class="table-operator" style="margin-bottom: 10px;">
+      <a-button id="productLevelList-import" type="primary" @click="handleImport">导入</a-button>
+      <a-button style="margin-left: 5px" id="productLevelList-export" type="danger" @click="handleExport" :loading="exportLoading">导出</a-button>
     </div> -->
     <!-- 列表 -->
     <s-table
@@ -108,7 +108,7 @@ export default {
   components: { STable, VSelect, productLevelEditModal },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         name: '', //  产品名称
         queryWord: '', // 产品编码/原厂编码
@@ -159,7 +159,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 380 : 320)
+      return window.innerHeight - (this.advanced ? 280 : 240)
     }
   },
   methods: {

+ 7 - 10
src/views/productManagement/productOfflineAudit/list.vue

@@ -67,10 +67,10 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productOfflineAuditList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productOfflineAuditList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productOfflineAuditList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -79,9 +79,9 @@
         </a-form>
       </div>
       <!-- 列表 -->
-      <div style="margin-bottom: 15px">
+      <div style="margin-bottom: 10px">
         <a-button type="primary" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')" id="productOfflineAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
-        <span style="margin-left: 8px" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')">
+        <span style="margin-left: 5px" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
@@ -126,7 +126,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         name: '', //  产品名称
         code: '', // 产品编码
@@ -170,7 +170,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 425 : 370)
+      return window.innerHeight - (this.advanced ? 320 : 280)
     },
     hasSelected () {
       return this.selectedRowKeys.length > 0
@@ -301,9 +301,6 @@ export default {
 
 <style lang="less">
   .productOfflineAuditList-wrap{
-    .sTable{
-      margin-top: 20px;
-    }
     .red{
       color: #ed1c24;
     }

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

@@ -49,10 +49,10 @@
               </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="productPricingList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productPricingList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productPricingList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productPricingList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -61,7 +61,7 @@
       </a-form>
     </div>
     <!-- 总计 -->
-    <!-- <a-alert type="info" showIcon style="margin-bottom:15px">
+    <!-- <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">合计:<strong>{{ total }}</strong>条</div>
     </a-alert> -->
     <!-- 列表 -->
@@ -126,7 +126,7 @@ export default {
   components: { STable, VSelect, productPricingEditModal, productPricingAuditModal },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         name: '', //  产品名称
         queryWord: '', // 产品编码/原厂编码
@@ -180,7 +180,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 375 : 320)
+      return window.innerHeight - (this.advanced ? 280 : 240)
     }
   },
   methods: {

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

@@ -32,10 +32,10 @@
                 </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="productUniversalList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productUniversalList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productUniversalList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productUniversalList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -97,7 +97,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         productCode: '',
         productName: '',
@@ -138,7 +138,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 425 : 370)
+      return window.innerHeight - (this.advanced ? 330 : 290)
     }
   },
   methods: {

+ 5 - 5
src/views/productManagement/purchaseBaseLimit/list.vue

@@ -47,10 +47,10 @@
               </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="purchaseBaseLimitList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="purchaseBaseLimitList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="purchaseBaseLimitList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="purchaseBaseLimitList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -108,7 +108,7 @@ export default {
   components: { STable, VSelect, purchaseBaseLimitEditModal },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         productName: '', //  产品名称
         productCode: '', //  产品编码/原厂编码

+ 5 - 12
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -39,10 +39,10 @@
             </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="orderStatisticsList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="orderStatisticsList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="orderStatisticsList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -52,7 +52,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">
         促销品原价总额:<strong>{{ productTotal && (productTotal.totalOrigAmount || productTotal.totalOrigAmount==0) ? productTotal.totalOrigAmount : '--' }}</strong>,
         促销品促销价总额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? productTotal.totalAmount : '--' }}</strong>,
@@ -102,7 +102,7 @@ export default {
   components: { STable, VSelect, orderStatisticsDetailModal, custList, promoList, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {
@@ -220,10 +220,3 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .orderStatisticsList-wrap{
-    .sTable{
-      margin-top: 15px;
-    }
-  }
-</style>

+ 7 - 8
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -49,10 +49,10 @@
               </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="productStatisticsList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productStatisticsList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productStatisticsList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productStatisticsList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -61,7 +61,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">
         节省总金额:<strong>{{ productTotal && (productTotal.totalEconomizeAmount || productTotal.totalEconomizeAmount==0) ? productTotal.totalEconomizeAmount : '--' }}</strong>,
         总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>
@@ -95,7 +95,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -107,7 +106,7 @@ export default {
   components: { STable, VSelect, productStatisticsDetailModal, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       productType: [],
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
@@ -158,7 +157,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 430 : 375)
+      return window.innerHeight - (this.advanced ? 315 : 272)
     }
   },
   methods: {

+ 5 - 6
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -20,9 +20,9 @@
                 <v-select code="ENABLE_FLAG" id="promotionRulesList-enabledFlag" v-model="queryParam.enabledFlag" allowClear placeholder="请选择状态"></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="promotionRulesList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="promotionRulesList-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="promotionRulesList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="promotionRulesList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -32,7 +32,7 @@
         <a-button id="promotionRulesList-add" type="primary" v-if="$hasPermissions('B_promotionRules_add')" class="button-error" @click="openModal=true">新增</a-button>
       </div>
       <!-- 总计 -->
-      <!-- <a-alert type="info" showIcon style="margin-bottom:15px">
+      <!-- <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">合计: <strong>{{ total }}</strong>条</div>
       </a-alert> -->
       <!-- 列表 -->
@@ -97,7 +97,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import basicInfoModal from './basicInfoModal.vue'
@@ -129,7 +128,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 290
         }
         return promoActiveList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -29,7 +29,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
           入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong>

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -34,7 +34,7 @@
           <a-button id="bulkWarehousingOrderEdit-add" type="primary" class="button-error" @click="handleEdit()">新增产品</a-button>
         </div>
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
             入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
             入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong>

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

@@ -16,9 +16,9 @@
               </a-form-item>
             </a-col>
             <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 style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
               </span>
             </a-col>
           </a-row>
@@ -119,7 +119,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 285
         }
         return sparePartsList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

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

@@ -135,7 +135,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [

+ 5 - 5
src/views/reportData/allocationDetails/list.vue

@@ -105,16 +105,16 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="8" :sm="24" style="margin-top: 3px;">
+            <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
               <a-button
-                style="margin-bottom: 18px;"
+				style="margin-left: 0px"
                 type="primary"
                 class="button-warning"
                 size="small"
                 @click="handleStock"
                 id="allocationDetailsList-stockDate">盘点区间日期</a-button>
-              <a-button style="margin: 0 0 18px 8px" type="primary" @click="handleSearch" :disabled="disabled" id="allocationDetailsList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="allocationDetailsList-reset">重置</a-button>
+              <a-button type="primary" @click="handleSearch" :disabled="disabled" id="allocationDetailsList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocationDetailsList-reset">重置</a-button>
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -123,7 +123,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="allocationDetailsList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a @click="advanced=!advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>

+ 5 - 6
src/views/reportData/allocationOrderTotal/list.vue

@@ -43,17 +43,16 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="7" :sm="24" style="margin-top: 3px;">
+            <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
               <a-button
-                style="margin-bottom: 18px;"
                 type="primary"
                 class="button-warning"
                 size="small"
                 @click="handleStock"
                 id="allocationOrderTotalList-stockDate">盘点区间日期</a-button>
-              <a-button style="margin: 0 0 18px 8px" type="primary" @click="handleSearch" :disabled="disabled" id="allocationOrderTotalList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="allocationOrderTotalList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="allocationOrderTotalList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocationOrderTotalList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -102,7 +101,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,

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

@@ -135,7 +135,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [

+ 0 - 1
src/views/reportData/districtTypeSalesDetails/list.vue

@@ -41,7 +41,6 @@ export default {
   components: { STable, VSelect, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [

+ 4 - 5
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -73,17 +73,16 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="7" :sm="24">
+            <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
               <a-button
-                style="margin-bottom: 18px;"
                 type="primary"
                 class="button-warning"
                 size="small"
                 @click="handleStock"
                 id="priceDifferenceDetailList-stockDate">盘点区间日期</a-button>
-              <a-button style="margin: 0 0 18px 8px" type="primary" @click="handleSearch" :disabled="disabled" id="priceDifferenceDetailList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="priceDifferenceDetailList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="priceDifferenceDetailList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="priceDifferenceDetailList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>

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

@@ -140,7 +140,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [

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

@@ -135,7 +135,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [

+ 4 - 4
src/views/reportData/salesDetails/list.vue

@@ -116,10 +116,10 @@
               </a-form-model-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="salesDetailsList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="salesDetailsList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesDetailsList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailsList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>

+ 4 - 5
src/views/reportData/salesReturnDetailReport/list.vue

@@ -114,16 +114,15 @@
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="8" :sm="24">
+            <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
               <a-button
-                style="margin-bottom: 18px;"
                 type="primary"
                 class="button-warning"
                 size="small"
                 @click="handleStock"
                 id="salesReturnDetailList-stockDate">盘点区间日期</a-button>
-              <a-button style="margin: 0 0 18px 8px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnDetailList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnDetailList-reset">重置</a-button>
+              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnDetailList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnDetailList-reset">重置</a-button>
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -132,7 +131,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="salesReturnDetailList-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>

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

@@ -135,7 +135,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [

+ 6 - 7
src/views/reportData/salesReturnsReport/list.vue

@@ -43,7 +43,7 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="12" :sm="24">
+              <a-col :md="11" :sm="24">
                 <a-row>
                   <a-form-model-item label="地区">
                     <a-col span="7">
@@ -71,17 +71,16 @@
                 </a-row>
               </a-col>
             </template>
-            <a-col :md="7" :sm="24">
+            <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
               <a-button
-                style="margin-bottom: 18px;"
                 type="primary"
                 class="button-warning"
                 size="small"
                 @click="handleStock"
                 id="salesReturnsReportList-stockDate">盘点区间日期</a-button>
-              <a-button style="margin: 0 0 18px 8px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnsReportList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnsReportList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnsReportList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnsReportList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -140,7 +139,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [

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

@@ -140,7 +140,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [

+ 1 - 1
src/views/salesManagement/backorder/detailModal.vue

@@ -25,7 +25,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="backorderDetail-cont">
         <!-- alert -->
-        <a-alert type="info" showIcon style="margin-bottom:10px">
+        <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>,

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

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

+ 12 - 11
src/views/salesManagement/examineVerify/list.vue

@@ -54,10 +54,10 @@
                 </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="examineVerifyList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="examineVerifyList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="examineVerifyList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -66,7 +66,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <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>;
@@ -103,7 +103,7 @@
       </s-table>
     </a-spin>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('STOCK_UP_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('STOCK_UP_REJECT')" />
   </a-card>
 </template>
 
@@ -120,7 +120,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       time: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
         moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
@@ -176,12 +176,13 @@ export default {
         })
       },
       visibleAudit: false,
-      auditInfo: null
+      auditInfo: null,
+      spinningAudit: false
     }
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 420 : 365)
+      return window.innerHeight - (this.advanced ? 315 : 272)
     }
   },
   methods: {
@@ -213,7 +214,7 @@ export default {
       this.visibleAudit = true
     },
     auditOrder (billStatus) {
-      this.spinning = true
+      this.spinningAudit = true
       dispatchStockUpAduit({
         dispatchBillSn: this.auditInfo.dispatchBillSn,
         billStatus: billStatus
@@ -222,10 +223,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
         }
       })
     },

+ 11 - 11
src/views/salesManagement/outboundOrder/list.vue

@@ -49,10 +49,10 @@
                 </a-form-item>
               </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 style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -61,9 +61,9 @@
         </a-form>
       </div>
       <!-- 列表 -->
-      <div style="margin-bottom: 15px" v-if="$hasPermissions('B_stockOut')">
-        <a-button type="primary" id="outboundOrder-export" :loading="loading" @click="handleOutbound()">批量出库</a-button>
-        <span style="margin-left: 8px">
+      <div style="margin-bottom: 10px" v-if="$hasPermissions('B_stockOut')">
+        <a-button type="primary" class="button-error" id="outboundOrder-export" :loading="loading" @click="handleOutbound()">批量出库</a-button>
+        <span style="margin-left: 5px">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
@@ -125,7 +125,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',
@@ -167,12 +167,12 @@ export default {
       },
       openModal: false,
       orderSn: undefined,
-      outBizType: null  //  当前单子类型   SALES销售出库        ALLOCATE调拨出库
+      outBizType: null //  当前单子类型   SALES销售出库        ALLOCATE调拨出库
     }
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 420 : 365)
+      return window.innerHeight - (this.advanced ? 320 : 280)
     },
     hasSelected () {
       return this.selectedRowKeys.length > 0
@@ -242,7 +242,7 @@ export default {
       }
     },
     // 关闭弹框
-    cancleModal(){
+    cancleModal () {
       this.outBizType = null
       this.orderSn = undefined
       this.openModal = false

+ 4 - 5
src/views/salesManagement/pushOrderManagement/list.vue

@@ -51,7 +51,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <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>;
@@ -92,7 +92,7 @@ export default {
   components: { STable, VSelect, custList, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {
@@ -128,7 +128,6 @@ export default {
         this.disabled = true
         // 查询总计
         dispatchQueryCount(Object.assign(parameter, this.queryParam)).then(res => {
-          console.log(res)
           this.totalData = Object.assign(this.totalData, res.data || {})
         })
         return dispatchlList(Object.assign(parameter, this.queryParam)).then(res => {
@@ -145,7 +144,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 420 : 365)
+      return window.innerHeight - (this.advanced ? 320 : 280)
     }
   },
   methods: {
@@ -189,7 +188,7 @@ export default {
 <style lang="less">
   .pushOrder-wrap{
     .sTable{
-      margin-top: 15px;
+      margin-top: 10px;
     }
   }
 </style>

+ 8 - 8
src/views/salesManagement/salesQuery/chooseActive.vue

@@ -26,7 +26,7 @@
         :columns="columns"
         :data-source="list"
         :loading="loading"
-        :scroll="{ x: 1190, y: 350 }"
+        :scroll="{ x: 900, y: 350 }"
         bordered>
         <!-- 销售数量 -->
         <template slot="salesNums" slot-scope="text, record">
@@ -79,14 +79,14 @@ export default {
     return {
       isShow: this.openModal,
       columns: [
-        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'cost', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '原售价', dataIndex: 'productPrice', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '促销价', dataIndex: 'promoRuleGoods.goodsPrice', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
-        { title: '单位', dataIndex: 'unit', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销类型', dataIndex: 'promoRuleGoods.promoRuleTypeName', width: 200, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '成本价', dataIndex: 'cost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '原售价', dataIndex: 'productPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销价', dataIndex: 'promoRuleGoods.goodsPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销类型', dataIndex: 'promoRuleGoods.promoRuleTypeName', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       selectedRows: [],

+ 40 - 39
src/views/salesManagement/salesQuery/edit.vue

@@ -14,7 +14,7 @@
       </template> -->
     </a-page-header>
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-card :bordered="false" class="salesEdit-cont">
+      <a-card size="small" :bordered="false" class="salesEdit-cont">
         <div slot="title">
           <div class="p-title">
             选择产品
@@ -23,7 +23,7 @@
         <!-- 查询配件列表 -->
         <queryPart ref="partQuery" :buyerSn="detailData&&detailData.buyerSn" :newLoading="isInster" @add="insterProduct"></queryPart>
       </a-card>
-      <a-card :bordered="false" class="salesEdit-cont">
+      <a-card size="small" :bordered="false" class="salesEdit-cont">
         <div slot="title">
           <a-row :gutter="15" type="flex">
             <a-col :span="2">
@@ -51,7 +51,7 @@
           </a-row>
         </div>
         <!-- 总计 -->
-        <a-alert type="info">
+        <a-alert type="info" style="margin-bottom: 10px;">
           <div slot="message" class="total-bar">
             <div>
               总售价:<strong>¥{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? detailData.totalCommonAmount : '--' }}</strong>;
@@ -62,7 +62,6 @@
             </div>
           </div>
         </a-alert>
-
         <!-- 已选配件列表 -->
         <s-table
           class="sTable"
@@ -71,23 +70,25 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x:1190, y: 300 }"
+          :scroll="{ x:840, y: 300 }"
           bordered>
           <!-- 产品名称 -->
           <template slot="productName" slot-scope="text, record">
             <span>{{ text }}</span>
             <a-badge :number-style="{ backgroundColor: '#52c41a' }" count="活动" v-if="record.promotableFlag == 1"></a-badge>
           </template>
-
           <!-- 销售数量 -->
           <template slot="salesNums" slot-scope="text, record">
-            <editable-cell
+            <a-input-number
+              id="salesEdit-qty"
               size="small"
-              :text="record.qty"
-              :max="999999"
-              :min="1"
+              v-model="record.qty"
               :precision="0"
-              @change="onCellChange(record, $event)" />
+              :min="1"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => onCellBlur(e.target.value, record)"
+              style="width: 100%;" />
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -109,14 +110,14 @@
           </template>
         </s-table>
       </a-card>
-      <a-card :bordered="false" class="salesEdit-cont">
+      <a-card size="small" :bordered="false" class="salesEdit-cont">
         <div slot="title">
           <div class="p-title">
             已选促销品
           </div>
         </div>
         <!-- 总计 -->
-        <a-alert type="info">
+        <a-alert type="info" style="margin-bottom: 10px;">
           <div slot="message" class="total-bar">
             <div>
               总成本:<strong>¥{{ detailData&&(detailData.totalPromoCost || detailData.totalPromoCost==0) ? detailData.totalPromoCost : '--' }}</strong>;
@@ -128,7 +129,7 @@
           </div>
         </a-alert>
         <!-- 已选促销品列表 -->
-        <queryPromotable ref="promotable" :salesBillSn="$route.params.sn" :delLoading="delLoading" @onCellChange="onCellChange" @del="handleDel"></queryPromotable>
+        <queryPromotable ref="promotable" :salesBillSn="$route.params.sn" :delLoading="delLoading" @onCellBlur="onCellBlur" @del="handleDel"></queryPromotable>
       </a-card>
       <a-affix :offset-bottom="0">
         <div
@@ -163,11 +164,10 @@ import queryPromotable from './queryPromotable.vue'
 import chooseCustomModal from './chooseCustomModal.vue'
 import ChooseActive from './chooseActive.vue'
 import { salesDetailBySn, salesWriteSubmit, getPromoacActiveList } from '@/api/sales'
-import EditableCell from '@/views/common/editInput.js'
 import { salesDetailList, salesDetailInsert, salesDetailUpdateQty, salesDetailDel, salesDetailDelAll, addPromoGoods } from '@/api/salesDetail'
 export default {
   name: 'SalesDetail',
-  components: { STable, VSelect, queryPart, queryPromotable, chooseCustomModal, EditableCell, ChooseActive },
+  components: { STable, VSelect, queryPart, queryPromotable, chooseCustomModal, ChooseActive },
   data () {
     return {
       spinning: false,
@@ -186,14 +186,14 @@ export default {
       activeName: '', // 促销活动
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 120, align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, align: 'center' },
-        { title: '售价', dataIndex: 'price', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
-        { title: '单位', dataIndex: 'productEntity.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: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
+        { title: '售价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'productEntity.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: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -204,6 +204,7 @@ 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
           }
           this.disabled = false
           this.dataSource = data.list
@@ -213,23 +214,26 @@ export default {
     }
   },
   methods: {
-    onCellChange (row, value) {
-      console.log(row, value)
-      if (row) {
-        row['qty'] = Number(value)
-        this.spinning = true
+    // 已选产品  blur
+    onCellBlur (val, record) {
+      const _this = this
+      //  光标移出,值发生改变再调用编辑接口
+      if (val && val != record.qtyBackups) {
+        _this.spinning = true
         salesDetailUpdateQty({
-          salesBillDetailSn: row.salesBillDetailSn,
-          qty: row.qty,
-          salesBillSn: this.salesBillSn
+          salesBillDetailSn: record.salesBillDetailSn,
+          qty: record.qty,
+          salesBillSn: _this.salesBillSn
         }).then(res => {
-          this.resetSearchForm(true)
-          this.$refs.promotable.resetCurForm()
+          _this.resetSearchForm(true)
+          _this.$refs.promotable.resetCurForm()
           if (res.status == 200) {
-            this.$message.success(res.message)
+            _this.$message.success(res.message)
           }
-          this.spinning = false
+          _this.spinning = false
         })
+      } else {
+        record.qty = record.qtyBackups
       }
     },
     // 编辑客户信息
@@ -424,10 +428,7 @@ export default {
 <style lang="less">
   .salesEdit-wrap{
     .salesEdit-cont{
-      margin-top: 15px;
-    }
-    .sTable{
-      margin-top: 15px;
+      margin-top: 10px;
     }
     .p-title{
       font-weight: bold;

+ 18 - 12
src/views/salesManagement/salesQuery/list.vue

@@ -78,7 +78,7 @@
         <a-button type="primary" class="button-error" @click="handleAdd">新增</a-button>
       </div> -->
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           <div>
             总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
@@ -111,7 +111,7 @@
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
           <div v-if="$hasPermissions('B_salesDetail')">
-            <a-badge :count="'改'+record.changeTimes" :offset="[0,-10]" v-if="record.changeTimes>0">
+            <a-badge :count="'改'+record.changeTimes" :offset="[16,-13]" v-if="record.changeTimes>0" class="badge-con-t">
               <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
             </a-badge>
             <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
@@ -181,7 +181,7 @@
     <!-- 选择客户弹框 -->
     <choose-custom-modal :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </template>
 
@@ -201,7 +201,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 选择客户弹框是否显示
       time: [
@@ -262,7 +262,6 @@ export default {
         delete parameter.index
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {
-          console.log(res)
           this.totalData = Object.assign(this.totalData, res.data || {})
         })
         return salesList(Object.assign(parameter, this.queryParam)).then(res => {
@@ -276,12 +275,13 @@ export default {
         })
       },
       visibleAudit: false,
-      auditInfo: null
+      auditInfo: null,
+      spinningAudit: false
     }
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 440 : 385)
+      return window.innerHeight - (this.advanced ? 355 : 313)
     }
   },
   methods: {
@@ -317,7 +317,7 @@ export default {
       this.visibleAudit = true
     },
     auditOrder (billStatus) {
-      this.spinning = true
+      this.spinningAudit = true
       salesWriteAudit({
         salesBillSn: this.auditInfo.salesBillSn,
         billStatus: billStatus
@@ -326,13 +326,13 @@ export default {
           this.visibleAudit = false
           this.$message.success(res.message)
           this.$refs.table.refresh()
-          this.spinning = false
+          this.spinningAudit = false
           if (billStatus == 'OUTING_WAREHOUSE') {
             this.handleDispatch({ salesBillSn: this.auditInfo.salesBillSn })
           }
         } else {
           this.visibleAudit = false
-          this.spinning = false
+          this.spinningAudit = false
         }
       })
     },
@@ -388,9 +388,15 @@ export default {
 }
 </script>
 <style lang="less">
-  .ssalesManagementList-wrap{
+  .salesManagementList-wrap{
     .sTable{
-      margin-top: 15px;
+      margin-top: 10px;
+      .badge-con-t{
+        .ant-badge-count{
+          transform: scale(0.8);
+          font-size: 13px;
+        }
+      }
     }
   }
 </style>

+ 15 - 15
src/views/salesManagement/salesQuery/queryPart.vue

@@ -31,10 +31,10 @@
               </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" id="productInfoList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin:0 15px 0 8px">
+          <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" id="productInfoList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin: 0 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -55,7 +55,7 @@
       :columns="columns"
       :data="loadData"
       :customRow="handleClickRow"
-      :scroll="{ x: 1710, y: 300 }"
+      :scroll="{ x: 930, y: 300 }"
       :defaultLoadData="false"
       bordered>
       <!-- 销售数量 -->
@@ -121,17 +121,17 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', scopedSlots: { customRender: 'productName' }, align: 'center' },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存数量', dataIndex: 'currentStockQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '售价', dataIndex: 'productPrice', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '包装数', dataIndex: 'packQtyV', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '销售数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: 150, align: 'center' },
-        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'productBrandName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存数量', dataIndex: 'currentStockQty', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '售价', dataIndex: 'productPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '包装数', dataIndex: 'packQtyV', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '销售数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: 100, align: 'center' },
+        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 22 - 19
src/views/salesManagement/salesQuery/queryPromotable.vue

@@ -7,7 +7,7 @@
     :rowKey="(record) => record.id"
     :columns="columns"
     :data="loadData"
-    :scroll="{ x:1430, y: 300 }"
+    :scroll="{ x:1010, y: 300 }"
     :defaultLoadData="false"
     bordered>
     <!-- 产品名称 -->
@@ -16,13 +16,16 @@
     </template>
     <!-- 销售数量 -->
     <template slot="salesNums" slot-scope="text, record">
-      <editable-cell
+      <a-input-number
+        id="salesEdit-qty"
         size="small"
-        :text="record.qty"
-        :max="999999"
-        :min="1"
+        v-model="record.qty"
         :precision="0"
-        @change="onCellChange(record, $event)" />
+        :min="1"
+        :max="999999"
+        placeholder="请输入"
+        @blur="e => onCellBlur(e.target.value, record)"
+        style="width: 100%;" />
     </template>
     <!-- 操作 -->
     <template slot="action" slot-scope="text, record">
@@ -40,10 +43,9 @@
 <script>
 import { salesDetailList } from '@/api/salesDetail'
 import { STable, VSelect } from '@/components'
-import EditableCell from '@/views/common/editInput.js'
 export default {
   name: 'Promotable',
-  components: { STable, VSelect, EditableCell },
+  components: { STable, VSelect },
   props: {
     salesBillSn: {
       type: [Number, String],
@@ -59,16 +61,16 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 120, align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, align: 'center' },
-        { title: '成本价', dataIndex: 'showCost', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '原售价', dataIndex: 'origPrice', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '促销价', dataIndex: 'price', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销类型', dataIndex: 'promotionRulesName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '成本价', dataIndex: 'showCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '原售价', dataIndex: 'origPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销类型', dataIndex: 'promotionRulesName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -78,6 +80,7 @@ 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
           }
           return data
         })
@@ -90,8 +93,8 @@ export default {
       this.$refs.table.refresh()
     },
     // 修改数量
-    onCellChange (row, $event) {
-      this.$emit('onCellChange', row, $event)
+    onCellBlur (val, record) {
+      this.$emit('onCellBlur', val, record)
     },
     // 删除
     handleDel (row) {

+ 6 - 5
src/views/salesManagement/salesReturn/detail.vue

@@ -72,7 +72,7 @@
       </a-card>
     </a-spin>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
   </div>
 </template>
 
@@ -186,7 +186,8 @@ export default {
         })
       },
       detailData: null, //  详情数据
-      visibleAudit: false
+      visibleAudit: false,
+      spinningAudit: false
     }
   },
   methods: {
@@ -195,7 +196,7 @@ export default {
       this.$router.push({ path: '/salesManagement/salesReturn/list', query: { closeLastOldTab: true } })
     },
     auditOrder (billStatus) {
-      this.spinning = true
+      this.spinningAudit = true
       salesReturnAudit({
         salesReturnBillSn: this.detailData.salesReturnBillSn,
         billStatus: billStatus
@@ -204,10 +205,10 @@ export default {
           this.visibleAudit = false
           this.$message.success(res.message)
           this.handleBack()
-          this.spinning = false
+          this.spinningAudit = false
         } else {
           this.visibleAudit = false
-          this.spinning = false
+          this.spinningAudit = false
         }
       })
     },

+ 8 - 7
src/views/salesManagement/salesReturn/list.vue

@@ -149,7 +149,7 @@
     <!-- 选择客户弹框 -->
     <choose-custom-modal :show="openModal" @ok="handleEdit" @cancel="openModal=false"></choose-custom-modal>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </template>
 
@@ -176,7 +176,7 @@ export default {
     return {
       spinning: false,
       // 高级搜索 展开/关闭
-      advanced: false,
+      advanced: true,
       disabled: false, //  查询、重置按钮是否可操作
       createDate: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
@@ -230,12 +230,13 @@ export default {
         })
       },
       visibleAudit: false,
-      auditInfo: null
+      auditInfo: null,
+      spinningAudit: false
     }
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 480 : 425)
+      return window.innerHeight - (this.advanced ? 365 : 325)
     }
   },
   methods: {
@@ -293,7 +294,7 @@ export default {
       this.visibleAudit = true
     },
     auditOrder (billStatus) {
-      this.spinning = true
+      this.spinningAudit = true
       salesReturnAudit({
         salesReturnBillSn: this.auditInfo.salesReturnBillSn,
         billStatus: billStatus
@@ -302,10 +303,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
         }
       })
     },

+ 19 - 19
src/views/salesManagement/salesReturn/queryPart.vue

@@ -19,9 +19,9 @@
               <a-input id="salesReturnList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesReturnList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnList-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="salesReturnList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnList-reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -37,7 +37,7 @@
       :customRow="handleClickRow"
       :rowClassName="(record, index) => (grabFlag == '1'&&record.refundableQty==0) ? 'redBg-row':''"
       :defaultLoadData="false"
-      :scroll="{ x: grabFlag == '1' ? 1380 : 1020, y: 300 }"
+      :scroll="{ x: grabFlag == '1' ? 930 : 710, y: 300 }"
       bordered>
       <!-- 本次退货数量 -->
       <template slot="qty" slot-scope="text, record">
@@ -129,26 +129,26 @@ export default {
     // 抓单
     if (this.grabFlag == 1) {
       this.columns = [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '销售单号', dataIndex: 'salesBillNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '剩余可退数量', dataIndex: 'refundableQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '本次退货数量', dataIndex: 'qty', width: 120, align: 'center', scopedSlots: { customRender: 'qty' } },
-        { title: '采购价', dataIndex: 'showCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }]
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '售价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '剩余可退数量', dataIndex: 'refundableQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次退货数量', dataIndex: 'qty', width: 100, align: 'center', scopedSlots: { customRender: 'qty' } },
+        { title: '采购价', dataIndex: 'showCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }]
     } else {
       this.columns = [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '当前售价', dataIndex: 'productPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '当前售价', dataIndex: 'productPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货数量', dataIndex: 'qty', width: 100, align: 'center', scopedSlots: { customRender: 'qty' } },
-        { title: '采购价', dataIndex: 'lastStockCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: 100, align: 'center' }
+        { title: '采购价', dataIndex: 'lastStockCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: 80, align: 'center' }
       ]
     }
   },

+ 29 - 28
src/views/salesManagement/salesReturn/salesReturnCheck.vue

@@ -21,17 +21,20 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 1500, y: 300 }"
+          :scroll="{ x: 710, y: 300 }"
           bordered>
           <!-- 返库数量 -->
           <template slot="backStockQty" slot-scope="text, record">
-            <editable-cell
+            <a-input-number
+              id="salesReturn-backStockQty"
               size="small"
-              :text="record.backStockQty"
-              :max="record.qty"
-              :min="0"
+              v-model="record.backStockQty"
               :precision="0"
-              @change="onCellChange(record.id, 'backStockQty', $event)" />
+              :min="0"
+              :max="record.qty"
+              placeholder="请输入"
+              @blur="e => onCellBlur(e.target.value, record)"
+              style="width: 100%;" />
           </template>
         </s-table>
       </a-card>
@@ -54,7 +57,6 @@
 <script>
 import { STable, VSelect } from '@/components'
 import queryPart from './queryPart.vue'
-import EditableCell from '@/views/common/editInput.js'
 import { salesReturnDetail, salesReturnCheck } from '@/api/salesReturn'
 import {
   salesReturnDetailList,
@@ -65,8 +67,7 @@ export default {
   components: {
     STable,
     VSelect,
-    queryPart,
-    EditableCell
+    queryPart
   },
   data () {
     return {
@@ -87,14 +88,14 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', align: 'center', width: 160, customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', width: 200, customRender: function (text) { return text || '--' } },
-        { title: '退货数量', dataIndex: 'qty', align: 'center', width: 150, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '坏件数量', dataIndex: 'badQty', align: 'center', width: 150, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '返库数量', dataIndex: 'backStockQty', width: 150, align: 'center', scopedSlots: { customRender: 'backStockQty' } },
-        { title: '单位', dataIndex: 'productEntity.unit', align: 'center', customRender: function (text) { return text || '--' }, width: 100 },
-        { title: '售价', dataIndex: 'price', align: 'center', width: 150, customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } }
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货数量', dataIndex: 'qty', align: 'center', width: 80, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '坏件数量', dataIndex: 'badQty', align: 'center', width: 80, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '返库数量', dataIndex: 'backStockQty', width: 100, align: 'center', scopedSlots: { customRender: 'backStockQty' } },
+        { title: '单位', dataIndex: 'productEntity.unit', align: 'center', customRender: function (text) { return text || '--' }, width: 60 },
+        { title: '售价', dataIndex: 'price', align: 'center', width: 80, customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       chooseLoadData: [],
       // 加载数据方法 必须为 Promise 对象
@@ -107,6 +108,7 @@ 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].backStockQtyBackups = data.list[i].backStockQty
           }
           this.disabled = false
           this.chooseLoadData = data.list
@@ -157,7 +159,6 @@ export default {
         _this.$message.warning('请在选择产品!')
         return
       }
-
       this.$confirm({
         title: '提示',
         content: '确认要批量返库吗?',
@@ -174,16 +175,16 @@ export default {
         }
       })
     },
-    // 修改返库数量
-    onCellChange (id, key, value) {
-      const chooseLoadData = [...this.chooseLoadData]
-      const row = chooseLoadData.find(item => item.id === id)
-      if (row) {
-        row[key] = Number(value)
+    // 已选产品  blur
+    onCellBlur (val, record) {
+      //  光标移出,值发生改变再调用编辑接口
+      if (val && val != record.backStockQtyBackups) {
         this.submitCheck([{
-          salesReturnDetailSn: row.salesReturnDetailSn,
-          backStockQty: row.backStockQty
+          salesReturnDetailSn: record.salesReturnDetailSn,
+          backStockQty: record.backStockQty
         }])
+      } else {
+        record.backStockQty = record.backStockQtyBackups
       }
     },
     // 品检
@@ -243,9 +244,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;

+ 26 - 25
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -37,21 +37,24 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 1220, y: 300 }"
+          :scroll="{ x: 910, 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)"
+              style="width: 100%;" />
           </template>
           <!-- 退货原因 -->
           <template slot="remark" slot-scope="text, record">
-            <a-input placeholder="30个字符内" maxlength="30" v-model="record.remark" @blur="updateRemark(record)"></a-input>
+            <a-input size="small" placeholder="30个字符内" maxlength="30" v-model="record.remark" @blur="updateRemark(record)"></a-input>
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -118,15 +121,15 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', align: 'center', width: 80 },
-        { title: '产品编码', dataIndex: 'productEntity.code', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', align: 'center', width: 70 },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货数量', dataIndex: 'qty', align: 'center', width: 100, scopedSlots: { customRender: 'qty' } },
-        { title: '退货单价', dataIndex: 'price', align: 'center', width: 100, customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', align: 'center', width: 100, customRender: function (text) { return text || '--' } },
-        { title: '退货小计', align: 'center', dataIndex: 'totalAmount', width: 100, customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '退货单价', dataIndex: 'price', align: 'center', width: 80, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productEntity.unit', align: 'center', width: 60, customRender: function (text) { return text || '--' } },
+        { title: '退货小计', align: 'center', dataIndex: 'totalAmount', width: 80, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货原因', dataIndex: 'remark', align: 'center', width: 200, scopedSlots: { customRender: 'remark' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
       // 加载数据方法 必须为 Promise 对象
@@ -139,6 +142,7 @@ 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
           }
           this.disabled = false
           this.chooseLoadData = data.list
@@ -152,16 +156,14 @@ export default {
     handleBack () {
       this.$router.push({ path: '/salesManagement/salesReturn/list', query: { closeLastOldTab: true } })
     },
-    // 修改退货数量
-    onCellChange (id, key, value) {
-      const chooseLoadData = [...this.chooseLoadData]
-      const row = chooseLoadData.find(item => item.id === id)
-      if (row) {
-        row[key] = Number(value)
+    // 已选产品  blur
+    onCellBlur (val, record) {
+      //  光标移出,值发生改变再调用编辑接口
+      if (val && val != record.qtyBackups) {
         this.spinning = true
         salesReturnDetailUpdateQty({
-          salesReturnDetailSn: row.salesReturnDetailSn,
-          qty: row.qty
+          salesReturnDetailSn: record.salesReturnDetailSn,
+          qty: record.qty
         }).then(res => {
           if (res.status == 200) {
             this.resetSearchForm(true)
@@ -171,6 +173,8 @@ export default {
             this.spinning = false
           }
         })
+      } else {
+        record.qty = record.qtyBackups
       }
     },
     // 修改退货原因
@@ -277,10 +281,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;

+ 31 - 30
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -35,21 +35,24 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 1640, y: 300 }"
+          :scroll="{ x: 1130, 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)"
+              style="width: 100%;" />
           </template>
           <!-- 退货原因 -->
           <template slot="remark" slot-scope="text, record">
-            <a-input placeholder="30个字符内" maxlength="30" v-model="record.remark" @blur="updateRemark(record)"></a-input>
+            <a-input size="small" placeholder="30个字符内" maxlength="30" v-model="record.remark" @blur="updateRemark(record)"></a-input>
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -116,17 +119,17 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', align: 'center', width: 80 },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', width: 220, customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', align: 'center', width: 70 },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '剩余可退数量', dataIndex: 'refundableQty', align: 'center', width: 120, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '本次退货数量', dataIndex: 'qty', align: 'center', width: 150, scopedSlots: { customRender: 'qty' } },
-        { title: '退货单价', dataIndex: 'price', align: 'center', width: 100, customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', align: 'center', width: 100, customRender: function (text) { return text || '--' } },
-        { title: '退货小计', align: 'center', width: 100, dataIndex: 'totalAmount', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '剩余可退数量', dataIndex: 'refundableQty', align: 'center', width: 100, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次退货数量', dataIndex: 'qty', align: 'center', width: 100, scopedSlots: { customRender: 'qty' } },
+        { title: '退货单价', dataIndex: 'price', align: 'center', width: 80, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productEntity.unit', align: 'center', width: 60, customRender: function (text) { return text || '--' } },
+        { title: '退货小计', align: 'center', width: 80, dataIndex: 'totalAmount', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货原因', dataIndex: 'remark', align: 'center', width: 200, scopedSlots: { customRender: 'remark' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
       // 加载数据方法 必须为 Promise 对象
@@ -139,6 +142,7 @@ 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
           }
           this.disabled = false
           this.chooseLoadData = data.list
@@ -152,20 +156,18 @@ export default {
     handleBack () {
       this.$router.push({ path: '/salesManagement/salesReturn/list', query: { closeLastOldTab: 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.qty > row.refundableQty) {
+    // 已选产品  blur
+    onCellBlur (val, record) {
+      //  光标移出,值发生改变再调用编辑接口
+      if (val && val != record.qtyBackups) {
+        if (Number(record.qty) > Number(record.refundableQty)) {
           this.$message.info('本次退货数量不可大于剩余可退数量')
-          this.$refs.table.refresh(true)
+          record.qty = record.qtyBackups
         } else {
           this.spinning = true
           salesReturnDetailUpdateQty({
-            salesReturnDetailSn: row.salesReturnDetailSn,
-            qty: row.qty
+            salesReturnDetailSn: record.salesReturnDetailSn,
+            qty: record.qty
           }).then(res => {
             if (res.status == 200) {
               this.resetSearchForm(true)
@@ -174,6 +176,8 @@ export default {
             this.spinning = false
           })
         }
+      } else {
+        record.qty = record.qtyBackups
       }
     },
     // 修改退货原因
@@ -285,10 +289,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;

+ 6 - 6
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -53,9 +53,9 @@
             </template>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
               <a-button
-                style="margin-left: 8px"
+                style="margin-left: 5px"
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
@@ -63,7 +63,7 @@
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_oosDetailExportByBuyer')"
                 id="shortageStatisticsCList-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>
@@ -72,7 +72,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">
           <div>
             总客户数:<strong>{{ productTotal && (productTotal.totalBuyerQty || productTotal.totalBuyerQty==0) ? productTotal.totalBuyerQty : '--' }}</strong>,
@@ -123,7 +123,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
@@ -176,7 +176,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 435 : 380)
+      return window.innerHeight - (this.advanced ? 335 : 295)
     }
   },
   methods: {

+ 6 - 6
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -26,10 +26,10 @@
               </a-form-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsPList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsPList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -38,7 +38,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin:10px 0">
+    <a-alert type="info" style="margin-bottom:10px">
       <div slot="message">
         <div>
           总缺货数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
@@ -73,7 +73,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
@@ -121,7 +121,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 435 : 380)
+      return window.innerHeight - (this.advanced ? 335 : 295)
     }
   },
   methods: {

+ 40 - 43
src/views/salesManagement/waitDispatch/edit.vue

@@ -14,7 +14,7 @@
       </template> -->
     </a-page-header>
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-card :bordered="false" class="waitDispatch-cont" v-if="salesBillSn">
+      <a-card size="small" :bordered="false" class="waitDispatch-cont" v-if="salesBillSn">
         <!-- 查询配件列表 -->
         <queryPart
           ref="partQuery"
@@ -25,7 +25,7 @@
           @cancelProduct="cancelProduct"
           @addProduct="insterProduct"></queryPart>
       </a-card>
-      <a-card :bordered="false" class="waitDispatch-cont">
+      <a-card size="small" :bordered="false" class="waitDispatch-cont">
         <div slot="title">
           <div class="p-title">
             待下推产品
@@ -34,12 +34,13 @@
         <div style="margin: 0 0 10px 0;">
           <a-button
             type="primary"
+            class="button-error"
             @click="delSalerDetailAll"
             :loading="delLoading"
             id="waitDispatch-del-all">批量移除</a-button>
         </div>
         <!-- 总计 -->
-        <a-alert type="info">
+        <a-alert type="info" style="margin-bottom: 10px;">
           <div slot="message" class="total-bar">
             <div>
               本次下推款数:<strong>¥{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
@@ -49,7 +50,6 @@
             </div>
           </div>
         </a-alert>
-
         <!-- 已选配件列表 -->
         <s-table
           class="sTable"
@@ -60,7 +60,7 @@
           :columns="columns"
           :data="loadData"
           :showPagination="false"
-          :scroll="{ x:1150, y: 300 }"
+          :scroll="{ x:650, y: 300 }"
           bordered>
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
@@ -71,13 +71,16 @@
           </template>
           <!-- 本次下推数 -->
           <template slot="salesNums" slot-scope="text, record">
-            <editable-cell
+            <a-input-number
+              id="salesReturn-qty"
               size="small"
-              :text="record.qty"
-              :max="999999"
-              :min="1"
+              v-model="record.qty"
               :precision="0"
-              @change="onCellChange(record.id, 'qty', $event)" />
+              :min="1"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => onCellBlur(e.target.value, record)"
+              style="width: 100%;" />
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -113,11 +116,10 @@ import { STable, VSelect } from '@/components'
 import queryPart from './queryPart.vue'
 import { salesDetailBySn } from '@/api/sales'
 import { salesDetailDispatchByOneKey, insertBatchOfWaitDispatch, salesDetailUpdateCancelQty } from '@/api/salesDetail'
-import EditableCell from '@/views/common/editInput.js'
 import { deleteBatch, pushDown, dispatchDetail, waitDispatchDetailAllList, updateQty } from '@/api/waitDispatchDetail'
 export default {
   name: 'SalesDetail',
-  components: { STable, VSelect, queryPart, EditableCell },
+  components: { STable, VSelect, queryPart },
   data () {
     return {
       spinning: false,
@@ -135,19 +137,18 @@ export default {
       selectedRows: [],
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 220, align: 'center' },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '剩余待下推', dataIndex: 'surplusQty', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '本次下推数', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 120, align: 'center' },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '剩余待下推', dataIndex: 'surplusQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次下推数', scopedSlots: { customRender: 'salesNums' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.productForm.dispatchBillSn = this.$route.params.dispatchBillSn
-
         // 查询统计
         this.getTotalData()
         return waitDispatchDetailAllList(Object.assign(parameter, this.productForm)).then(res => {
@@ -155,6 +156,7 @@ export default {
           const no = 0
           for (var i = 0; i < data.length; i++) {
             data[i].no = no + i + 1
+            data.list[i].qtyBackups = data.list[i].qty
           }
           this.disabled = false
           this.dataSource = data
@@ -205,31 +207,28 @@ export default {
         }
       })
     },
-    // 修改数量
-    onCellChange (id, key, value) {
-      console.log(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 == 'qty') {
-        this.spinning = true
+    // 已选产品  blur
+    onCellBlur (val, record) {
+      const _this = this
+      _this.dataSource = record
+      if (val && val != record.qtyBackups) {
+        _this.spinning = true
         updateQty({
-          dispatchBillDetailSn: row.dispatchBillDetailSn,
-          qty: row.qty,
-          salesBillSn: this.salesBillSn
+          dispatchBillDetailSn: record.dispatchBillDetailSn,
+          qty: record.qty,
+          salesBillSn: _this.salesBillSn
         }).then(res => {
-          this.resetSearchForm(true)
+          _this.resetSearchForm(true)
           if (res.status == 200) {
-            this.$refs.partQuery.resetCurForm()
-            this.$message.success(res.message)
-            this.spinning = false
+            _this.$refs.partQuery.resetCurForm()
+            _this.$message.success(res.message)
+            _this.spinning = false
           } else {
-            this.spinning = false
+            _this.spinning = false
           }
         })
+      } else {
+        record.qty = record.qtyBackups
       }
     },
     //  重置
@@ -405,12 +404,10 @@ export default {
 <style lang="less">
   .waitDispatch-wrap{
     .waitDispatch-cont{
-      margin-top: 15px;
-    }
-    .sTable{
-      margin-top: 15px;
+      margin-top: 10px;
     }
     .p-title{
+      font-size: 16px;
       font-weight: bold;
     }
     .p-notes{

+ 19 - 19
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -43,9 +43,9 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :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-col :md="4" :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" id="productInfoList-reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -90,7 +90,7 @@
       :columns="columns"
       :showPagination="false"
       :data="loadData"
-      :scroll="{ x: 2060, y: 300 }"
+      :scroll="{ x: 1260, y: 300 }"
       bordered>
       <!-- 取消数量 -->
       <template slot="nums" slot-scope="text, record">
@@ -144,7 +144,7 @@ export default {
   },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       showSetting: false, // 设置弹框
       productType: [],
       queryParam: {
@@ -161,20 +161,20 @@ export default {
       selectedRowKeys: [], // Check here to configure the default column
       selectedRows: [],
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 220, align: 'center' },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'showCost', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '销售价', dataIndex: 'price', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '可用库存', dataIndex: 'stockQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '销售数量', dataIndex: 'qty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已取消', dataIndex: 'cancelQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已下推', dataIndex: 'pushedQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '剩余待下推', dataIndex: 'surplusQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '取消数量', dataIndex: 'cancelNums', scopedSlots: { customRender: 'nums' }, width: 150, align: 'center' },
-        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 120, align: 'center' },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价', dataIndex: 'showCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '销售价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '可用库存', dataIndex: 'stockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '销售数量', dataIndex: 'qty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已取消', dataIndex: 'cancelQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已下推', dataIndex: 'pushedQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '剩余待下推', dataIndex: 'surplusQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '取消数量', dataIndex: 'cancelNums', scopedSlots: { customRender: 'nums' }, width: 100, align: 'center' },
+        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 20 - 15
src/views/setting/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) {

+ 4 - 4
src/views/setting/noticeManagement/list.vue

@@ -20,9 +20,9 @@
                 <v-select code="NOTITY_SEND_STATUS" id="noticeList-sendStatus" v-model="queryParam.sendStatus" allowClear placeholder="请选择发布状态"></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="noticeList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="noticeList-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="noticeList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="noticeList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -32,7 +32,7 @@
         <a-button id="noticeList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- 总计 -->
-      <!-- <a-alert type="info" showIcon style="margin-bottom:15px">
+      <!-- <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">合计:<strong>{{ total || 0 }}</strong>条</div>
       </a-alert> -->
       <!-- 列表 -->

+ 5 - 5
src/views/supplierManagement/associatedProduct/add.vue

@@ -36,10 +36,10 @@
                   </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="associatedProduct-refresh">查询</a-button>
-                <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="associatedProduct-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="associatedProduct-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="associatedProduct-reset">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 5px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
@@ -105,7 +105,7 @@ export default {
     return {
       spinning: false,
       disabled: false,
-      advanced: false,
+      advanced: true,
       tableHeight: 0,
       openModal: false, // 设置价格 弹框
       newProduct: false, // 选择产品 弹框

+ 15 - 15
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -31,10 +31,10 @@
               </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="associatedProductList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="associatedProductList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="associatedProductList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="associatedProductList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
@@ -50,7 +50,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1470, y: tableHeight }"
+      :scroll="{ x: 1010, y: tableHeight }"
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">
@@ -70,7 +70,7 @@ export default {
   components: { STable, VSelect, ProductBrand, ProductType },
   data () {
     return {
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         supplierName: '',
         product: {
@@ -85,14 +85,14 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       productType: [],
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '品牌', dataIndex: 'product.productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
-        { title: '产品名称', dataIndex: 'product.name', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'product.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价(¥)', dataIndex: 'cost', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥' + text : '--') } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '供应商名称', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'product.productBrandName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 100, align: 'center' },
+        { title: '产品名称', dataIndex: 'product.name', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'cost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -111,7 +111,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return window.innerHeight - (this.advanced ? 370 : 310)
+      return window.innerHeight - (this.advanced ? 300 : 240)
     }
   },
   methods: {

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