Quellcode durchsuchen

Merge branch 'develop_yh28' of jianguan-web/jg-ocs-html into pre-release

李磊 vor 1 Jahr
Ursprung
Commit
3be7011637
100 geänderte Dateien mit 3792 neuen und 3323 gelöschten Zeilen
  1. 1 1
      public/version.json
  2. 9 9
      src/api/reportData.js
  3. 0 43
      src/components/Table/index.js
  4. 0 186
      src/components/custom.less
  5. 79 7
      src/components/global.less
  6. 9 63
      src/components/index.less
  7. 3 2
      src/config/router.config.js
  8. 0 1
      src/layouts/BasicLayout.vue
  9. 334 230
      src/views/allocationManagement/allocateReturnConfirmation/list.vue
  10. 455 173
      src/views/allocationManagement/allocationList/list.vue
  11. 55 50
      src/views/allocationManagement/matchSendOutOrder/list.vue
  12. 108 26
      src/views/allocationManagement/transferOut/detail.vue
  13. 82 88
      src/views/allocationManagement/transferOut/edit.vue
  14. 92 88
      src/views/allocationManagement/transferOut/list.vue
  15. 1 1
      src/views/allocationManagement/transferReturn/check.vue
  16. 87 45
      src/views/allocationManagement/transferReturn/detail.vue
  17. 58 62
      src/views/allocationManagement/transferReturn/edit.vue
  18. 45 47
      src/views/allocationManagement/transferReturn/editGrp.vue
  19. 75 67
      src/views/allocationManagement/transferReturn/list.vue
  20. 3 2
      src/views/allocationManagement/transferReturn/print.vue
  21. 107 93
      src/views/allocationManagement/transfersPrint/list.vue
  22. 43 40
      src/views/allocationManagement/transfersPrint/recordModal.vue
  23. 1 1
      src/views/basicData/transferTypeManagement/editModal.vue
  24. 3 3
      src/views/basicData/transferTypeManagement/list.vue
  25. 1 1
      src/views/basicData/warehouse/editModal.vue
  26. 47 43
      src/views/basicData/warehouse/list.vue
  27. 1 1
      src/views/basicData/warehouse/storingLocation/editModal.vue
  28. 3 3
      src/views/basicData/warehouse/storingLocation/list.vue
  29. 7 2
      src/views/bnSetting/menu/adminMenus.vue
  30. 7 10
      src/views/common/chooseBrandModal.vue
  31. 12 15
      src/views/common/chooseProductsModal.vue
  32. 7 10
      src/views/common/chooseTypeModal.vue
  33. 2 2
      src/views/dealerManagement/businessOwnerSettings/addModal.vue
  34. 4 6
      src/views/dealerManagement/businessOwnerSettings/categorySet.vue
  35. 2 2
      src/views/dealerManagement/businessOwnerSettings/chooseAreaModal.vue
  36. 6 8
      src/views/dealerManagement/businessOwnerSettings/list.vue
  37. 10 10
      src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue
  38. 15 25
      src/views/dealerManagement/businessOwnerSettings/supplierSet.vue
  39. 3 3
      src/views/dealerManagement/dealerAccountManagement/editModal.vue
  40. 74 69
      src/views/dealerManagement/dealerAccountManagement/list.vue
  41. 2 2
      src/views/dealerManagement/dealerRelationshipBinding/associateModal.vue
  42. 70 73
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  43. 6 5
      src/views/dealerManagement/dealerZoneSearch/list.vue
  44. 7 7
      src/views/dealerManagement/marketingDivisionSetNew/list.vue
  45. 50 44
      src/views/dealerManagement/marketingDivisionSetNew/viewDealers.vue
  46. 70 66
      src/views/dealerManagement/merchantInfoManagement/list.vue
  47. 4 4
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  48. 2 2
      src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue
  49. 2 2
      src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue
  50. 2 2
      src/views/dealerManagement/rebateSettings/associateModal.vue
  51. 75 70
      src/views/dealerManagement/rebateSettings/list.vue
  52. 36 26
      src/views/expenseManagement/expenseReimbursement/add.vue
  53. 1 1
      src/views/expenseManagement/expenseReimbursement/baseDataModal.vue
  54. 2 2
      src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue
  55. 35 31
      src/views/expenseManagement/expenseReimbursement/detail.vue
  56. 1 1
      src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue
  57. 79 74
      src/views/expenseManagement/expenseReimbursement/list.vue
  58. 1 1
      src/views/expenseManagement/expenseReimbursement/productInfoModal.vue
  59. 156 155
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  60. 24 33
      src/views/financialManagement/collectionDetailStatic/list.vue
  61. 1 1
      src/views/financialManagement/financialCollection/baseModal.vue
  62. 48 26
      src/views/financialManagement/financialCollection/detail.vue
  63. 15 6
      src/views/financialManagement/financialCollection/edit.vue
  64. 1 1
      src/views/financialManagement/financialCollection/fcDetailModal.vue
  65. 85 79
      src/views/financialManagement/financialCollection/list.vue
  66. 2 2
      src/views/financialManagement/warehousingConfirmation/detailModal.vue
  67. 42 37
      src/views/financialManagement/warehousingConfirmation/list.vue
  68. 1 1
      src/views/inventoryManagement/intelligentReplenishment/edit.vue
  69. 1 1
      src/views/inventoryManagement/inventoryCheck/addModal.vue
  70. 24 24
      src/views/inventoryManagement/inventoryCheck/detail.vue
  71. 71 80
      src/views/inventoryManagement/inventoryCheck/list.vue
  72. 36 20
      src/views/inventoryManagement/inventoryConfirmation/detail.vue
  73. 34 30
      src/views/inventoryManagement/inventoryConfirmation/list.vue
  74. 3 3
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  75. 87 76
      src/views/inventoryManagement/inventoryQuery/list.vue
  76. 8 8
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  77. 62 58
      src/views/inventoryManagement/inventoryWarning/list.vue
  78. 20 20
      src/views/inventoryManagement/makeInventory/check.vue
  79. 31 27
      src/views/inventoryManagement/makeInventory/list.vue
  80. 21 21
      src/views/inventoryManagement/supervisionDisk/check.vue
  81. 32 34
      src/views/inventoryManagement/supervisionDisk/list.vue
  82. 25 21
      src/views/power/OperateJournal/OperateJournal.vue
  83. 9 5
      src/views/power/dataDictionary/dataDictionary.vue
  84. 2 2
      src/views/power/role/menuModal.vue
  85. 52 48
      src/views/power/role/roleList.vue
  86. 2 2
      src/views/power/role/roleModal.vue
  87. 62 58
      src/views/power/user/userList.vue
  88. 2 2
      src/views/power/user/userModal.vue
  89. 45 41
      src/views/productManagement/newProduct/list.vue
  90. 65 60
      src/views/productManagement/priceChangeRecord/list.vue
  91. 7 5
      src/views/productManagement/productBrand/detailModal.vue
  92. 10 8
      src/views/productManagement/productBrand/editModal.vue
  93. 78 67
      src/views/productManagement/productBrand/list.vue
  94. 1 1
      src/views/productManagement/productCategory/editModal.vue
  95. 2 2
      src/views/productManagement/productCategory/list.vue
  96. 155 149
      src/views/productManagement/productInfo/list.vue
  97. 48 41
      src/views/productManagement/productLaunchAudit/list.vue
  98. 1 1
      src/views/productManagement/productLevel/editModal.vue
  99. 84 79
      src/views/productManagement/productLevel/list.vue
  100. 41 37
      src/views/productManagement/productNotOnline/list.vue

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.26",
+    "version": "2.2.28",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 9 - 9
src/api/reportData.js

@@ -257,9 +257,9 @@ export const salesReturnExport = (params) => {
     responseType: 'blob'
   })
 }
-//  销售明细(开单统计)报表
+//  销售明细(下推统计)报表
 export const reportSalesBillDetailList = (params) => {
-  const url = `/report/salesBillReport/detail/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/report/reportDispatchBillDetail/reportPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -268,18 +268,18 @@ export const reportSalesBillDetailList = (params) => {
     method: 'post'
   })
 }
-//  销售明细(开单统计)报表  合计
+//  销售明细(下推统计)报表  合计
 export const reportSalesBillDetailCount = (params) => {
   return axios({
-    url: '/report/salesBillReport/detail/queryCount',
+    url: '/report/reportDispatchBillDetail/reportCount',
     data: params,
     method: 'post'
   })
 }
-// 销售明细(开单统计)报表 导出
+// 销售明细(下推统计)报表 导出
 export const reportSalesBillDetailExport = (params) => {
   return axios({
-    url: '/report/salesBillReport/detail/export',
+    url: '/report/reportDispatchBillDetail/reportExport',
     data: params,
     method: 'post',
     responseType: 'blob'
@@ -287,7 +287,7 @@ export const reportSalesBillDetailExport = (params) => {
 }
 //  销售(开单统计)报表
 export const reportSalesBillList = (params) => {
-  const url = `/report/reportSales/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/report/reportDispatchBill/reportPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -299,7 +299,7 @@ export const reportSalesBillList = (params) => {
 //  销售(开单统计)报表  合计
 export const reportSalesBillCount = (params) => {
   return axios({
-    url: '/report/reportSales/queryCount',
+    url: '/report/reportDispatchBill/reportCount',
     data: params,
     method: 'post'
   })
@@ -307,7 +307,7 @@ export const reportSalesBillCount = (params) => {
 // 销售(开单统计)报表 导出
 export const reportSalesBillExport = (params) => {
   return axios({
-    url: '/report/reportSales/exportExcel',
+    url: '/report/reportDispatchBill/reportExport',
     data: params,
     method: 'post',
     responseType: 'blob'

+ 0 - 43
src/components/Table/index.js

@@ -318,46 +318,6 @@ export default {
         this.updateSelect()
       }
     },
-    /**
-     * 处理交给 table 使用者去处理 clear 事件时,内部选中统计同时调用
-     * @param callback
-     * @returns {*}
-     */
-    renderClear (callback) {
-      if (this.selectedRowKeys.length <= 0) return null
-      return (
-        <a style="margin-left: 24px" onClick={() => {
-          callback()
-          this.clearSelected()
-        }}>清空</a>
-      )
-    },
-    renderAlert () {
-      // 绘制统计列数据
-      const needTotalItems = this.needTotalList.map((item) => {
-        return (<span style="margin-right: 12px">
-          {item.title}总计 <a style="font-weight: 600">{!item.customRender ? item.total : item.customRender(item.total)}</a>
-        </span>)
-      })
-
-      // 绘制 清空 按钮
-      const clearItem = (typeof this.alert.clear === 'boolean' && this.alert.clear) ? (
-        this.renderClear(this.clearSelected)
-      ) : (this.alert !== null && typeof this.alert.clear === 'function') ? (
-        this.renderClear(this.alert.clear)
-      ) : null
-
-      // 绘制 alert 组件
-      return (
-        <a-alert showIcon={true} style="margin-bottom: 16px">
-          <template slot="message">
-            <span style="margin-right: 12px">已选择: <a style="font-weight: 600">{this.selectedRows.length}</a></span>
-            {needTotalItems}
-            {clearItem}
-          </template>
-        </a-alert>
-      )
-    },
     // 自定义行
     customRows(record, index) {
       return {
@@ -376,11 +336,9 @@ export default {
       }
     },
   },
-
   render () {
     const props = {}
     const localKeys = Object.keys(this.$data)
-    const showAlert = (typeof this.alert === 'object' && this.alert !== null && this.alert.show) && typeof this.rowSelection.selectedRowKeys !== 'undefined' || this.alert
     Object.keys(T.props).forEach(k => {
       const localKey = `local${k.substring(0, 1).toUpperCase()}${k.substring(1)}`
       if (localKeys.includes(localKey)) {
@@ -425,7 +383,6 @@ export default {
 
     return (
       <div class="table-wrapper">
-        { showAlert ? this.renderAlert() : null }
         { table }
       </div>
     )

+ 0 - 186
src/components/custom.less

@@ -1,186 +0,0 @@
-// 自定义样式文件   覆盖框架样式
-
-body{
-  font-size: 12px!important;
-  span,td,label,.ant-btn-sm{
-    font-size: 12px!important;
-  }
-  .ant-form-item-label > label{
-    color: #000!important;
-  }
-}
-// 查询条件样式
-.table-page-search-wrapper {
-  .ant-form.ant-form-inline{
-    .ant-form-item {
-      margin-bottom: 10px!important;
-      .ant-input,.ant-select-selection{
-        border-radius: 2px;
-        padding: 0px 11px;
-        font-size: 12px;
-      }
-      .ant-form-item-label{
-        line-height: 32px!important;
-        padding-right: 8px!important;
-      }
-      .ant-form-item-control{
-        line-height: 31px!important;
-      }
-      .ant-form-item-control-wrapper{
-        .ant-select-selection__rendered{
-          margin: 0!important;
-        }
-      }
-    }
-  }
-  .form-model-con.ant-form.ant-form-inline{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
-    // .ant-form-item {
-    //   margin-bottom: 16px!important;
-    //   .ant-form-explain{
-    //     font-size: 12px;
-    //   }
-    // }
-    .ant-form-item {
-      margin-bottom: 16px!important;
-      .ant-form-explain{
-        font-size: 12px;
-      }
-    }
-  }
-  .table-page-search-submitButtons {
-    margin-bottom: 9px;
-  }
-}
-// 菜单样式
-.sider {
-  .logo {
-    h1 {
-      font-size: 12px!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;
-    padding: 0 0 8px;
-  }
-  .table-operator-nobor{
-    padding: 0 0 10px 0;
-    button {
-      margin-right: 5px;
-    }
-  }
-  .affix-cont{
-    z-index: 99;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    text-align: center;
-    background-color: #fff;
-    padding: 7px 0 4px;
-    box-shadow: 0 0 20px #dcdee2;
-  }
-}
-// 页签样式
-.multi-tab-con{
-  .ant-tabs-nav-container{
-    height: 31px!important;
-    .ant-tabs-tab{
-      padding: 0 8px!important;
-      height: 30px!important;
-      line-height: 30px!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;
-        color: #000!important;
-        padding: 5px 5px 2px!important;
-      }
-    }
-  }
-  .ant-table-row{
-    .ant-table-row-cell-break-word, td{
-      padding: 2px 4px!important;
-      color: #000!important;
-    }
-    &:hover{
-      td{
-        background: #fff2f0!important;
-      }
-    }
-  }
-  .ant-pagination.ant-table-pagination{
-    margin: 10px 0 0;
-  }
-  .ant-table-small > .ant-table-content .ant-table-body,.ant-table-fixed-right,.ant-table-fixed-left{
-    margin: 0;
-    tr:hover{
-      td{
-        background: #fff2f0!important;
-      }
-    }
-  }
-}
-.sTable.fixPagination{
-  >.ant-table-wrapper{
-    height: 100%;
-    >.ant-spin-nested-loading{
-      height: 100%;
-      >.ant-spin-container{
-        height: 100%;
-        position: relative;
-        .ant-pagination.ant-table-pagination{
-          position: absolute;
-          right: 0;
-          bottom: 0;
-        }
-      }
-    }
-  }
-}

+ 79 - 7
src/components/global.less

@@ -8,6 +8,11 @@ body {
   &.userLayout {
     overflow: auto;
   }
+  .ant-modal-content{
+    .ant-form-item{
+      margin-bottom: 10px;
+    }
+  }
 }
 
 .layout.ant-layout {
@@ -538,6 +543,80 @@ body {
 .table-alert {
   margin-bottom: 16px;
 }
+// 内容样式
+.content {
+  .table-operator {
+    padding: 0 0 8px;
+    button {
+      margin-right: 8px;
+      margin-left: 0;
+    }
+  }
+  .table-operator-nobor{
+    padding: 0 0 10px 0;
+    button {
+      margin-right: 5px;
+    }
+  }
+  // 查询条件底部距离
+  .searchBox{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding: 10px 12px;
+      }
+    }
+  }
+  .searchBoxNormal{
+    margin-bottom: 6px;
+    &:first-child{
+      .ant-card-body{
+        padding: 10px 12px 0;
+      }
+    }
+  }
+  .flex-center{
+    display: flex;
+    align-items: center;
+  }
+  // 统计样式白底黑子
+  .tongji-bar{}
+  // 底部按钮浮动栏
+  .affix-cont{
+    z-index: 99;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    text-align: center;
+    background-color: #fff;
+    padding: 7px 0 4px;
+    box-shadow: 0 0 20px #dcdee2;
+  }
+}
+// 查询条件样式
+.table-page-search-wrapper {
+  .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
+    border:0;
+    box-shadow: none !important;
+  }
+  .ant-form.ant-form-inline .ant-form-item{
+    border:1px solid #dadada;
+    border-radius: 3px;
+    overflow: hidden;
+    margin-bottom: 10px!important;
+    .ant-form-item-label{
+      padding-left: 11px;
+      padding-right: 0!important;
+    }
+  }
+  .ant-input-group-addon{
+    border: 0;
+  }
+  .table-page-search-submitButtons {
+    margin-bottom: 9px;
+  }
+}
 
 .table-page-search-wrapper {
   .ant-form-inline {
@@ -563,11 +642,4 @@ body {
       }
     }
   }
-
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-  }
 }
- 

+ 9 - 63
src/components/index.less

@@ -194,38 +194,7 @@
     color: #3d80bf;
   }
 }
-// 查询条件样式
-.table-page-search-wrapper {
-  margin-bottom: 6px;
-  .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
-    border:0;
-    box-shadow: none !important;
-  }
-  .ant-form.ant-form-inline .ant-form-item{
-    border:1px solid #dadada;
-    border-radius: 3px;
-    overflow: hidden;
-    margin-bottom: 10px!important;
-    .ant-form-item-label{
-      padding-left: 11px;
-      padding-right: 0!important;
-    }
-  }
-  .ant-input-group-addon{
-    border: 0;
-  }
-  .form-model-con.ant-form.ant-form-inline{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
-    .ant-form-item {
-      margin-bottom: 16px!important;
-      .ant-form-explain{
-        font-size: 12px;
-      }
-    }
-  }
-  .table-page-search-submitButtons {
-    margin-bottom: 9px;
-  }
-}
+
 // 菜单样式
 .sider {
   .logo {
@@ -236,7 +205,7 @@
   .ant-menu{
     .ant-menu-submenu{
       .ant-menu-item{  //  二级菜单左侧缩进
-        padding-left: 30px!important;
+        padding-left: 20px!important;
       }
     }
   }
@@ -257,33 +226,7 @@
     }
   }
 }
-// 内容盒子样式
-.content {
-  .table-operator {
-    padding: 0 0 8px;
-    button {
-      margin-right: 8px;
-      margin-left: 0;
-    }
-  }
-  .table-operator-nobor{
-    padding: 0 0 10px 0;
-    button {
-      margin-right: 5px;
-    }
-  }
-  .affix-cont{
-    z-index: 99;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    text-align: center;
-    background-color: #fff;
-    padding: 7px 0 4px;
-    box-shadow: 0 0 20px #dcdee2;
-  }
-}
+
 .ant-descriptions-item > span{
     word-break: break-all!important;
   }
@@ -370,9 +313,12 @@
         height: 100%;
         position: relative;
         .ant-pagination.ant-table-pagination{
-          position: absolute;
-          right: 0;
-          bottom: 0;
+           float: none;
+           text-align: center;
+           position: absolute;
+           width: 100%;
+           left: 0;
+           bottom: 0;
         }
       }
     }

+ 3 - 2
src/config/router.config.js

@@ -1356,6 +1356,7 @@ export const asyncRouterMap = [
                 meta: {
                   title: '库存预警列表',
                   icon: 'alert',
+                  hidden: true,
                   permission: 'M_inventoryWarningList'
                 }
               }
@@ -1718,7 +1719,7 @@ export const asyncRouterMap = [
             name: 'salesDetails',
             component: BlankLayout,
             meta: {
-              title: '销售明细(开单统计)',
+              title: '销售明细(下推统计)',
               icon: 'profile',
               permission: 'M_salesDetailsList'
             },
@@ -1729,7 +1730,7 @@ export const asyncRouterMap = [
                 name: 'salesDetailsList',
                 component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesDetails/list.vue'),
                 meta: {
-                  title: '销售明细列表',
+                  title: '销售明细(下推统计)列表',
                   icon: 'profile',
                   hidden: true,
                   permission: 'M_salesDetailsList'

+ 0 - 1
src/layouts/BasicLayout.vue

@@ -137,7 +137,6 @@ export default {
     }
     this.collapsed = !this.sidebarOpened
     this.$store.dispatch('ToggleMultiTab', true)
-	  this.$store.dispatch('ToggleColor', '#1890FF')
   },
   mounted () {
     const userAgent = navigator.userAgent

+ 334 - 230
src/views/allocationManagement/allocateReturnConfirmation/list.vue

@@ -1,8 +1,8 @@
 <template>
-  <a-card size="small" :bordered="false" class="transferReturnConfirmation-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
+      <div ref="tableSearch" class="table-page-search-wrapper" >
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
@@ -12,35 +12,27 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="调拨退货单号">
-                <a-input id="transferReturnConfirmation-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
+                <a-input id="transferReturnConfirmation-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo"
+                  allowClear placeholder="请输入调拨退货单号" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="transferReturnConfirmation-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入客户名称"/>
+                <a-input id="transferReturnConfirmation-targetName" v-model.trim="queryParam.targetName" allowClear
+                  placeholder="请输入客户名称" />
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="是否抓单">
-                  <v-select
-                    v-model="queryParam.grabFlag"
-                    ref="grabFlag"
-                    id="transferReturnConfirmation-grabFlag"
-                    code="FLAG"
-                    placeholder="请选择"
-                    allowClear></v-select>
+                  <v-select v-model="queryParam.grabFlag" ref="grabFlag" id="transferReturnConfirmation-grabFlag"
+                    code="FLAG" placeholder="请选择" allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="transferReturnConfirmation-state"
-                    code="ALLOCATE_RETURN_STATE_CONFIRM"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
+                  <v-select v-model="queryParam.state" ref="state" id="transferReturnConfirmation-state"
+                    code="ALLOCATE_RETURN_STATE_CONFIRM" placeholder="请选择状态" allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -50,241 +42,353 @@
               </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturnConfirmation-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturnConfirmation-reset">重置</a-button>
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled"
+                id="transferReturnConfirmation-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled"
+                id="transferReturnConfirmation-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
+                <a-icon :type="advanced ? 'up' : 'down'" />
               </a>
             </a-col>
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table 
+        class="sTable fixPagination" 
+        ref="table" 
+        :style="{ height: tableHeight+70+'px' }" 
         size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 销退单号 -->
-        <template slot="allocateReturnNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('M_allocateReturnConfirmationDetail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateReturnNo }}</span>
-          <span v-else>{{ record.allocateReturnNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_allocateReturnConfirmationAudit')"
-            class="button-warning"
-            @click="handleAudit(record)"
-            id="transferReturnConfirmation-audit-btn">退货确认</a-button>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 查看 -->
-    <AllocateReturnDetailModal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
-  </a-card>
+        :rowKey="(record) => record.id" 
+        :columns="columns" 
+        :pageSize="30"
+        :data="loadData" :scroll="{ y: tableHeight }"
+        :defaultLoadData="false" bordered>
+          <!-- 销退单号 -->
+          <template slot="allocateReturnNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('M_allocateReturnConfirmationDetail')" class="link-bule"
+              @click="handleDetail(record)">{{ record.allocateReturnNo }}</span>
+            <span v-else>{{ record.allocateReturnNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button size="small" type="link"
+              v-if="record.state=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_allocateReturnConfirmationAudit')"
+              class="button-warning" @click="handleAudit(record)"
+              id="transferReturnConfirmation-audit-btn">退货确认</a-button>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 查看 -->
+      <AllocateReturnDetailModal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
-import { commonMixin } from '@/utils/mixin'
-import rangeDate from '@/views/common/rangeDate.vue'
-import { STable, VSelect } from '@/components'
-import AllocateReturnDetailModal from './detailModal.vue'
-import chooseWarehouse from '@/views/common/chooseWarehouse'
-import { allocateReturnQueryConfirmPage, allocateReturnFinanceAudit } from '@/api/allocateReturn'
-export default {
-  name: 'AllocateReturnConfirmationList',
-  mixins: [commonMixin],
-  components: { STable, VSelect, AllocateReturnDetailModal, rangeDate, chooseWarehouse },
-  data () {
-    return {
-      spinning: false,
-      tableHeight: 0,
-      queryParam: { //  查询条件
-        beginDate: '',
-        endDate: '',
-        allocateReturnNo: '', //  单号
-        targetName: '',
-        grabFlag: undefined,
-        state: undefined, //  状态
-        warehouseSn: undefined
+  import {
+    commonMixin
+  } from '@/utils/mixin'
+  import rangeDate from '@/views/common/rangeDate.vue'
+  import {
+    STable,
+    VSelect
+  } from '@/components'
+  import AllocateReturnDetailModal from './detailModal.vue'
+  import chooseWarehouse from '@/views/common/chooseWarehouse'
+  import {
+    allocateReturnQueryConfirmPage,
+    allocateReturnFinanceAudit
+  } from '@/api/allocateReturn'
+  export default {
+    name: 'AllocateReturnConfirmationList',
+    mixins: [commonMixin],
+    components: {
+      STable,
+      VSelect,
+      AllocateReturnDetailModal,
+      rangeDate,
+      chooseWarehouse
+    },
+    data() {
+      return {
+        spinning: false,
+        tableHeight: 0,
+        queryParam: { //  查询条件
+          beginDate: '',
+          endDate: '',
+          allocateReturnNo: '', //  单号
+          targetName: '',
+          grabFlag: undefined,
+          state: undefined, //  状态
+          warehouseSn: undefined
+        },
+        disabled: false, //  查询、重置按钮是否可操作
+        advanced: true,
+        // 加载数据方法 必须为 Promise 对象
+        loadData: parameter => {
+          this.disabled = true
+          this.spinning = true
+          return allocateReturnQueryConfirmPage(Object.assign(parameter, this.queryParam)).then(res => {
+            let data
+            if (res.status == 200) {
+              data = res.data
+              const no = (data.pageNo - 1) * data.pageSize
+              for (var i = 0; i < data.list.length; i++) {
+                data.list[i].no = no + i + 1
+              }
+              this.disabled = false
+            }
+            this.spinning = false
+            return data
+          })
+        },
+        openModal: false,
+        itemSn: ''
+      }
+    },
+    // 根据权限显示列表字段
+    computed: {
+      columns() {
+        const arr = [{
+            title: '序号',
+            dataIndex: 'no',
+            width: '4%',
+            align: 'center'
+          },
+          {
+            title: '创建时间',
+            dataIndex: 'createDate',
+            width: '11%',
+            align: 'center',
+            customRender: function(text) {
+              return text || '--'
+            }
+          },
+          {
+            title: '退货单号',
+            scopedSlots: {
+              customRender: 'allocateReturnNo'
+            },
+            width: '16%',
+            align: 'center'
+          },
+          {
+            title: '调拨退货客户',
+            dataIndex: 'targetName',
+            align: 'center',
+            width: '15%',
+            customRender: function(text) {
+              return text || '--'
+            },
+            ellipsis: true
+          },
+          {
+            title: '仓库',
+            dataIndex: 'warehouseName',
+            align: 'center',
+            width: '15%',
+            customRender: function(text) {
+              return text || '--'
+            },
+            ellipsis: true
+          },
+          {
+            title: '是否抓单',
+            dataIndex: 'grabFlagDictValue',
+            width: '7%',
+            align: 'center',
+            customRender: function(text) {
+              return text || '--'
+            }
+          },
+          {
+            title: '退货总数量',
+            dataIndex: 'totalQty',
+            width: '7%',
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '坏件数量',
+            dataIndex: 'totalBadQty',
+            width: '7%',
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '返库数量',
+            dataIndex: 'totalBackStockQty',
+            width: '7%',
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          // { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+          {
+            title: '确认时间',
+            dataIndex: 'financeAuditTime',
+            width: '11%',
+            align: 'center',
+            customRender: function(text) {
+              return text || '--'
+            }
+          },
+          {
+            title: '状态',
+            dataIndex: 'stateDictValue',
+            width: '6%',
+            align: 'center',
+            customRender: function(text) {
+              return text || '--'
+            }
+          },
+          {
+            title: '操作',
+            scopedSlots: {
+              customRender: 'action'
+            },
+            width: '8%',
+            align: 'center'
+          }
+        ]
+        if (this.$hasPermissions('M_allocateReturnConfirmationList_salesPrice')) { //  售价权限
+          arr.splice(9, 0, {
+            title: '退货总金额',
+            dataIndex: 'totalPrice',
+            width: '7%',
+            align: 'right',
+            customRender: text => ((text || text == 0) ? this.toThousands(text) : '--')
+          })
+        }
+        return arr
+      }
+    },
+    methods: {
+      //  创建时间  change
+      dateChange(date) {
+        this.queryParam.beginDate = date[0]
+        this.queryParam.endDate = date[1]
       },
-      disabled: false, //  查询、重置按钮是否可操作
-      advanced: true,
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        this.spinning = true
-        return allocateReturnQueryConfirmPage(Object.assign(parameter, this.queryParam)).then(res => {
-          let data
-          if (res.status == 200) {
-            data = res.data
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
+      custChange(val) {
+        this.queryParam.buyerSn = val.key
+      },
+      //  重置
+      resetSearchForm() {
+        this.$refs.rangeDate.resetDate()
+        this.queryParam.beginDate = ''
+        this.queryParam.endDate = ''
+        this.queryParam.allocateReturnNo = ''
+        this.queryParam.targetName = ''
+        this.queryParam.grabFlag = undefined
+        this.queryParam.state = undefined
+        this.queryParam.warehouseSn = undefined
+        this.$refs.table.refresh(true)
+      },
+      // 详情
+      handleDetail(row) {
+        this.itemSn = row.allocateReturnSn
+        this.openModal = true
+      },
+      closeModal() {
+        this.itemSn = ''
+        this.openModal = false
+      },
+      // 单个审核
+      handleAudit(row) {
+        const _this = this
+        this.$confirm({
+          title: '提示',
+          content: '请点击下方按钮确认操作',
+          centered: true,
+          closable: true,
+          okText: '通过',
+          cancelText: '不通过',
+          onOk() {
+            _this.auditOrder(row.allocateReturnSn, 'FINISH')
+          },
+          onCancel(e) {
+            if (!e.triggerCancel) {
+              _this.auditOrder(row.allocateReturnSn, 'FINANCIAL_REJECT')
             }
-            this.disabled = false
+            _this.$destroyAll()
           }
-          this.spinning = false
-          return data
         })
       },
-      openModal: false,
-      itemSn: ''
-    }
-  },
-  // 根据权限显示列表字段
-  computed: {
-    columns () {
-      const arr = [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单号', scopedSlots: { customRender: 'allocateReturnNo' }, width: '16%', align: 'center' },
-        { title: '调拨退货客户', dataIndex: 'targetName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓库', dataIndex: 'warehouseName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '是否抓单', dataIndex: 'grabFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '坏件数量', dataIndex: 'totalBadQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '返库数量', dataIndex: 'totalBackStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
-        { title: '确认时间', dataIndex: 'financeAuditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
-      ]
-      if (this.$hasPermissions('M_allocateReturnConfirmationList_salesPrice')) { //  售价权限
-        arr.splice(9, 0, { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-      }
-      return arr
-    }
-  },
-  methods: {
-    //  创建时间  change
-    dateChange (date) {
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
-    },
-    custChange (val) {
-      this.queryParam.buyerSn = val.key
-    },
-    //  重置
-    resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
-      this.queryParam.allocateReturnNo = ''
-      this.queryParam.targetName = ''
-      this.queryParam.grabFlag = undefined
-      this.queryParam.state = undefined
-      this.queryParam.warehouseSn = undefined
-      this.$refs.table.refresh(true)
-    },
-    // 详情
-    handleDetail (row) {
-      this.itemSn = row.allocateReturnSn
-      this.openModal = true
-    },
-    closeModal () {
-      this.itemSn = ''
-      this.openModal = false
-    },
-    // 单个审核
-    handleAudit (row) {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '请点击下方按钮确认操作',
-        centered: true,
-        closable: true,
-        okText: '通过',
-        cancelText: '不通过',
-        onOk () {
-          _this.auditOrder(row.allocateReturnSn, 'FINISH')
-        },
-        onCancel (e) {
-          if (!e.triggerCancel) {
-            _this.auditOrder(row.allocateReturnSn, 'FINANCIAL_REJECT')
+      auditOrder(sn, flag) {
+        const _this = this
+        _this.spinning = true
+        allocateReturnFinanceAudit({
+          allocateReturnSn: sn,
+          state: flag
+        }).then(res => {
+          if (res.status == 200) {
+            _this.$message.success(res.message)
+            _this.$refs.table.refresh()
+            _this.spinning = false
+          } else {
+            _this.spinning = false
           }
-          _this.$destroyAll()
-        }
-      })
+        })
+      },
+      pageInit() {
+        const _this = this
+        this.$nextTick(() => { // 页面渲染完成后的回调
+          _this.setTableH()
+        })
+      },
+      setTableH() {
+        const tableSearchH = this.$refs.tableSearch.offsetHeight
+        this.tableHeight = window.innerHeight - tableSearchH - 200
+      }
     },
-    auditOrder (sn, flag) {
-      const _this = this
-      _this.spinning = true
-      allocateReturnFinanceAudit({ allocateReturnSn: sn, state: flag }).then(res => {
-        if (res.status == 200) {
-          _this.$message.success(res.message)
-          _this.$refs.table.refresh()
-          _this.spinning = false
-        } else {
-          _this.spinning = false
-        }
-      })
+    watch: {
+      advanced(newValue, oldValue) {
+        const _this = this
+        this.$nextTick(() => { // 页面渲染完成后的回调
+          _this.setTableH()
+        })
+      },
+      '$store.state.app.winHeight'(newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+        this.setTableH()
+      }
     },
-    pageInit () {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
+    mounted() {
+      if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+        this.pageInit()
+        this.resetSearchForm()
+      }
     },
-    setTableH () {
-      const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 200
-    }
-  },
-  watch: {
-    advanced (newValue, oldValue) {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
+    activated() {
+      // 如果是新页签打开,则重置当前页面
+      if (this.$store.state.app.isNewTab) {
+        this.pageInit()
+        this.resetSearchForm()
+      }
+      // 仅刷新列表,不重置页面
+      if (this.$store.state.app.updateList) {
+        this.pageInit()
+        this.$refs.table.refresh()
+      }
     },
-    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.setTableH()
-    }
-  },
-  mounted () {
-    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.pageInit()
-      this.resetSearchForm()
-    }
-  },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.pageInit()
-      this.resetSearchForm()
+    beforeRouteEnter(to, from, next) {
+      next(vm => {})
     }
-    // 仅刷新列表,不重置页面
-    if (this.$store.state.app.updateList) {
-      this.pageInit()
-      this.$refs.table.refresh()
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {})
   }
-}
 </script>
 
 <style lang="less">
-  .transferReturnConfirmation-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
+  .transferReturnConfirmation-wrap {
+     
   }
-</style>
+</style>

+ 455 - 173
src/views/allocationManagement/allocationList/list.vue

@@ -1,169 +1,207 @@
 <template>
-  <a-card size="small" :bordered="false" class="pushOrder-wrap">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form-model
-        id="allocateBillList-form"
-        ref="ruleForm"
-        class="form-model-con"
-        layout="inline"
-        :rules="rules"
-        :model="queryParam"
-        @keyup.enter.native="handleSearch">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="创建时间" prop="time">
-              <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="调往对象">
-              <a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="费用/调拨类型">
-              <AllocateType id="allocateBillList-costTypeName" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
-            </a-form-model-item>
-          </a-col>
-          <template v-if="advanced">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form-model
+          id="allocateBillList-form"
+          ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
+          :rules="rules"
+          :model="queryParam"
+          @keyup.enter.native="handleSearch">
+          <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="收货客户名称">
-                <dealerSearchList ref="receiverSn" @change="custChange" />
+              <a-form-model-item label="创建时间" prop="time">
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="业务状态">
-                <v-select
-                  v-model="queryParam.state"
-                  ref="state"
-                  id="allocateBillList-state"
-                  code="ALLOCATE_STATUS2"
-                  placeholder="请选择业务状态"
+              <a-form-model-item label="调往对象">
+                <a-input
+                  id="allocateBillList-targetName"
+                  v-model.trim="queryParam.targetName"
                   allowClear
-                ></v-select>
+                  placeholder="请输入调往对象" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="调拨单号">
-                <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
+              <a-form-model-item label="费用/调拨类型">
+                <AllocateType
+                  id="allocateBillList-costTypeName"
+                  v-model="allocateTypeVal"
+                  :changeOnSelect="true"
+                  placeholder="请选择费用/调拨类型"
+                  @change="changeAllocatype"></AllocateType>
               </a-form-model-item>
             </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="收货客户名称">
+                  <dealerSearchList ref="receiverSn" @change="custChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="allocateBillList-state"
+                    code="ALLOCATE_STATUS2"
+                    placeholder="请选择业务状态"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="调拨单号">
+                  <a-input
+                    id="allocateBillList-allocateNo"
+                    v-model.trim="queryParam.allocateNo"
+                    allowClear
+                    placeholder="请输入调拨单号" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="调出仓库">
+                  <warehouse v-model="queryParam.warehouseSn" id="allocateBillList-warehouseSn" placeholder="请选择调出仓库" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="打印状态">
+                  <v-select
+                    v-model="queryParam.printState"
+                    ref="printState"
+                    id="allocateBillList-printState"
+                    code="PRINT_STATUS"
+                    placeholder="请选择打印状态"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="allocateBillList-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+            </template>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="调出仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  id="allocateBillList-warehouseSn"
-                  placeholder="请选择调出仓库"
-                />
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="打印状态">
-                <v-select
-                  v-model="queryParam.printState"
-                  ref="printState"
-                  id="allocateBillList-printState"
-                  code="PRINT_STATUS"
-                  placeholder="请选择打印状态"
-                  allowClear
-                ></v-select>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="对单状态">
-                <v-select
-                  v-model="queryParam.checkStatus"
-                  ref="checkStatus"
-                  id="allocateBillList-checkStatus"
-                  code="CHECK_STATUS"
-                  placeholder="请选择对单状态"
-                  allowClear
-                ></v-select>
-              </a-form-model-item>
+              <a-button
+                type="primary"
+                @click="handleSearch"
+                :disabled="disabled"
+                id="allocateBillList-refresh">查询</a-button>
+              <a-button
+                style="margin-left: 5px"
+                @click="resetSearchForm"
+                :disabled="disabled"
+                id="allocateBillList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'" />
+              </a>
             </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y:tableHeight, x:1890 }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 起止时间 -->
+          <template slot="promoDate" slot-scope="text, record">
+            <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~
+              {{ record.promoEndDate }}</span>
+            <span v-else>--</span>
           </template>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </div>
-
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y:tableHeight, x:1890 }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 起止时间 -->
-        <template slot="promoDate" slot-scope="text, record">
-          <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~ {{ record.promoEndDate }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 调拨单号 -->
-        <template slot="allocateNo" slot-scope="text, record">
-          <span class="link-bule" @click="handleDetail(record,2)">{{ record.allocateNo }}</span>
-        </template>
-        <!-- 发货单号  -->
-        <template slot="sendBillNo" slot-scope="text, record">
-          <span v-if="record.sendBill&&record.sendBill.sendBillNo" class="link-bule" @click="handleDetail(record,1)">{{ record.sendBill.sendBillNo }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 调拨类型 -->
-        <template slot="allocateType" slot-scope="text, record">
-          <div>
-            <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
-            <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
-            <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
-          </div>
-        </template>
-      </s-table>
-      <!-- 查看详情 -->
-      <commonModal
-        modalTit="调拨单详情"
-        bodyPadding="10px"
-        width="70%"
-        :showFooter="false"
-        :openModal="showDetailModal"
-        @cancel="showDetailModal = false">
-        <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
-      </commonModal>
-      <!-- 发货单详情 -->
-      <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false"></detailModal>
-    </a-spin>
-  </a-card>
-  </div></template>
+          <!-- 调拨单号 -->
+          <template slot="allocateNo" slot-scope="text, record">
+            <span class="link-bule" @click="handleDetail(record,2)">{{ record.allocateNo }}</span>
+          </template>
+          <!-- 发货单号  -->
+          <template slot="sendBillNo" slot-scope="text, record">
+            <span
+              v-if="record.sendBill&&record.sendBill.sendBillNo"
+              class="link-bule"
+              @click="handleDetail(record,1)">{{ record.sendBill.sendBillNo }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 调拨类型 -->
+          <template slot="allocateType" slot-scope="text, record">
+            <div>
+              <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
+              <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
+              <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
+            </div>
+          </template>
+        </s-table>
+        <!-- 查看详情 -->
+        <commonModal
+          modalTit="调拨单详情"
+          bodyPadding="10px"
+          width="70%"
+          :showFooter="false"
+          :openModal="showDetailModal"
+          @cancel="showDetailModal = false">
+          <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
+        </commonModal>
+        <!-- 发货单详情 -->
+        <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false"></detailModal>
+      </a-spin>
+    </a-card>
+  </div>
+</template>
 
 <script>
-import { commonMixin } from '@/utils/mixin'
+import {
+  commonMixin
+} from '@/utils/mixin'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { STable, VSelect } from '@/components'
+import {
+  STable,
+  VSelect
+} from '@/components'
 import commonModal from '@/views/common/commonModal.vue'
 import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
 import AllocateType from '@/views/common/allocateType.js'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
-import { queryOverviewPage } from '@/api/allocateBill'
+import {
+  queryOverviewPage
+} from '@/api/allocateBill'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 export default {
   name: 'PushOrderManagementList',
   mixins: [commonMixin],
-  components: { STable, VSelect, allocationDetailModal, AllocateType, warehouse, dealerSearchList, rangeDate, commonModal, detailModal },
+  components: {
+    STable,
+    VSelect,
+    allocationDetailModal,
+    AllocateType,
+    warehouse,
+    dealerSearchList,
+    rangeDate,
+    commonModal,
+    detailModal
+  },
   data () {
     return {
       spinning: false,
@@ -195,7 +233,11 @@ export default {
         warehouseSn: undefined
       },
       rules: {
-        'time': [{ required: true, message: '请选择退货完成时间', trigger: 'change' }]
+        'time': [{
+          required: true,
+          message: '请选择退货完成时间',
+          trigger: 'change'
+        }]
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -220,39 +262,279 @@ export default {
   computed: {
     columns () {
       const _this = this
-      const arr = [
-        { title: '创建时间', dataIndex: 'createDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
-        { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '150px', fixed: 'left' },
-        { title: '调往对象', dataIndex: 'targetName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
-        { title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
-        { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '120px', fixed: 'left' },
-        { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
-        { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总成本', dataIndex: 'totalCost', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
-        { title: '总售价', dataIndex: 'totalPrice', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
-        { title: '总数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '费用类型', dataIndex: 'costTypeName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨类型', scopedSlots: { customRender: 'allocateType' }, width: '100px', align: 'center' },
-        { title: '调出仓库', dataIndex: 'warehouseName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'stateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货创建时间', dataIndex: 'sendBill.createDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
+      const arr = [{
+        title: '创建时间',
+        dataIndex: 'createDate',
+        width: '130px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        },
+        fixed: 'left'
+      },
+      {
+        title: '起止时间',
+        scopedSlots: {
+          customRender: 'promoDate'
+        },
+        align: 'center',
+        width: '150px',
+        fixed: 'left'
+      },
+      {
+        title: '调往对象',
+        dataIndex: 'targetName',
+        width: '150px',
+        align: 'left',
+        customRender: function (text) {
+          return text || '--'
+        },
+        ellipsis: true,
+        fixed: 'left'
+      },
+      {
+        title: '省份',
+        dataIndex: 'provinceName',
+        align: 'center',
+        width: '80px',
+        customRender: function (text) {
+          return text || '--'
+        },
+        fixed: 'left'
+      },
+      {
+        title: '调拨单号',
+        scopedSlots: {
+          customRender: 'allocateNo'
+        },
+        align: 'center',
+        width: '120px',
+        fixed: 'left'
+      },
+      {
+        title: '发货单号',
+        scopedSlots: {
+          customRender: 'sendBillNo'
+        },
+        width: '120px',
+        align: 'center'
+      },
+      {
+        title: '客户类型',
+        dataIndex: 'dealerLevelDictValue',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '收货客户名称',
+        dataIndex: 'receiverName',
+        width: '150px',
+        align: 'left',
+        customRender: function (text) {
+          return text || '--'
+        },
+        ellipsis: true
+      },
+      {
+        title: '所在区域',
+        dataIndex: 'subareaArea.subareaName',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '所在分区',
+        dataIndex: 'subareaArea.subareaAreaName',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '总成本',
+        dataIndex: 'totalCost',
+        width: '80px',
+        align: 'right',
+        customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--')
+      },
+      {
+        title: '总售价',
+        dataIndex: 'totalPrice',
+        width: '80px',
+        align: 'right',
+        customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--')
+      },
+      {
+        title: '总数量',
+        dataIndex: 'totalQty',
+        width: '80px',
+        align: 'center',
+        customRender: function (text) {
+          return ((text || text == 0) ? text : '--')
+        }
+      },
+      {
+        title: '费用类型',
+        dataIndex: 'costTypeName',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '调拨类型',
+        scopedSlots: {
+          customRender: 'allocateType'
+        },
+        width: '100px',
+        align: 'center'
+      },
+      {
+        title: '调出仓库',
+        dataIndex: 'warehouseName',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '审核时间',
+        dataIndex: 'auditTime',
+        width: '130px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '业务状态',
+        dataIndex: 'stateDictValue',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '发货创建时间',
+        dataIndex: 'sendBill.createDate',
+        width: '130px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
 
-        { title: '发货状态', dataIndex: 'sendBill.sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '托运日期', dataIndex: 'sendBill.sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收货人', dataIndex: 'sendBill.customerCacateName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '物流电话', dataIndex: 'sendBill.transportTele', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '物流单号', dataIndex: 'sendBill.transportNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+      {
+        title: '发货状态',
+        dataIndex: 'sendBill.sendFlagDictValue',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '发货编号',
+        dataIndex: 'sendNo',
+        width: '80px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '托运日期',
+        dataIndex: 'sendBill.sendDate',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '收货人',
+        dataIndex: 'sendBill.customerCacateName',
+        width: '80px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        },
+        ellipsis: true
+      },
+      {
+        title: '物流电话',
+        dataIndex: 'sendBill.transportTele',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '物流单号',
+        dataIndex: 'sendBill.transportNo',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
 
-        { title: '总件数', dataIndex: 'sendBill.totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收货状态', dataIndex: 'sendBill.receiveFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收货时间', dataIndex: 'sendBill.receiveDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '物流情况', dataIndex: 'sendBill.transportStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'sendBill.transportRemark', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+      {
+        title: '总件数',
+        dataIndex: 'sendBill.totalQty',
+        width: '80px',
+        align: 'center',
+        customRender: function (text) {
+          return ((text || text == 0) ? text : '--')
+        }
+      },
+      {
+        title: '收货状态',
+        dataIndex: 'sendBill.receiveFlagDictValue',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '收货时间',
+        dataIndex: 'sendBill.receiveDate',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '物流情况',
+        dataIndex: 'sendBill.transportStateDictValue',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        }
+      },
+      {
+        title: '备注',
+        dataIndex: 'sendBill.transportRemark',
+        width: '100px',
+        align: 'center',
+        customRender: function (text) {
+          return text || '--'
+        },
+        ellipsis: true
+      }
       ]
       return arr
     }
@@ -340,7 +622,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 210
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {
@@ -376,8 +658,8 @@ export default {
 }
 </script>
 <style lang="less">
-  .pushOrder-wrap{
-    .sTable{
+  .pushOrder-wrap {
+    .sTable {
       margin-top: 10px;
     }
   }

+ 55 - 50
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="allocateBillList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -21,7 +21,7 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="4" :sm="24" v-show="isShowWarehouse">
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
                 <a-form-item label="调出仓库">
                   <warehouse
                     v-model="queryParam.warehouseSn"
@@ -31,7 +31,7 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select
                     v-model="queryParam.state"
@@ -48,7 +48,7 @@
                   <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="对单状态">
                   <v-select
                     v-model="queryParam.checkStatus"
@@ -72,47 +72,52 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        :scroll="{ y: tableHeight }"
-        bordered>
-        <!-- 单号 -->
-        <template slot="allocateNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('M_transferOut_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
-          <span v-else>{{ record.allocateNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.checkStatus == 'WAIT'&&$hasPermissions('B_YxAudit')"
-            class="button-warning"
-            @click="handleYxAudit(record)"
-            id="allocateBillList-checkStatus">对单通过</a-button>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 查看详情 -->
-    <commonModal
-      modalTit="调拨单详情"
-      bodyPadding="10px"
-      width="70%"
-      :showFooter="false"
-      :openModal="showDetailModal"
-      @cancel="cancelDetail">
-      <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
-    </commonModal>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :defaultLoadData="false"
+          :scroll="{ y: tableHeight }"
+          bordered>
+          <!-- 单号 -->
+          <template slot="allocateNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('M_transferOut_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
+            <span v-else>{{ record.allocateNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.checkStatus == 'WAIT'&&$hasPermissions('B_YxAudit')"
+              class="button-warning"
+              @click="handleYxAudit(record)"
+              id="allocateBillList-checkStatus">对单通过</a-button>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 查看详情 -->
+      <commonModal
+        modalTit="调拨单详情"
+        bodyPadding="10px"
+        width="70%"
+        :showFooter="false"
+        :openModal="showDetailModal"
+        @cancel="cancelDetail">
+        <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
+      </commonModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -157,7 +162,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, { authWarehouseFlag: 1 })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -184,7 +189,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '9%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -196,8 +201,8 @@ export default {
         { title: '对单时间', dataIndex: 'checkDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
-      if(this.isShowWarehouse){
-        arr.splice(4,0,{ title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },)
+      if (this.isShowWarehouse) {
+        arr.splice(4, 0, { title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
     }

+ 108 - 26
src/views/allocationManagement/transferOut/detail.vue

@@ -5,13 +5,18 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="allocateBillDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ basicInfoData&&basicInfoData.allocateNo }}</span>
           <a-button
             v-if="isEdit"
-            type="primary"
-            size="small"
-            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            type="link"
+            class="button-default"
             id="allocateBillDetail-edit-btn"
-            @click.stop="handleEdit">编辑</a-button>
+            @click.stop="handleEdit">
+            <a-icon type="edit"/>编辑
+          </a-button>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -25,7 +30,7 @@
             @click="handlePrint('dbPrint')">调拨打印</a-button>
           <a-button
             key="3"
-            type="default"
+            type="primary"
             class="button-info"
             v-if="$hasPermissions('B_transferOutType_print')"
             id="allocateBillDetail-dbfl-print-btn"
@@ -34,7 +39,7 @@
           <a-divider type="vertical" />
           <a-button
             key="2"
-            type="primary"
+            type="default"
             class="button-info"
             v-if="$hasPermissions('B_transferOut_detail_export')"
             id="allocateBillDetail-export-btn"
@@ -50,7 +55,61 @@
             @click="handlePrint('dbflExport')">调拨分类导出</a-button>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
+      <!-- 基础信息 -->
+      <div ref="tableSearch" v-if="!outBizSn">
+        <a-card size="small" :bordered="false" class="allocateBillDetail-cont" v-show="showDetail">
+          <div style="padding: 0;" ref="basicInformation">
+            <a-descriptions :column="4">
+              <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="费用类型">
+                {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
+              </a-descriptions-item>
+              <a-descriptions-item label="调拨类型">
+                <div>
+                  <span v-if="basicInfoData&&basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
+                  <span v-if="basicInfoData&&basicInfoData.allocateTypeName">/{{ basicInfoData.allocateTypeName || '--' }}</span>
+                </div>
+              </a-descriptions-item>
+              <a-descriptions-item label="费用归属品牌">
+                {{ (basicInfoData&&basicInfoData.productBrandName) || '--' }}
+              </a-descriptions-item>
+              <a-descriptions-item label="费用归属品类">
+                <div>
+                  <span v-if="basicInfoData&&basicInfoData.productTypeName1">{{ basicInfoData.productTypeName1 || '--' }}</span>
+                  <span v-else>--</span>
+                  <span v-if="basicInfoData&&basicInfoData.productTypeName2">/{{ basicInfoData.productTypeName2 || '--' }}</span>
+                  <span v-if="basicInfoData&&basicInfoData.productTypeName3">/{{ basicInfoData.productTypeName3 || '--' }}</span>
+                </div>
+              </a-descriptions-item>
+              <a-descriptions-item label="起止时间">
+                <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
+                <span v-else>--</span>
+              </a-descriptions-item>
+              <a-descriptions-item label="备注" :span="4">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="附件" :span="4">
+                <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
+                  <a
+                    target="_blank"
+                    style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
+                    :href="item.filePath"
+                    v-for="item in basicInfoData.attachmentList"
+                    :key="item.id">
+                    {{ item.fileName }}
+                  </a>
+                </div>
+                <span v-else>--</span>
+              </a-descriptions-item>
+            </a-descriptions>
+          </div>
+        </a-card>
+      </div>
+      <div ref="tableSearch" style="padding: 0 12px;" v-else>
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="4">
@@ -85,8 +144,8 @@
                 <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
                 <span v-else>--</span>
               </a-descriptions-item>
-              <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="附件" :span="3">
+              <a-descriptions-item label="备注" :span="4">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="附件" :span="4">
                 <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
                   <a
                     target="_blank"
@@ -102,16 +161,19 @@
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
+
       <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" style="margin-bottom:10px">
-          <div slot="message">
-            总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ;
-            <span v-if="$hasPermissions('M_transferOut_detail_costPrice')||$hasPermissions('M_tfoPrint_detail_costPrice')||$hasPermissions('M_mso_detail_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ;</span>
-            <span v-if="$hasPermissions('M_transferOut_detail_salesPrice')||$hasPermissions('M_tfoPrint_detail_salesPrice')||$hasPermissions('M_mso_detail_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>;</span>
-          </div>
-        </a-alert>
+        <div ref="countInfo">
+          <a-alert type="info" style="margin-bottom:10px">
+            <div slot="message">
+              总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ;
+              <span v-if="$hasPermissions('M_transferOut_detail_costPrice')||$hasPermissions('M_tfoPrint_detail_costPrice')||$hasPermissions('M_mso_detail_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ;</span>
+              <span v-if="$hasPermissions('M_transferOut_detail_salesPrice')||$hasPermissions('M_tfoPrint_detail_salesPrice')||$hasPermissions('M_mso_detail_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>;</span>
+            </div>
+          </a-alert>
+        </div>
         <!-- 列表 -->
         <s-table
           class="sTable"
@@ -120,6 +182,8 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :style="{ height:outBizSn? '380px': tableHeight+70+'px' }"
+          :scroll="{ y:outBizSn?380: tableHeight }"
           :defaultLoadData="false"
           bordered>
         </s-table>
@@ -176,7 +240,9 @@ export default {
       productTotal: null, //  合计
       localDataSource: [],
       openModal: false,
-      nowType: null
+      nowType: null,
+      showDetail: false,
+      tableHeight: 0
     }
   },
   computed: {
@@ -187,18 +253,18 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调出数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('M_transferOut_detail_costPrice')||this.$hasPermissions('M_tfoPrint_detail_salesPrice')||this.$hasPermissions('M_mso_detail_costPrice')) { // 成本价权限
+      if (this.$hasPermissions('M_transferOut_detail_costPrice') || this.$hasPermissions('M_tfoPrint_detail_salesPrice') || this.$hasPermissions('M_mso_detail_costPrice')) { // 成本价权限
         arr.splice(5, 0, { title: '成本价', dataIndex: 'cost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(8, 0, { title: '成本小计', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('M_transferOut_detail_salesPrice')||this.$hasPermissions('M_tfoPrint_detail_salesPrice')||this.$hasPermissions('M_mso_detail_salesPrice')) { //  售价权限
-        const ind = this.$hasPermissions('M_transferOut_detail_costPrice')||this.$hasPermissions('M_tfoPrint_detail_costPrice') ? 6 : 5
+      if (this.$hasPermissions('M_transferOut_detail_salesPrice') || this.$hasPermissions('M_tfoPrint_detail_salesPrice') || this.$hasPermissions('M_mso_detail_salesPrice')) { //  售价权限
+        const ind = this.$hasPermissions('M_transferOut_detail_costPrice') || this.$hasPermissions('M_tfoPrint_detail_costPrice') ? 6 : 5
         arr.splice(ind, 0, { title: '售价', dataIndex: 'price', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(ind + 3, 0, { title: '售价小计', dataIndex: 'totalPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
@@ -206,6 +272,17 @@ export default {
       return arr
     }
   },
+  watch: {
+    showDetail (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   methods: {
     //  返回列表
     handleBack () {
@@ -278,6 +355,11 @@ export default {
       this.$refs.table.refresh(true)
       this.getDetail()
       this.getDetailCount()
+      this.setTableH()
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 280
     }
   },
   mounted () {
@@ -291,7 +373,7 @@ export default {
       this.pageInit()
     }
   },
-  deactivated(){
+  deactivated () {
     this.$store.state.app.curActionPermission = ''
   },
   beforeRouteEnter (to, from, next) {
@@ -303,10 +385,10 @@ export default {
 <style lang="less">
   .allocateBillDetail-wrap{
     .allocateBillDetail-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .allocateBillDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 82 - 88
src/views/allocationManagement/transferOut/edit.vue

@@ -5,6 +5,10 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="allocateBillEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ basicInfoData&&basicInfoData.allocateNo }}</span>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -43,68 +47,64 @@
             @click="handlePrint('dbflExport')">调拨分类导出</a-button>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['0']">
-          <a-collapse-panel key="0" header="基础信息">
-            <a-descriptions :column="4">
-              <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-            <a-divider>以下信息可修改,请点击<span style="color: dodgerblue;font-size: 14px;cursor: pointer;" @click="editRemark = true" ><a-icon type="form" title="编辑基础信息" />编辑</span></a-divider>
-            <a-descriptions :column="4">
-              <a-descriptions-item label="费用类型">
-                {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="调拨类型">
-                <div>
-                  <span v-if="basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
-                  <span v-if="basicInfoData.allocateTypeName">/{{ basicInfoData.allocateTypeName || '--' }}</span>
-                </div>
-              </a-descriptions-item>
-              <a-descriptions-item label="费用归属品牌">
-                {{ (basicInfoData&&basicInfoData.productBrandName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="费用归属品类">
-                <div>
-                  <span v-if="basicInfoData.productTypeName1">{{ basicInfoData.productTypeName1 || '--' }}</span>
-                  <span v-else>--</span>
-                  <span v-if="basicInfoData.productTypeName2">/{{ basicInfoData.productTypeName2 || '--' }}</span>
-                  <span v-if="basicInfoData.productTypeName3">/{{ basicInfoData.productTypeName3 || '--' }}</span>
-                </div>
-              </a-descriptions-item>
-              <a-descriptions-item label="起止时间">
-                <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
-                <span v-else>--</span>
-              </a-descriptions-item>
-              <a-descriptions-item label="备注" :span="3">
-                {{ (basicInfoData&&basicInfoData.remark||'--') }}
-              </a-descriptions-item>
-              <a-descriptions-item label="附件" :span="4">
-                <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
-                  <a
-                    target="_blank"
-                    style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
-                    :href="item.filePath"
-                    v-for="item in basicInfoData.attachmentList"
-                    :key="item.id">
-                    {{ item.fileName }}
-                  </a>
-                </div>
+      <a-card size="small" :bordered="false" v-show="showDetail" class="allocateBillEdit-cont">
+        <div v-if="basicInfoData">
+          <a-descriptions :column="4">
+            <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
+          </a-descriptions>
+          <a-divider>以下信息可修改,请点击<span style="color: dodgerblue;font-size: 14px;cursor: pointer;" @click="editRemark = true" ><a-icon type="form" title="编辑基础信息" />编辑</span></a-divider>
+          <a-descriptions :column="4">
+            <a-descriptions-item label="费用类型">
+              {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="调拨类型">
+              <div>
+                <span v-if="basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
+                <span v-if="basicInfoData.allocateTypeName">/{{ basicInfoData.allocateTypeName || '--' }}</span>
+              </div>
+            </a-descriptions-item>
+            <a-descriptions-item label="费用归属品牌">
+              {{ (basicInfoData&&basicInfoData.productBrandName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="费用归属品类">
+              <div>
+                <span v-if="basicInfoData.productTypeName1">{{ basicInfoData.productTypeName1 || '--' }}</span>
                 <span v-else>--</span>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+                <span v-if="basicInfoData.productTypeName2">/{{ basicInfoData.productTypeName2 || '--' }}</span>
+                <span v-if="basicInfoData.productTypeName3">/{{ basicInfoData.productTypeName3 || '--' }}</span>
+              </div>
+            </a-descriptions-item>
+            <a-descriptions-item label="起止时间">
+              <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
+              <span v-else>--</span>
+            </a-descriptions-item>
+            <a-descriptions-item label="备注" :span="3">
+              {{ (basicInfoData&&basicInfoData.remark||'--') }}
+            </a-descriptions-item>
+            <a-descriptions-item label="附件" :span="4">
+              <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
+                <a
+                  target="_blank"
+                  style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
+                  :href="item.filePath"
+                  v-for="item in basicInfoData.attachmentList"
+                  :key="item.id">
+                  {{ item.fileName }}
+                </a>
+              </div>
+              <span v-else>--</span>
+            </a-descriptions-item>
+          </a-descriptions>
+        </div>
       </a-card>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" :forceRender="true" header="选择产品">
+      <a-card size="small" title="选择产品" :bordered="false" class="allocateBillEdit-cont">
             <!-- 筛选条件 -->
             <div class="table-page-search-wrapper">
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -167,13 +167,9 @@
                 >添加</a-button>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['2']">
-          <a-collapse-panel key="2" :forceRender="true" header="已选产品">
+      <a-card size="small" title="已选产品" :bordered="false" class="allocateBillEdit-cont">
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
@@ -209,12 +205,11 @@
               <a-col :span="8" style="text-align: right;">
                 <span v-if="selNums">已选{{ selNums }}项</span>
                 <a-button
-                  style="margin:0 15px;"
-                  size="small"
+                  style="margin:0 10px;"
                   id="salesEdit-plDel-btn"
                   @click="openPlSet">批量设置费用归属</a-button>
-                <a-button size="small" id="allocateBillEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
-                <a-button size="small" type="danger" style="margin-left: 5px" @click.stop="handleDel('', 'all')" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
+                <a-button id="allocateBillEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
+                <a-button type="danger" style="margin-left: 10px" @click.stop="handleDel('', 'all')" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
               </a-col>
             </a-row>
             <!-- 列表 -->
@@ -293,8 +288,6 @@
                   id="allocateBillEdit-del-btn">删除</a-button>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
     </div>
     <div class="affix-cont" v-if="basicInfoData">
@@ -368,6 +361,7 @@ export default {
       showDsModal: false,
       editRemark: false,
       showPlModal: false,
+      showDetail: false, // 基础信息
       queryParam: {
         productCode: '',
         productName: '',
@@ -438,22 +432,22 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', width: '26%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存数量', dataIndex: 'currentStockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '8%', align: 'center' },
+        { title: '库存数量', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '6%', align: 'center' },
         { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action1' }, width: '10%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action1' }, width: '6%', align: 'center' }
       ]
       if (this.$hasPermissions('M_transferOut_edit_costPrice')) { //  成本价权限
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'lastStockCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_transferOut_edit_salesPrice')) { //  售价权限
         const ind = this.$hasPermissions('M_transferOut_edit_costPrice') ? 5 : 4
-        arr.splice(ind, 0, { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(ind, 0, { title: '售价', dataIndex: 'productPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     },
@@ -461,23 +455,23 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'center' },
-        { title: '库存数量', dataIndex: 'currentStockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '10%', align: 'center' },
+        { title: '库存数量', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '6%', align: 'center' },
         { title: '费用归属部门', scopedSlots: { customRender: 'department' }, width: '10%', align: 'center' },
-        { title: '单位', dataIndex: 'productEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.$hasPermissions('M_transferOut_edit_costPrice')) { //  成本价权限
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'cost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'cost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_transferOut_edit_salesPrice')) { //  售价权限
         const ind = this.$hasPermissions('M_transferOut_edit_costPrice') ? 5 : 4
-        arr.splice(ind, 0, { title: '售价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'right' })
+        arr.splice(ind, 0, { title: '售价', scopedSlots: { customRender: 'price' }, width: '6%', align: 'right' })
       }
       return arr
     }
@@ -820,10 +814,10 @@ export default {
         padding-bottom: 50px;
     }
     .allocateBillEdit-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .allocateBillEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 92 - 88
src/views/allocationManagement/transferOut/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="allocateBillList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -98,95 +98,99 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_transferOut_add')" id="allocateBillList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        :scroll="{ y: tableHeight }"
-        bordered>
-        <!-- 单号 -->
-        <template slot="allocateNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('M_transferOut_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
-          <span v-else>{{ record.allocateNo }}</span>
-        </template>
-        <!-- 起止时间 -->
-        <template slot="promoDate" slot-scope="text, record">
-          <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~ {{ record.promoEndDate }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 调拨类型 -->
-        <template slot="allocateType" slot-scope="text, record">
-          <div>
-            <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
-            <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
-            <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
-          </div>
-        </template>
-        <!-- 打印状态 -->
-        <template slot="printStateWord" slot-scope="text, record">
-          <span v-if="record.printState">
-            <span v-if="record.printState=='NO_PRINT'||record.printState=='PRINT'">{{ record.printStateDictValue }}</span>
-            <span @click="handlePrint(record)" class="link-bule" v-else>{{ record.printStateDictValue }}</span>
-          </span>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <!-- <a-button
+    </a-card>
+    <a-card size="small" :bordered="false" style="margin-top:6px;">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button v-if="$hasPermissions('B_transferOut_add')" id="allocateBillList-add" type="primary" @click="openModal=true">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ y: tableHeight }"
+          bordered>
+          <!-- 单号 -->
+          <template slot="allocateNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('M_transferOut_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
+            <span v-else>{{ record.allocateNo }}</span>
+          </template>
+          <!-- 起止时间 -->
+          <template slot="promoDate" slot-scope="text, record">
+            <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~ {{ record.promoEndDate }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 调拨类型 -->
+          <template slot="allocateType" slot-scope="text, record">
+            <div>
+              <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
+              <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
+              <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
+            </div>
+          </template>
+          <!-- 打印状态 -->
+          <template slot="printStateWord" slot-scope="text, record">
+            <span v-if="record.printState">
+              <span v-if="record.printState=='NO_PRINT'||record.printState=='PRINT'">{{ record.printStateDictValue }}</span>
+              <span @click="handlePrint(record)" class="link-bule" v-else>{{ record.printStateDictValue }}</span>
+            </span>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <!-- <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT' && record.printState!='UNABLE_PRINT' && record.printState!='NO_PRINT' && $hasPermissions('B_tfo_yxPrint')"
             class="button-warning"
             @click="handleYxPrint(record)"
             id="allocateBillList-examine-btn">允许打印</a-button> -->
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferOut_audit')"
-            class="button-warning"
-            @click="handleExamine(record)"
-            id="allocateBillList-examine-btn">审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('M_transferOut_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="allocateBillList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferOut_del')"
-            class="button-error"
-            @click="handleDel(record)"
-            id="allocateBillList-del-btn">删除</a-button>
-          <span v-if="((record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'AUDIT_REJECT'))||(!$hasPermissions('B_transferOut_audit') && !$hasPermissions('M_transferOut_edit') && !$hasPermissions('B_transferOut_del'))">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增 -->
-    <basic-info-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
-    <!-- 审核 -->
-    <auditModal
-      v-drag
-      :openModal="visibleAudit"
-      :spinning="spinningAudit"
-      @close="visibleAudit=false"
-      @ok="auditOrder('WAIT_OUT_WAREHOUSE')"
-      @fail="auditOrder('AUDIT_REJECT')" />
-    <!-- 打印状态 -->
-    <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="cancelModal"></printModal>
-  </a-card>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferOut_audit')"
+              class="button-warning"
+              @click="handleExamine(record)"
+              id="allocateBillList-examine-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('M_transferOut_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="allocateBillList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferOut_del')"
+              class="button-error"
+              @click="handleDel(record)"
+              id="allocateBillList-del-btn">删除</a-button>
+            <span v-if="((record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'AUDIT_REJECT'))||(!$hasPermissions('B_transferOut_audit') && !$hasPermissions('M_transferOut_edit') && !$hasPermissions('B_transferOut_del'))">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增 -->
+      <basic-info-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+      <!-- 审核 -->
+      <auditModal
+        v-drag
+        :openModal="visibleAudit"
+        :spinning="spinningAudit"
+        @close="visibleAudit=false"
+        @ok="auditOrder('WAIT_OUT_WAREHOUSE')"
+        @fail="auditOrder('AUDIT_REJECT')" />
+      <!-- 打印状态 -->
+      <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="cancelModal"></printModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -238,7 +242,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, { authWarehouseFlag: 1 })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -272,7 +276,7 @@ export default {
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用类型', dataIndex: 'costTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -439,7 +443,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 242
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     },
     handlePrint (item) {
       const obj = {

+ 1 - 1
src/views/allocationManagement/transferReturn/check.vue

@@ -277,7 +277,7 @@ export default {
       height: 100%;
     }
     .salesReturnCheck-cont{
-      margin-top: 10px;
+      margin-top: 6px;
       .sTable{
         margin-top: 10px;
       }

+ 87 - 45
src/views/allocationManagement/transferReturn/detail.vue

@@ -7,42 +7,66 @@
           <a id="allocateBillDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a-button
             v-if="isEdit"
-            type="primary"
-            size="small"
-            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            type="link"
+            class="button-default"
             id="allocateBillDetail-edit-btn"
-            @click.stop="handleEdit">编辑</a-button>
+            @click.stop="handleEdit">
+            <a-icon type="edit"/>编辑
+          </a-button>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="pageType=='pages'">
           <print :params="{allocateReturnSn: $route.params.sn || outBizSn}" :basicInfoData="basicInfoData" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调入仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="费用类型">
-                {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="调拨退货类型">
-                <div>
-                  <span v-if="basicInfoData&&basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
-                  <span v-if="basicInfoData&&basicInfoData.allocateReturnTypeName">/{{ basicInfoData.allocateReturnTypeName || '--' }}</span>
-                </div>
-              </a-descriptions-item>
-              <a-descriptions-item label="是否抓单">{{ basicInfoData&&basicInfoData.grabFlagDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remarks) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
-      </a-card>
-      <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
+      <div ref="tableSearch">
+        <a-card size="small" :bordered="false" :class="pageType=='pages'?'allocateBillDetail-cont':''" v-show="showDetail">
+          <a-descriptions :column="3" v-if="pageType=='pages'">
+            <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调入仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="费用类型">
+              {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="调拨退货类型">
+              <div>
+                <span v-if="basicInfoData&&basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
+                <span v-if="basicInfoData&&basicInfoData.allocateReturnTypeName">/{{ basicInfoData.allocateReturnTypeName || '--' }}</span>
+              </div>
+            </a-descriptions-item>
+            <a-descriptions-item label="是否抓单">{{ basicInfoData&&basicInfoData.grabFlagDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remarks) || '--' }}</a-descriptions-item>
+          </a-descriptions>
+          <a-collapse :activeKey="['1']" v-else>
+            <a-collapse-panel key="1" header="基础信息">
+              <a-descriptions :column="3">
+                <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
+                <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
+                <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+                <a-descriptions-item label="调入仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
+                <a-descriptions-item label="费用类型">
+                  {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
+                </a-descriptions-item>
+                <a-descriptions-item label="调拨退货类型">
+                  <div>
+                    <span v-if="basicInfoData&&basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
+                    <span v-if="basicInfoData&&basicInfoData.allocateReturnTypeName">/{{ basicInfoData.allocateReturnTypeName || '--' }}</span>
+                  </div>
+                </a-descriptions-item>
+                <a-descriptions-item label="是否抓单">{{ basicInfoData&&basicInfoData.grabFlagDictValue || '--' }}</a-descriptions-item>
+                <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+                <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remarks) || '--' }}</a-descriptions-item>
+              </a-descriptions>
+            </a-collapse-panel>
+          </a-collapse>
+        </a-card>
+      </div>
+      <a-card size="small" :bordered="false">
         <!-- 总计 -->
         <a-alert type="info" style="margin-bottom:10px">
           <div slot="message">
@@ -60,6 +84,8 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :style="{ height:outBizSn? '260px': tableHeight+70+'px' }"
+          :scroll="{ y:outBizSn?260: tableHeight }"
           :defaultLoadData="false"
           bordered>
         </s-table>
@@ -82,7 +108,7 @@ export default {
       type: [Number, String],
       default: ''
     },
-    showPrice:{
+    showPrice: {
       type: Boolean,
       default: false
     },
@@ -114,7 +140,9 @@ export default {
       basicInfoData: null, //  基本信息
       localDataSource: [],
       openModal: false,
-      nowType: null
+      nowType: null,
+      showDetail: true,
+      tableHeight: 0
     }
   },
   computed: {
@@ -125,8 +153,8 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '27%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'product.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货数量', dataIndex: 'returnQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -136,14 +164,30 @@ export default {
       if (this.basicInfoData && this.basicInfoData.grabFlag == '1') {
         arr.splice(1, 0, { title: '调拨单号', dataIndex: 'allocateNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
       }
-      if(this.showPrice||this.$hasPermissions('M_transferReturnDetail_salesPrice')){
+      if (this.showPrice || this.$hasPermissions('M_transferReturnDetail_salesPrice')) {
         const ind = this.basicInfoData && this.basicInfoData.grabFlag == '1' ? 1 : 0
-        arr.splice(4+ind,0,{ title: '退货单价', dataIndex: 'price', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(8+ind,0,{ title: '退货金额', dataIndex: 'totalReturnPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(4 + ind, 0, { title: '退货单价', dataIndex: 'price', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8 + ind, 0, { title: '退货金额', dataIndex: 'totalReturnPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
   },
+  watch: {
+    showDetail (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    },
+    outBizSn (newValue, oldValue) {
+      if (newValue) {
+        this.pageInit()
+      }
+    }
+  },
   methods: {
     //  返回列表
     handleBack () {
@@ -168,7 +212,12 @@ export default {
       if (this.outBizSn || this.$route.params.sn) {
         this.$refs.table.refresh(true)
         this.getDetail()
+        this.setTableH()
       }
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 285
     }
   },
   mounted () {
@@ -182,13 +231,6 @@ export default {
       this.pageInit()
     }
   },
-  watch: {
-    outBizSn (newValue, oldValue) {
-      if (newValue) {
-        this.pageInit()
-      }
-    }
-  },
   beforeRouteEnter (to, from, next) {
     next(vm => {})
   }
@@ -198,10 +240,10 @@ export default {
 <style lang="less">
   .allocateBillDetail-wrap{
     .allocateBillDetail-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .allocateBillDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 58 - 62
src/views/allocationManagement/transferReturn/edit.vue

@@ -6,53 +6,51 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="allocateBillEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ basicInfoData&&basicInfoData.allocateReturnNo }}</span>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
           <print :params="{allocateReturnSn: $route.params.sn || outBizSn}" :basicInfoData="basicInfoData" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['0']">
-          <a-collapse-panel key="0" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调入仓库">
-                <!-- <warehouse
-                style="width:200px;"
-                :allowClear="false"
-                  v-model="basicInfoData.warehouseSn"
-                  @change="updateWarehouse"
-                  id="basicInfo-warehouseSn"
-                  placeholder="请选择调入仓库"
-                /> -->
-                {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="费用/调拨退货类型">
-                <AllocateType
-                  id="allocateEdit-allocateReturnTypeSn"
-                  style="width: 220px;"
-                  v-model="allocateTypeVal"
-                  :allowClear="false"
-                  placeholder="请选择费用/调拨退货类型"
-                  @change="changeAllocateType"></AllocateType>
-              </a-descriptions-item>
-              <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.grabFlagDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注">
-                {{ (basicInfoData&&basicInfoData.remarks) }}
-                <a-icon type="form" title="编辑备注" @click="editRemark = true" style="color: dodgerblue;font-size: 14px;" />
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont" v-show="showDetail">
+        <a-descriptions :column="3">
+          <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="调入仓库">
+            <!-- <warehouse
+          style="width:200px;"
+          :allowClear="false"
+            v-model="basicInfoData.warehouseSn"
+            @change="updateWarehouse"
+            id="basicInfo-warehouseSn"
+            placeholder="请选择调入仓库"
+          /> -->
+            {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
+          </a-descriptions-item>
+          <a-descriptions-item label="费用/调拨退货类型">
+            <AllocateType
+              id="allocateEdit-allocateReturnTypeSn"
+              style="width: 220px;"
+              v-model="allocateTypeVal"
+              :allowClear="false"
+              placeholder="请选择费用/调拨退货类型"
+              @change="changeAllocateType"></AllocateType>
+          </a-descriptions-item>
+          <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.grabFlagDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="备注">
+            {{ (basicInfoData&&basicInfoData.remarks) }}
+            <a-icon type="form" title="编辑备注" @click="editRemark = true" style="color: dodgerblue;font-size: 14px;" />
+          </a-descriptions-item>
+        </a-descriptions>
       </a-card>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" :forceRender="true" header="选择产品">
+      <a-card size="small" title="选择产品" :bordered="false" class="allocateBillEdit-cont">
             <!-- 筛选条件 -->
             <div class="table-page-search-wrapper">
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -126,13 +124,9 @@
                 <span v-else>--</span>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['2']">
-          <a-collapse-panel key="2" :forceRender="true" header="已选产品">
+      <a-card size="small" title="已选产品" :bordered="false" class="allocateBillEdit-cont">
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
@@ -211,8 +205,6 @@
                 <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="allocateBillEdit-del-btn">删除</a-button>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
     <!-- </a-spin> -->
     </div>
@@ -299,7 +291,7 @@ export default {
         this.disabled = true
         const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
         const warehouseSn = this.basicInfoData.warehouseSn
-        return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel, warehouseSn: warehouseSn})).then(res => {
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel, warehouseSn: warehouseSn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -334,15 +326,16 @@ export default {
       openGuideModal: false, //  导入产品引导
       openModal: false,
       nowType: null,
-      allocateTypeVal: []
+      allocateTypeVal: [],
+      showDetail: false
     }
   },
-  computed:{
-    columns(){
+  computed: {
+    columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'left', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
         { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
@@ -350,20 +343,20 @@ export default {
       ]
       return arr
     },
-    chooseColumns(){
+    chooseColumns () {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', align: 'left', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
         { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      
-      arr.splice(6,0,{ title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-     
+
+      arr.splice(6, 0, { title: '退货金额', dataIndex: 'totalReturnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+
       return arr
     }
   },
@@ -383,7 +376,7 @@ export default {
       _this.editRemark = false
     },
     // 修改仓库
-    updateWarehouse(warehouseSn){
+    updateWarehouse (warehouseSn) {
       this.basicInfoData.warehouseSn = warehouseSn
       this.handleEditRemark(true)
     },
@@ -542,7 +535,7 @@ export default {
           if (this.basicInfoData.costTypeSn) {
             this.allocateTypeVal = [this.basicInfoData.costTypeSn, this.basicInfoData.allocateSortSn, this.basicInfoData.allocateReturnTypeSn]
           }
-          if(flag){
+          if (flag) {
             this.$refs.table.refresh()
           }
         } else {
@@ -606,10 +599,13 @@ export default {
       padding-bottom: 51px;
     }
     .allocateBillEdit-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
+      .ant-page-header-heading-sub-title{
+        margin:0;
+      }
     }
     .allocateBillEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 45 - 47
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -6,52 +6,52 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="editGrap-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ basicInfoData&&basicInfoData.allocateReturnNo }}</span>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
           <print :params="{allocateReturnSn: $route.params.sn}" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" v-if="basicInfoData" class="editGrap-cont">
-        <a-collapse :activeKey="['0']">
-          <a-collapse-panel key="0" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调入仓库">
-                <!-- <warehouse
-                style="width:200px;"
-                :allowClear="false"
-                  v-model="basicInfoData.warehouseSn"
-                  @change="updateWarehouse"
-                  id="basicInfo-warehouseSn"
-                  placeholder="请选择调入仓库"
-                /> -->
-                {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="费用/调拨退货类型">
-                <AllocateType
-                  id="allocateEdit-allocateReturnTypeSn"
-                  style="width: 220px;"
-                  v-model="allocateTypeVal"
-                  placeholder="请选择费用/调拨退货类型"
-                  @change="changeAllocateType"></AllocateType>
-              </a-descriptions-item>
-              <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.grabFlagDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注">
-                {{ (basicInfoData&&basicInfoData.remarks) }}
-                <a-icon type="form" title="编辑备注" @click="editRemark = true" style="color: dodgerblue;font-size: 14px;" />
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" v-show="showDetail" class="editGrap-cont">
+        <div v-if="basicInfoData">
+          <a-descriptions :column="3">
+            <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调入仓库">
+              <!-- <warehouse
+              style="width:200px;"
+              :allowClear="false"
+                v-model="basicInfoData.warehouseSn"
+                @change="updateWarehouse"
+                id="basicInfo-warehouseSn"
+                placeholder="请选择调入仓库"
+              /> -->
+              {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="费用/调拨退货类型">
+              <AllocateType
+                id="allocateEdit-allocateReturnTypeSn"
+                style="width: 220px;"
+                v-model="allocateTypeVal"
+                placeholder="请选择费用/调拨退货类型"
+                @change="changeAllocateType"></AllocateType>
+            </a-descriptions-item>
+            <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.grabFlagDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="备注">
+              {{ (basicInfoData&&basicInfoData.remarks) }}
+              <a-icon type="form" title="编辑备注" @click="editRemark = true" style="color: dodgerblue;font-size: 14px;" />
+            </a-descriptions-item>
+          </a-descriptions>
+        </div>
       </a-card>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="editGrap-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" :forceRender="true" header="选择产品">
+      <a-card size="small" title="选择产品" :bordered="false" class="editGrap-cont">
             <!-- 筛选条件 -->
             <div class="table-page-search-wrapper" style="display:flex;align-items: center;">
               <div style="margin-bottom: 10px;padding-right: 20px;">
@@ -127,13 +127,9 @@
                 <span v-else>--</span>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="editGrap-cont">
-        <a-collapse :activeKey="['2']">
-          <a-collapse-panel key="2" :forceRender="true" header="已选产品">
+      <a-card size="small" title="已选产品" :bordered="false" class="editGrap-cont">
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
@@ -201,8 +197,6 @@
                 <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="editGrap-del-btn">删除</a-button>
               </template>
             </s-table>
-          </a-collapse-panel>
-        </a-collapse>
       </a-card>
     <!--</a-spin>-->
     </div>
@@ -269,6 +263,7 @@ export default {
   data () {
     return {
       spinning: false,
+      showDetail: false,
       queryParam: {
         productCode: '',
         productName: '',
@@ -655,10 +650,13 @@ export default {
       padding-bottom: 51px;
     }
     .editGrap-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
+      .ant-page-header-heading-sub-title{
+        margin:0;
+      }
     }
     .editGrap-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 75 - 67
src/views/allocationManagement/transferReturn/list.vue

@@ -1,76 +1,80 @@
 <template>
-  <a-card size="small" :bordered="false" class="transferReturn-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调拨退货单号">
+              <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调拨退货对象名称">
+              <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              <a-form-item label="费用/调拨退货类型">
+                <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货单号">
-                <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
+              <a-form-item label="调入仓库">
+                <warehouse
+                  v-model="queryParam.warehouseSn"
+                  id="transferReturn-warehouseSn"
+                  placeholder="请选择调入仓库"
+                />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调拨退货对象名称">
-                <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="transferReturn-state"
+                  code="ALLOCATE_RETURN_STATE"
+                  placeholder="请选择业务状态"
+                  allowClear
+                ></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用/调拨退货类型">
-                  <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="调入仓库">
-                  <warehouse
-                    v-model="queryParam.warehouseSn"
-                    id="transferReturn-warehouseSn"
-                    placeholder="请选择调入仓库"
-                  />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="transferReturn-state"
-                    code="ALLOCATE_RETURN_STATE"
-                    placeholder="请选择业务状态"
-                    allowClear
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
-              <!-- <a-button
-                style="margin-left: 5px"
-                type="primary"
-                class="button-warning"
-                v-if="$hasPermissions('B_transferOut_export')"
-                @click="handleExport"
-                :disabled="disabled"
-                :loading="exportLoading"
-                id="transferReturn-export">导出</a-button> -->
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
+          </template>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
+            <!-- <a-button
+              style="margin-left: 5px"
+              type="primary"
+              class="button-warning"
+              v-if="$hasPermissions('B_transferOut_export')"
+              @click="handleExport"
+              :disabled="disabled"
+              :loading="exportLoading"
+              id="transferReturn-export">导出</a-button> -->
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  
+  <a-card size="small" :bordered="false" class="transferReturn-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -143,6 +147,7 @@
       @ok="auditOrder('WAIT_CHECK')"
       @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -174,7 +179,7 @@ export default {
         allocateSortSn: undefined, //  调拨类别
         allocateReturnTypeSn: undefined, // 调拨退货类型2
         state: undefined, //  业务状态
-        warehouseSn: undefined, 
+        warehouseSn: undefined,
         allocateReturnNo: '' //  调拨单号
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -183,7 +188,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateReturnQueryPage(Object.assign(parameter, this.queryParam,{authWarehouseFlag: 0})).then(res => {
+        return allocateReturnQueryPage(Object.assign(parameter, this.queryParam, { authWarehouseFlag: 0 })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -223,8 +228,8 @@ export default {
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
-      if(this.$hasPermissions('M_transferReturnList_salesPrice')){
-        arr.splice(11,0,{ title: '退货总金额', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      if (this.$hasPermissions('M_transferReturnList_salesPrice')) {
+        arr.splice(11, 0, { title: '退货总金额', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -330,7 +335,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 242
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {
@@ -367,7 +372,7 @@ export default {
   }
 }
 </script>
-<style lang="less">
+<style lang="less" scoped>
 	.active{
 		color: #ed1c24;
 		cursor: pointer;
@@ -375,4 +380,7 @@ export default {
 	.common{
 		color: rgba(0, 0, 0);
 	}
+  /deep/.anticon.anticon-down.ant-cascader-picker-arrow{
+  color:#ccc !important;
+  }
 </style>

+ 3 - 2
src/views/allocationManagement/transferReturn/print.vue

@@ -2,7 +2,8 @@
   <div>
     <a-button
       key="1"
-      type="default"
+      type="primary"
+      class="button-info"
       v-if="$hasPermissions('B_transferReturnPrint')"
       id="editGrap-db-print-btn"
       :disabled="disabled"
@@ -18,7 +19,7 @@
     <a-divider type="vertical" />
     <a-button
       key="3"
-      type="primary"
+      type="default"
       class="button-warning"
       v-if="$hasPermissions('B_transferReturnExport')"
       id="editGrap-export-btn"

+ 107 - 93
src/views/allocationManagement/transfersPrint/list.vue

@@ -1,96 +1,110 @@
 <template>
   <div class="allocateBillList-wrap">
-    <div style="background-color: #fff;margin-bottom: 5px;">
-      <a-tabs v-model="currentTab" @change="changeTab">
-        <a-tab-pane :key="1" tab="全部">
-        </a-tab-pane>
-        <a-tab-pane :key="2" tab="待打印">
-        </a-tab-pane>
-      </a-tabs>
-    </div>
-    <a-card size="small" :bordered="false">
-      <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 搜索条件 -->
-        <div ref="tableSearch" class="table-page-search-wrapper">
-          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-            <a-row :gutter="15">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="创建时间">
-                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+    <a-card size="small" :bordered="false" :class="currentTab==2 ? 'searchBox' : 'searchBoxNormal'">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调往对象">
+                <a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收货客户名称">
+                <dealerSearchList ref="receiverSn" @change="custChange"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-if="currentTab==2">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="allocateBillList-state"
+                  code="ALLOCATE_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24" v-if="currentTab==1">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="allocateBillList-state"
+                    code="ALLOCATE_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="调往对象">
-                  <a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
+                <a-form-item label="调拨单号">
+                  <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-if="currentTab == 1">
+                <a-form-item label="打印状态">
+                  <v-select
+                    v-model="queryParam.printState"
+                    ref="printState"
+                    id="allocateBillList-printState"
+                    code="PRINT_STATUS"
+                    placeholder="请选择打印状态"
+                    allowClear
+                  ></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+                <a-form-item label="调出仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    isPermission
+                    id="allocateBillList-warehouseSn"
+                    placeholder="请选择调出仓库"
+                  />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称">
-                  <dealerSearchList ref="receiverSn" @change="custChange"/>
+                <a-form-item label="所在区域">
+                  <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
-              <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="业务状态">
-                    <v-select
-                      v-model="queryParam.state"
-                      ref="state"
-                      id="allocateBillList-state"
-                      code="ALLOCATE_STATUS"
-                      placeholder="请选择业务状态"
-                      allowClear
-                    ></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="调拨单号">
-                    <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24" v-if="currentTab == 1">
-                  <a-form-item label="打印状态">
-                    <v-select
-                      v-model="queryParam.printState"
-                      ref="printState"
-                      id="allocateBillList-printState"
-                      code="PRINT_STATUS"
-                      placeholder="请选择打印状态"
-                      allowClear
-                    ></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-                  <a-form-item label="调出仓库">
-                    <warehouse
-                      v-model="queryParam.warehouseSn"
-                      isPermission
-                      id="allocateBillList-warehouseSn"
-                      placeholder="请选择调出仓库"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="所在区域">
-                    <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="地区">
-                    <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-                  </a-form-item>
-                </a-col>
-              </template>
               <a-col :md="6" :sm="24">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
-                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 5px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
+                <a-form-item label="地区">
+                  <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+                </a-form-item>
               </a-col>
-            </a-row>
-          </a-form>
-        </div>
+            </template>
+            <a-col :md="currentTab==2?24:6" :sm="24" :style="{textAlign: currentTab==2?'center':''}">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <div style="background-color: #fff;">
+      <a-tabs v-model="currentTab" @change="changeTab">
+        <a-tab-pane :key="1" tab="全部">
+        </a-tab-pane>
+        <a-tab-pane :key="2" tab="待打印">
+        </a-tab-pane>
+      </a-tabs>
+    </div>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
@@ -194,7 +208,7 @@ import { printBase64Fun } from '@/libs/JGPrint.js'
 export default {
   name: 'TransfersPrintList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, commonModal, allocationDetailModal, warehouse },
+  components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, allocationDetailModal, warehouse },
   data () {
     return {
       spinning: false,
@@ -256,18 +270,18 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '8%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '发货说明', dataIndex: 'explainInfo', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调往对象', dataIndex: 'targetName', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '发货编号', dataIndex: 'sendNo', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '发货说明', dataIndex: 'explainInfo', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '总数量', dataIndex: 'totalQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印状态', scopedSlots: { customRender: 'printStatus' }, width: '5%', align: 'center' },
-        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '打印次数', dataIndex: 'printCount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
+        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '打印次数', dataIndex: 'printCount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
         arr.splice(4, 0, { title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
@@ -375,8 +389,8 @@ export default {
       this.showDetailModal = true
     },
     cancelDetail () {
-      this.$store.state.app.curActionPermission = ''
       this.showDetailModal = false
+      this.$store.state.app.curActionPermission = ''
       this.bizSn = null
     },
     pageInit () {
@@ -388,7 +402,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 246
+      this.tableHeight = window.innerHeight - tableSearchH - 266
     },
     // 状态打印弹窗
     editPrintStatus (item) {

+ 43 - 40
src/views/allocationManagement/transfersPrint/recordModal.vue

@@ -10,40 +10,42 @@
     width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main">
-        <a-descriptions :column="2">
-          <a-descriptions-item label="调拨单号">
-            {{ tipData&&tipData.allocateNo }}
-          </a-descriptions-item>
-          <a-descriptions-item label="调拨类型">
-            <span v-if="tipData&&tipData.allocateSortName">{{ tipData.allocateSortName || '--' }}</span>
-            <span v-if="tipData&&tipData.allocateTypeName">/{{ tipData.allocateTypeName || '--' }}</span>
-          </a-descriptions-item>
-          <a-descriptions-item label="调往对象">
-            {{ tipData&&tipData.targetName }}
-          </a-descriptions-item>
-          <a-descriptions-item label="调出仓库">
-            {{ tipData&&tipData.warehouseName }}
-          </a-descriptions-item>
-          <a-descriptions-item label="收货客户名称">
-            {{ tipData&&tipData.receiverName }}
-          </a-descriptions-item>
-        </a-descriptions>
-        <div>
-          <s-table
-            class="sTable"
-            ref="table"
-            size="small"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            :defaultLoadData="false"
-            :scroll="{ y: 240 }"
-            bordered>
-          </s-table>
-        </div>
-        <div class="btn-box">
-          <a-button @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        </div>
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="基础信息">
+            <a-descriptions :column="2">
+              <a-descriptions-item label="调拨单号">
+                {{ tipData&&tipData.allocateNo }}
+              </a-descriptions-item>
+              <a-descriptions-item label="调拨类型">
+                <span v-if="tipData&&tipData.allocateSortName">{{ tipData.allocateSortName || '--' }}</span>
+                <span v-if="tipData&&tipData.allocateTypeName">/{{ tipData.allocateTypeName || '--' }}</span>
+              </a-descriptions-item>
+              <a-descriptions-item label="调往对象">
+                {{ tipData&&tipData.targetName }}
+              </a-descriptions-item>
+              <a-descriptions-item label="调出仓库">
+                {{ tipData&&tipData.warehouseName }}
+              </a-descriptions-item>
+              <a-descriptions-item label="收货客户名称">
+                {{ tipData&&tipData.receiverName ?tipData.receiverName:'--' }}
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-collapse-panel>
+        </a-collapse>
+      </div>
+      <s-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :defaultLoadData="false"
+        :scroll="{ y: 240 }"
+        bordered>
+      </s-table>
+      <div class="btn-box">
+        <a-button @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -138,12 +140,13 @@ export default {
 <style lang="less">
   .record-detail-modal{
     .common-main{
-      .btn-box{
-        text-align: center;
-        margin-top: 30px;
-        .ant-btn{
-          margin:0 10px;
-        }
+     margin-bottom:10px;
+    }
+    .btn-box{
+      text-align: center;
+      margin-top: 30px;
+      .ant-btn{
+        margin:0 10px;
       }
     }
   }

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

@@ -33,8 +33,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
+          <a-button id="storeTransferOut-type-edit-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="storeTransferOut-type-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="storeTransferOut-type-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </a-spin>
     </div>

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

@@ -6,7 +6,6 @@
         <a-button
           id="transferTypeManagementList-add"
           type="primary"
-          class="button-error"
           v-if="$hasPermissions('B_transferTypeManagement_add')"
           @click="handleEdit()">新增</a-button>
       </div>
@@ -14,11 +13,12 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :scroll="{ y: tableHeight }"
+        :pageSize="30"
         :data="loadData"
         :defaultLoadData="false"
         bordered>
@@ -131,7 +131,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 185
     }
   },
   watch: {

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

@@ -63,8 +63,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
+          <a-button id="warehouse-edit-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="warehouse-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="warehouse-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </a-spin>
     </div>

+ 47 - 43
src/views/basicData/warehouse/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="warehouseList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="warehouseList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -17,52 +17,56 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_warehouse_add')" id="warehouseList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            @click="goStoringLocation(record)"
-            v-if="$hasPermissions('B_warehouse_ckSet')"
-            id="warehouseList-storingLocation-btn">仓位管理</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_edit') "
-            @click="handleEdit(record)"
-            id="warehouseList-edit-btn">编辑</a-button>
-          <!-- <a-button
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button v-if="$hasPermissions('B_warehouse_add')" id="warehouseList-add" type="primary" @click="handleEdit()">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              @click="goStoringLocation(record)"
+              v-if="$hasPermissions('B_warehouse_ckSet')"
+              id="warehouseList-storingLocation-btn">仓位管理</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_edit') "
+              @click="handleEdit(record)"
+              id="warehouseList-edit-btn">编辑</a-button>
+            <!-- <a-button
             size="small"
             type="link"
             class="button-error"
             v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_del')"
             @click="handleDel(record)"
             id="warehouseList-del-btn">删除</a-button> -->
-          <span v-if="record.defaultFlag=='0' && !$hasPermissions('B_warehouse_edit') && !$hasPermissions('B_warehouse_del')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增/编辑仓库 -->
-    <warehouse-edit-modal :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="handleOk" @close="closeModal" />
-  </a-card>
+            <span v-if="record.defaultFlag=='0' && !$hasPermissions('B_warehouse_edit') && !$hasPermissions('B_warehouse_del')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增/编辑仓库 -->
+      <warehouse-edit-modal :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="handleOk" @close="closeModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -168,7 +172,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   watch: {

+ 1 - 1
src/views/basicData/warehouse/storingLocation/editModal.vue

@@ -34,8 +34,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
+          <a-button id="storingLocation-edit-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="storingLocation-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="storingLocation-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </a-spin>
     </div>

+ 3 - 3
src/views/basicData/warehouse/storingLocation/list.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="storingLocationList-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <strong style="color: rgba(0, 0, 0);margin-left: 50px;">所属仓库:{{ $route.query.name }}</strong>
+          <strong style="color: rgb(102, 102, 102);margin-left: 20px;">所属仓库:{{ $route.query.name }}</strong>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="storingLocationList-cont">
@@ -27,7 +27,7 @@
         </div>
         <!-- 操作按钮 -->
         <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>
+          <a-button id="storingLocationList-add" type="primary" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table
@@ -211,7 +211,7 @@ export default {
 <style lang="less">
   .storingLocationList-wrap{
     .storingLocationList-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 7 - 2
src/views/bnSetting/menu/adminMenus.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" :bodyStyle="{overflowY: 'auto'}">
+  <a-card :bordered="false" :bodyStyle="{overflowY: 'auto'}"   :style="{height:windowHeight +'px'}">
     <a-row :gutter="24">
       <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子菜单</a-button>
       <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle">添加顶部菜单</a-button>
@@ -187,7 +187,8 @@ export default {
         type: '0',
         isLeaf: true,
         status: '' // 活动状态
-      }
+      },
+      windowHeight:0
     }
   },
   computed: {
@@ -439,10 +440,14 @@ export default {
     },
     handleCancel () {
       this.clear()
+    },
+    setTableH () {
+      this.windowHeight = window.innerHeight - 90
     }
   },
   mounted () {
     this.priceOptions = this.$store.state.app.priceAuthOptions
+    this.setTableH();
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'menu' })

+ 7 - 10
src/views/common/chooseBrandModal.vue

@@ -16,7 +16,7 @@
           <a-checkbox :checked="checkAgent" @change="onCheckAgentChange">代理品牌</a-checkbox>
         </span>
       </div>
-      <a-divider />
+      <a-divider style="margin:10px 0;" />
       <a-row style="height: 400px;overflow-y: scroll;">
         <a-col :span="6" v-for="(item,index) in brandList" :key="item.brandSn">
           <a-checkbox :checked="item.checked" :disabled="item.isDisabled" @change="e=>onChange(e,index)">
@@ -26,19 +26,16 @@
       </a-row>
       <!-- 按钮 -->
       <div class="btn-con">
-        <a-button
-          type="primary"
-          id="chooseBrand-submit"
-          size="large"
-          class="button-primary"
-          @click="handleSave"
-          style="padding: 0 60px;">保存</a-button>
         <a-button
           id="chooseBrand-cancel"
-          size="large"
           class="button-cancel"
           @click="isShow=false"
-          style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+          style="padding: 0 30px;">取消</a-button>
+        <a-button
+          type="primary"
+          id="chooseBrand-submit"
+          @click="handleSave"
+          style="padding: 0 30px;margin-left: 15px;">保存</a-button>
       </div>
     </div>
   </a-modal>

+ 12 - 15
src/views/common/chooseProductsModal.vue

@@ -34,7 +34,7 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item  label="产品分类">
+                  <a-form-model-item label="产品分类">
                     <productTypeAll :isAll="type!='default'" placeholder="请选择产品分类" @change="changeProductType" v-model="queryParam.productType" id="chooseProducts-productType"></productTypeAll>
                   </a-form-model-item>
                 </a-col>
@@ -63,19 +63,16 @@
         </div>
         <!-- 按钮 -->
         <div class="btn-con">
-          <a-button
-            type="primary"
-            id="chooseProducts-save"
-            size="large"
-            class="button-primary"
-            @click="handleSave"
-            style="padding: 0 60px;">保存</a-button>
           <a-button
             id="chooseProducts-cancel"
-            size="large"
             class="button-cancel"
             @click="isShow=false"
-            style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+            style="padding: 0 30px;">取消</a-button>
+          <a-button
+            type="primary"
+            id="chooseProducts-save"
+            @click="handleSave"
+            style="padding: 0 30px;margin-left: 15px;">保存</a-button>
         </div>
       </div>
     </a-spin>
@@ -136,8 +133,8 @@ export default {
       loading: false, //  表格加载中
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'code', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } }
+        { title: '产品编码', dataIndex: 'code', align: 'left',width: 200 },
+        { title: '产品名称', dataIndex: 'name', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -179,11 +176,11 @@ export default {
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
           if (_this.type == 'dealership') { //  设置经销权时选择产品
-            if(!_this.queryParam.productBrandSn && !_this.queryParam.productTypeSn1){
-              _this.$message.info("请选择产品品牌或产品分类")
+            if (!_this.queryParam.productBrandSn && !_this.queryParam.productTypeSn1) {
+              _this.$message.info('请选择产品品牌或产品分类')
               return
             }
-             
+
             // 校验产品是否被包含在品牌分类中
             const params = []
             if (_this.queryParam.productBrandSn) {

+ 7 - 10
src/views/common/chooseTypeModal.vue

@@ -12,7 +12,7 @@
       <div>
         <a-checkbox :checked="checkAll" :disabled="!linkageStatus&&chooseList.length>0 " @change="onCheckAllChange">全选</a-checkbox>
       </div>
-      <a-divider />
+      <a-divider style="margin:10px 0;" />
       <a-tree
         style="height: 400px;overflow-y: scroll;"
         checkable
@@ -24,19 +24,16 @@
       />
       <!-- 按钮 -->
       <div class="btn-con">
-        <a-button
-          type="primary"
-          id="chooseType-submit"
-          size="large"
-          class="button-primary"
-          @click="handleSave"
-          style="padding: 0 60px;">保存</a-button>
         <a-button
           id="chooseType-cancel"
-          size="large"
           class="button-cancel"
           @click="isShow=false"
-          style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+          style="padding: 0 30px;">取消</a-button>
+        <a-button
+          type="primary"
+          id="chooseType-submit"
+          @click="handleSave"
+          style="padding: 0 30px;margin-left: 15px;">保存</a-button>
       </div>
     </div>
   </a-modal>

+ 2 - 2
src/views/dealerManagement/businessOwnerSettings/addModal.vue

@@ -64,8 +64,8 @@
           <chooseWarehouse ref="warehouse" modeType="multiple" :value="warehouseList" @change="handleWarehouse"></chooseWarehouse>
         </a-form-model-item>
         <div style="display: flex;justify-content: center;padding: 30px 0;">
-          <a-button type="primary" @click="handleSave">{{ itemId?'保存':'确定' }}</a-button>
-          <a-button style="margin-left: 15px;" @click="isShow=false">取消</a-button>
+          <a-button @click="isShow=false">取消</a-button>
+          <a-button style="margin-left: 15px;" type="primary" @click="handleSave">{{ itemId?'保存':'确定' }}</a-button>
         </div>
       </a-form-model>
     </a-spin>

+ 4 - 6
src/views/dealerManagement/businessOwnerSettings/categorySet.vue

@@ -3,12 +3,12 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <a-card size="small" :bordered="false" class="categorySet-cont">
         <div class="table-operator" ref="categorySetAddBtn">
-          <a-button type="primary" class="button-error" @click="addCategory" :disabled="disabled">+新增管辖品类</a-button>
+          <a-button type="primary" @click="addCategory" :disabled="disabled">新增管辖品类</a-button>
         </div>
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.bizUserScopeSn"
           rowKeyName="bizUserScopeSn"
@@ -300,7 +300,7 @@ export default {
     },
     setTableH () {
       const addBtnHeight = this.$refs.categorySetAddBtn.offsetHeight
-      this.tableHeight = window.innerHeight - addBtnHeight - 385
+      this.tableHeight = window.innerHeight - addBtnHeight - 325
     }
   },
   watch: {
@@ -316,8 +316,6 @@ export default {
 
 <style lang="less">
   .categorySet-wrap{
-    .table-operator{
-    text-align:right;
-    }
+     
   }
 </style>

+ 2 - 2
src/views/dealerManagement/businessOwnerSettings/chooseAreaModal.vue

@@ -27,8 +27,8 @@
         </div>
       </div>
       <div class="areaFooter">
+        <a-button style="margin-right: 15px" @click="visible = false" :disabled="disabled" id="areaSet-reset">取消</a-button>
         <a-button type="primary" @click="save" :disabled="disabled" id="areaSet-refresh">保存</a-button>
-        <a-button style="margin-left: 5px" @click="visible = false" :disabled="disabled" id="areaSet-reset">取消</a-button>
       </div>
     </div>
   </a-drawer>
@@ -144,7 +144,7 @@ export default {
       this.getArea()
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 345
+      this.tableHeight = window.innerHeight - 325
     }
   }
 }

+ 6 - 8
src/views/dealerManagement/businessOwnerSettings/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -32,17 +32,18 @@
     <a-card size="small" :bordered="false" class="dealerZoneSearch-wrap">
       <a-spin :spinning="spinning" tip="Loading...">
         <div class="table-operator">
-          <a-button id="businessOwnerSettings-add" type="primary" class="button-error" @click="handleAdd">+新增</a-button>
+          <a-button id="businessOwnerSettings-add" type="primary" @click="handleAdd">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -189,7 +190,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 275
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {
@@ -221,11 +222,8 @@ export default {
   .dealerZoneSearch-wrap{
     height: 100%;
     margin-top:6px;
-    .table-operator{
-      text-align:right;
-    }
     .warehouseBox{
-  wwidth: 100%;
+      width: 100%;
       display: -webkit-box;
       -webkit-box-orient: vertical;
       -webkit-line-clamp: 2;

+ 10 - 10
src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue

@@ -5,21 +5,17 @@
         <a-page-header :ghost="false" :backIcon="false" class="header-bar">
           <!-- 自定义的二级文字标题 -->
           <template slot="subTitle">
-            <span class="subTitle-word text-overflow" style="max-width:300px;">用户姓名:{{ infoObj.userName?infoObj.userName:'--' }}</span>
-            <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
+            <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+            <span class="subTitle-word text-overflow" style="max-width:300px;margin-left:15px;">用户姓名:{{ infoObj.userName?infoObj.userName:'--' }}</span>
           </template>
         </a-page-header>
       </div>
       <a-card size="small" :bordered="false" class="categorySet-cont">
-        <div :style="{ height: tableHeight+84.5+'px' }">
+        <div>
           <a-tabs v-model="activeKeyVal" @change="handleTabs">
             <a-tab-pane key="1" tab="设置管辖区域" v-if="infoObj.allDealerFlag && infoObj.allDealerFlag!=1">
               <div class="areaSet-wrap">
                 <div class="table-page-search-wrapper newTableSearchName" >
-                  <div class="areaSet-btnGroup" style="margin-bottom:20px;">
-                    <a-button type="primary" class="button-error" @click="openAreaModal" ghost>选择区域</a-button>
-                    <a-button type="primary" class="button-error" @click="openDealerModal" ghost>选择经销商</a-button>
-                  </div>
                   <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                     <a-row :gutter="15">
                       <a-col :md="6" :sm="24">
@@ -38,6 +34,10 @@
                       </a-col>
                     </a-row>
                   </a-form>
+                  <div class="areaSet-btnGroup" style="margin-bottom:10px;">
+                    <a-button type="primary" class="button-info" @click="openAreaModal">选择区域</a-button>
+                    <a-button type="primary" class="button-error" @click="openDealerModal">选择经销商</a-button>
+                  </div>
                 </div>
                 <a-spin :spinning="spinning" tip="Loading...">
                   <!-- 列表 -->
@@ -50,8 +50,8 @@
                     :columns="columns"
                     :data="loadData"
                     :defaultLoadData="false"
-                    :style="{ height: tableHeight-100+'px' }"
-                    :scroll="{ y: tableHeight-180 }"
+                    :style="{ height: tableHeight+70+'px' }"
+                    :scroll="{ y: tableHeight }"
                     bordered>
                     <!-- 操作 -->
                     <template slot="action" slot-scope="text, record">
@@ -346,7 +346,7 @@ export default {
     },
     setTableH () {
       const headHeight = this.$refs.headerBar.offsetHeight
-      this.tableHeight = window.innerHeight - headHeight - 230
+      this.tableHeight = window.innerHeight - headHeight - 340
     }
   },
   watch: {

+ 15 - 25
src/views/dealerManagement/businessOwnerSettings/supplierSet.vue

@@ -1,25 +1,18 @@
 <template>
   <div class="categorySet-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-card size="small" :bordered="false" class="categorySet-cont">
-        <div class="areaSet-wrap">
-          <div class="table-page-search-wrapper newTableSearchName" >
-            <div class="areaSet-btnGroup" style="margin-bottom:20px;">
-              <a-button type="primary" class="button-error" @click="openSupplierModal">新增</a-button>
+        <div class="areaSet-wrap">
+          <div class="table-page-search-wrapper flex-center" style="width:100%;justify-content: space-between;margin-bottom:10px">
+            <div class="areaSet-btnGroup">
+              <a-button type="primary" @click="openSupplierModal">新增</a-button>
             </div>
-            <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-              <a-row :gutter="15">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="供应商名称">
-                    <a-input id="areaSet-dealerName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商名称"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="areaSet-refresh">查询</a-button>
-                  <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="areaSet-reset">重置</a-button>
-                </a-col>
-              </a-row>
-            </a-form>
+            <div>
+              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+                <a-input style="width:300px;" id="areaSet-dealerName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商名称"/>
+                <a-button style="margin-left: 15px" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="areaSet-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="areaSet-reset">重置</a-button>
+              </a-form>
+            </div>
           </div>
           <a-spin :spinning="spinning" tip="Loading...">
             <!-- 列表 -->
@@ -32,8 +25,8 @@
               :columns="columns"
               :data="loadData"
               :defaultLoadData="false"
-              :style="{ height: tableHeight+'px' }"
-              :scroll="{ y: tableHeight-180 }"
+              :style="{ height: tableHeight + 70 +'px' }"
+              :scroll="{ y: tableHeight }"
               bordered>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
@@ -49,7 +42,6 @@
             </s-table>
           </a-spin>
         </div>
-      </a-card>
     </a-spin>
     <!-- 选择供应商 -->
     <a-drawer
@@ -203,7 +195,7 @@ export default {
       this.$refs.table.refresh()
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 385
+      this.tableHeight = window.innerHeight - 345
     }
   },
   watch: {
@@ -219,8 +211,6 @@ export default {
 
 <style lang="less">
   .categorySet-wrap{
-    .table-operator{
-    text-align:right;
-    }
+    
   }
 </style>

+ 3 - 3
src/views/dealerManagement/dealerAccountManagement/editModal.vue

@@ -69,8 +69,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="dealerAccountEdit-save" @click="handleSave">保存</a-button>
-          <a-button id="dealerAccountEdit-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+          <a-button id="dealerAccountEdit-back" @click="isShow = false" >取消</a-button>
+          <a-button type="primary" id="dealerAccountEdit-save" style="margin-left: 15px;" @click="handleSave">保存</a-button>
         </div>
       </a-spin>
     </div>
@@ -101,7 +101,7 @@ export default {
       spinning: false,
       formItemLayout: {
         labelCol: { span: 6 },
-        wrapperCol: { span: 18 }
+        wrapperCol: { span: 16 }
       },
       form: {
         tenantSn: '',

+ 74 - 69
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="dealerAccountList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="dealerAccountList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -27,71 +27,76 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="dealerAccountList-add" type="primary" v-if="$hasPermissions('B_dealerAccount_add')" class="button-error" @click="handleEdit()">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 账号状态 -->
-        <template slot="loginFlag" slot-scope="text, record">
-          <a-switch
-            id="dealerAccountList-enable"
-            v-if="$hasPermissions('B_dealerAccount_enable')"
-            checkedChildren="启用"
-            unCheckedChildren="禁用"
-            @change="changeStatus(record)"
-            :checked="record.loginFlag == 1 ? true : false" />
-          <span v-else :style="{color:(record.loginFlag==1?'#00aa00':'#999')}"> {{ record.loginFlag==1? '已启用': '已禁用' }} </span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerAccount_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="dealerAccountList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerAccount_detail')"
-            class="button-success"
-            @click="handleDetail(record)"
-            id="dealerAccountList-detail-btn">详情</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerAccount_reset')"
-            class="button-warning"
-            @click="handleReset(record)"
-            id="dealerAccountList-reset-btn">重置密码</a-button>
-          <span v-if="!$hasPermissions('B_dealerAccount_edit') && !$hasPermissions('B_dealerAccount_detail') && !$hasPermissions('B_dealerAccount_reset')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增/编辑 -->
-    <dealer-account-edit-modal
-      v-drag
-      :openModal="openModal"
-      :nowData="nowData"
-      :itemId="itemId"
-      @ok="$refs.table.refresh(true)"
-      @close="closeModal" />
-    <!-- 查看 -->
-    <dealer-account-detail-modal v-drag :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" />
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button id="dealerAccountList-add" type="primary" v-if="$hasPermissions('B_dealerAccount_add')" @click="handleEdit()">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 账号状态 -->
+          <template slot="loginFlag" slot-scope="text, record">
+            <a-switch
+              id="dealerAccountList-enable"
+              v-if="$hasPermissions('B_dealerAccount_enable')"
+              checkedChildren="启用"
+              unCheckedChildren="禁用"
+              @change="changeStatus(record)"
+              :checked="record.loginFlag == 1 ? true : false" />
+            <span v-else :style="{color:(record.loginFlag==1?'#00aa00':'#999')}"> {{ record.loginFlag==1? '已启用': '已禁用' }} </span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerAccount_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="dealerAccountList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerAccount_detail')"
+              class="button-success"
+              @click="handleDetail(record)"
+              id="dealerAccountList-detail-btn">详情</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerAccount_reset')"
+              class="button-warning"
+              @click="handleReset(record)"
+              id="dealerAccountList-reset-btn">重置密码</a-button>
+            <span v-if="!$hasPermissions('B_dealerAccount_edit') && !$hasPermissions('B_dealerAccount_detail') && !$hasPermissions('B_dealerAccount_reset')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增/编辑 -->
+      <dealer-account-edit-modal
+        v-drag
+        :openModal="openModal"
+        :nowData="nowData"
+        :itemId="itemId"
+        @ok="$refs.table.refresh(true)"
+        @close="closeModal" />
+      <!-- 查看 -->
+      <dealer-account-detail-modal v-drag :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -119,7 +124,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center' },
-        { title: '经销商名称', dataIndex: 'org.name', width: '25%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '经销商名称', dataIndex: 'org.name', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '管理员姓名', dataIndex: 'name', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '管理员账号', dataIndex: 'loginName', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '授权用户数', dataIndex: 'org.childUserMaxNum', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -229,7 +234,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 2 - 2
src/views/dealerManagement/dealerRelationshipBinding/associateModal.vue

@@ -27,8 +27,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="product-category-edit-modal-save" @click="handleSave">确定</a-button>
-          <a-button id="product-category-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">关闭</a-button>
+          <a-button id="product-category-edit-modal-back" @click="isShow = false" >取消</a-button>
+          <a-button type="primary" id="product-category-edit-modal-save" style="margin-left: 15px;" @click="handleSave">确定</a-button>
         </div>
       </a-spin>
     </div>

+ 70 - 73
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="relationshipBindingList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="relationshipBindingList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="getList()">
@@ -17,74 +17,79 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <a-tabs type="card" @change="tabChange" v-model="tabInd" class="relationshipBindingList-tabs">
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-tabs @change="tabChange" v-model="tabInd" :tabBarStyle="{'background':'#fff'}">
         <a-tab-pane key="1" tab="省市级关系绑定"></a-tab-pane>
         <a-tab-pane key="2" tab="特约店关系绑定"></a-tab-pane>
       </a-tabs>
-      <a-table
-        class="sTable"
-        ref="table"
-        size="small"
-        :rowKey="(record) => record.dealerSn"
-        :columns="columns"
-        :pagination="false"
-        :data-source="list"
-        @expand="expand"
-        :expandedRowKeys="expandedRowKeys"
-        :expandRowByClick="true"
-        :loading="loading"
-        :scroll="{ y: tableHeight }">
+      <a-spin :spinning="spinning" tip="Loading...">
         <a-table
-          slot="expandedRowRender"
+          class="sTable"
+          ref="table"
+          size="small"
           :rowKey="(record) => record.dealerSn"
-          :columns="innerColumns"
-          :data-source="innerData"
-          :pagination="false">
+          :columns="columns"
+          :pagination="false"
+          :data-source="list"
+          @expand="expand"
+          :expandedRowKeys="expandedRowKeys"
+          :expandRowByClick="true"
+          :loading="loading"
+          :style="{'height':tableHeight+70+'px' }"
+          :scroll="{ y: tableHeight +30 }">
+          <a-table
+            slot="expandedRowRender"
+            :rowKey="(record) => record.dealerSn"
+            :columns="innerColumns"
+            :data-source="innerData"
+            :pagination="false">
+            <!-- 操作 -->
+            <template slot="action" slot-scope="text, record">
+              <a-button
+                type="link"
+                v-if="$hasPermissions('B_dealerRelationshipBinding_unrelation')"
+                class="button-error"
+                size="small"
+                icon="close"
+                :id="'relationshipBindingList-delSubItem'+record.id"
+                @click.stop="handleDisassociate(record)">取消关联</a-button>
+              <span v-else>--</span>
+            </template>
+          </a-table>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <a-button
               type="link"
-              v-if="$hasPermissions('B_dealerRelationshipBinding_unrelation')"
-              class="button-error"
+              v-if="$hasPermissions('B_dealerRelationshipBinding_relation')"
+              class="button-info"
               size="small"
-              icon="close"
-              :id="'relationshipBindingList-delSubItem'+record.id"
-              @click.stop="handleDisassociate(record)">取消关联</a-button>
+              icon="plus"
+              :id="'relationshipBindingList-addSubItem'+record.id"
+              @click.stop="handleAssociate(record)">关联下级</a-button>
             <span v-else>--</span>
           </template>
         </a-table>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            type="link"
-            v-if="$hasPermissions('B_dealerRelationshipBinding_relation')"
-            class="button-info"
-            size="small"
-            icon="plus"
-            :id="'relationshipBindingList-addSubItem'+record.id"
-            @click.stop="handleAssociate(record)">关联下级</a-button>
-          <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
-      v-drag
-      :openModal="openModal"
-      :nowData="nowData"
-      :tabInd="tabInd"
-      @ok="addItemOk"
-      @close="openModal=false" />
-  </a-card>
+        <!-- 分页 -->
+        <tablePagination
+          ref="tablePagination"
+          :total="paginationProps.total"
+          :current="paginationProps.current"
+          :pageSize="paginationProps.pageSize"
+          @changePageSize="changePageSize"
+          @changePage="changePage" />
+      </a-spin>
+      <!-- 关联下级 -->
+      <associate-modal
+        v-drag
+        :openModal="openModal"
+        :nowData="nowData"
+        :tabInd="tabInd"
+        @ok="addItemOk"
+        @close="openModal=false" />
+    </a-card>
+  </div>
 </template>
 I
 <script>
@@ -245,34 +250,37 @@ export default {
           })
         }
       })
+    },
+    setHtable(){
+      this.tableHeight = window.innerHeight - 346
     }
   },
   watch: {
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.tableHeight = window.innerHeight - 290
+      this.setHtable()
     }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.tableHeight = window.innerHeight - 290
+      this.setHtable()
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.tableHeight = window.innerHeight - 290
+      this.setHtable()
       this.resetSearchForm()
     }
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {
-      this.tableHeight = window.innerHeight - 290
+      this.setHtable()
       this.resetSearchForm(true)
     }
   }
 }
 </script>
-<style lang="less">
+<style lang="less" scoped>
   .relationshipBindingList-wrap{
     position: relative;
     height: 100%;
@@ -281,16 +289,5 @@ export default {
       overflow-y: scroll;
       height: 100%;
     }
-    // tab样式
-    .relationshipBindingList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
-      height: 30px!important;
-    }
-    .relationshipBindingList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
-      height: 30px!important;
-    }
-    .relationshipBindingList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
-      line-height: 26px!important;
-      height: 30px!important;
-    }
   }
 </style>

+ 6 - 5
src/views/dealerManagement/dealerZoneSearch/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -15,12 +15,12 @@
                 <custList id="dealerZoneSearch-dealerName" placeholder="请输入经销商名称搜索" ref="indirectDealer" @change="dealerChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="24">
+            <a-col :md="7" :sm="24">
               <a-form-item label="客服/区域负责人/销售总监">
                 <a-input id="dealerZoneSearch-dealerName" v-model.trim="queryParam.bizUserName" allowClear placeholder="请输入客服/区域负责人/销售总监"/>
               </a-form-item>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-top: 10px;text-align:center;">
+            <a-col :md="5" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="dealerZoneSearch-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="dealerZoneSearch-reset">重置</a-button>
               <a-button
@@ -41,12 +41,13 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -178,7 +179,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

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

@@ -2,14 +2,14 @@
   <a-card size="small" :bordered="false" class="marketingDivisionSetNew-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
-      <div ref="tableSearch" class="table-operator" style="border: 0;text-align:right;">
-        <a-button id="marketingDivisionSetNew-add" type="primary" class="button-error" @click="addArea">+新增区域</a-button>
+      <div ref="tableSearch" class="table-operator" style="border: 0;">
+        <a-button id="marketingDivisionSetNew-add" type="primary" @click="addArea">新增区域</a-button>
       </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px'}"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -156,19 +156,19 @@ export default {
     //  编辑
     handleEdit (row) {
       // 大区
-      if(row.type && row.type == 'root'){
+      if (row.type && row.type == 'root') {
         this.itemId = row && row.subareaSn ? row.subareaSn : null
         this.openAreaModal = true
-      }else{
+      } else {
         // 分区
         this.parentData = row
         this.openZoneModal = true
       }
     },
     // 查看经销商
-    handleView(row){
+    handleView (row) {
       this.parentData = row
-      this.openDealerModal=true
+      this.openDealerModal = true
     },
     pageInit () {
       const _this = this

+ 50 - 44
src/views/dealerManagement/marketingDivisionSetNew/viewDealers.vue

@@ -35,10 +35,10 @@
                 </a-form-item>
               </a-col>
               <a-col :md="8" :sm="24">
-              <a-form-model-item label="地区">
+                <a-form-model-item label="地区">
                   <AreaList id="viewDealers-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
-              </a-form-model-item>
-            </a-col>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="searchForm" :disabled="disabled" id="viewDealers-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="viewDealers-reset">重置</a-button>
@@ -58,7 +58,7 @@
           </a-empty>
         </div>
         <div class="tableCon" v-else>
-          <div style="text-align:right;margin-bottom:10px;"><a-button type="primary" class="button-error" @click="openAddDealer=true"><a-icon type="plus" />绑定经销商</a-button></div>
+          <div style="margin-bottom:10px;"><a-button type="primary" class="button-error" @click="openAddDealer=true">绑定经销商</a-button></div>
           <s-table
             class="sTable"
             ref="table"
@@ -70,13 +70,13 @@
             :scroll="{ y: tableHeight }"
             bordered>
             <template slot="action" slot-scope="text, record">
-            <a-button
-              size="small"
-              type="link"
-              class="button-error"
-              @click="handleDel(record)"
+              <a-button
+                size="small"
+                type="link"
+                class="button-error"
+                @click="handleDel(record)"
               >删除</a-button>
-          </template>
+            </template>
           </s-table>
         </div>
       </a-spin>
@@ -93,7 +93,13 @@
       class="deraw-bindDealer"
       @close="openAddDealer = false">
       <div class="dealerModalCon">
-        <chooseDealer ref="chooseDealer" v-if="openAddDealer" :parentData="parentData" pageType="viewDealers" @add="hanldAdd" @plAdd="hanldPlAdd"></chooseDealer>
+        <chooseDealer
+          ref="chooseDealer"
+          v-if="openAddDealer"
+          :parentData="parentData"
+          pageType="viewDealers"
+          @add="hanldAdd"
+          @plAdd="hanldPlAdd"></chooseDealer>
       </div>
     </a-drawer>
   </div>
@@ -116,7 +122,7 @@ export default {
     },
     parentData: {
       type: Object,
-      default: function(){
+      default: function () {
         return null
       }
     }
@@ -129,7 +135,7 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.resetData()
-      }else{
+      } else {
         this.pageInit()
       }
     },
@@ -145,7 +151,7 @@ export default {
       openAddDealer: false,
       flag: true,
       queryParam: { //  查询条件
-        dealer:{
+        dealer: {
           nameLike: '',
           dealerType: null,
           dealerLevel: null,
@@ -171,7 +177,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return queryPageAreaDealer(Object.assign(parameter, this.queryParam, {subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn})).then(res => {
+        return queryPageAreaDealer(Object.assign(parameter, this.queryParam, { subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -185,15 +191,15 @@ export default {
           this.setTableH()
           return data
         })
-      },
+      }
     }
   },
   methods: {
     // 绑定
-    hanldAdd(row){
+    hanldAdd (row) {
       console.log(row)
-      bindDealer({subareaAreaSn: this.parentData.subareaAreaSn,dealerSn:row.dealerSn}).then(res => {
-        if(res.status == 200){
+      bindDealer({ subareaAreaSn: this.parentData.subareaAreaSn, dealerSn: row.dealerSn }).then(res => {
+        if (res.status == 200) {
           this.resetSearchForm()
           this.$refs.chooseDealer.searchForm(false)
         }
@@ -201,10 +207,10 @@ export default {
       })
     },
     // 批量绑定
-    hanldPlAdd(rows){
+    hanldPlAdd (rows) {
       console.log(rows)
-      batchBindDealer({subareaAreaSn: this.parentData.subareaAreaSn,dealerSnSet:rows}).then(res => {
-        if(res.status == 200){
+      batchBindDealer({ subareaAreaSn: this.parentData.subareaAreaSn, dealerSnSet: rows }).then(res => {
+        if (res.status == 200) {
           this.resetSearchForm()
           this.$refs.chooseDealer.searchForm(false)
         }
@@ -212,7 +218,7 @@ export default {
       })
     },
     // 删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -220,8 +226,8 @@ export default {
         centered: true,
         onOk () {
           _this.spinning = true
-          deleteBindDealer({sn: row.subareaAreaDealerSn}).then(res => {
-            if(res.status == 200){
+          deleteBindDealer({ sn: row.subareaAreaDealerSn }).then(res => {
+            if (res.status == 200) {
               _this.resetSearchForm()
             }
             _this.spinning = false
@@ -229,42 +235,42 @@ export default {
         }
       })
     },
-    searchForm(){
-      if(this.flag){
+    searchForm () {
+      if (this.flag) {
         this.hasData()
-      }else{
+      } else {
         this.$refs.table.refresh(true)
       }
     },
-    resetData(){
+    resetData () {
       this.queryParam = {
-          dealer:{
-            nameLike: '',
-            dealerType: null,
-            dealerLevel: null,
-            auditState: undefined,
-            provinceSn: undefined,
-            citySn: undefined,
-            districtSn: undefined
-          }
+        dealer: {
+          nameLike: '',
+          dealerType: null,
+          dealerLevel: null,
+          auditState: undefined,
+          provinceSn: undefined,
+          citySn: undefined,
+          districtSn: undefined
         }
+      }
       this.$refs.areaList.clearData()
     },
     resetSearchForm () {
-      if(this.flag){
+      if (this.flag) {
         this.hasData()
-      }else{
+      } else {
         this.resetData()
         this.$refs.table.refresh(true)
       }
     },
-    areaChange(val){
+    areaChange (val) {
       this.queryParam.dealer.provinceSn = val[0] ? val[0] : ''
       this.queryParam.dealer.citySn = val[1] ? val[1] : ''
       this.queryParam.dealer.districtSn = val[2] ? val[2] : ''
     },
-   async hasData(){
-      const ret = await queryPageAreaDealer({pageNo:1,pageSize:10,subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn}).then(res => res.data)
+    async hasData () {
+      const ret = await queryPageAreaDealer({ pageNo: 1, pageSize: 10, subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn }).then(res => res.data)
       this.flag = ret.count == 0
     },
     pageInit () {
@@ -280,7 +286,7 @@ export default {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 290
     }
-  },
+  }
 }
 </script>
 

+ 70 - 66
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="merchantInfoManagementList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="merchantInfoManagementList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -52,51 +52,55 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" class="button-error" @click="handleAdd">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 经销商 -->
-        <template slot="dealerName" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_merchantInfo_detail')" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dealerName }}</span>
-          <span v-else>{{ record.dealerName }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
-          <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
-          <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
-          <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button>
-          <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
-          <span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 产品详情 -->
-    <merchant-info-management-detail-modal
-      v-drag
-      :openModal="openModal"
-      :isAudit="isAudit"
-      :itemId="itemId"
-      @ok="resetForm"
-      @close="closeModal" />
-    <!-- 合作设置 -->
-    <UpdateCooperate ref="updateCooperate" v-drag :openUcModal="openUcModal" @ok="resetForm" @close="openUcModal=false"></UpdateCooperate>
-    <!-- 级别设置 -->
-    <UpdateDealerLeve ref="updateDealerLevel" v-drag :openUdModal="openUdModal" @ok="resetForm" @close="openUdModal=false"></UpdateDealerLeve>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" @click="handleAdd">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 经销商 -->
+          <template slot="dealerName" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_merchantInfo_detail')" class="link-bule" @click="handleDetail(record)">{{ record.dealerName }}</span>
+            <span v-else>{{ record.dealerName }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
+            <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
+            <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button>
+            <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
+            <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
+            <span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 产品详情 -->
+      <merchant-info-management-detail-modal
+        v-drag
+        :openModal="openModal"
+        :isAudit="isAudit"
+        :itemId="itemId"
+        @ok="resetForm"
+        @close="closeModal" />
+      <!-- 合作设置 -->
+      <UpdateCooperate ref="updateCooperate" v-drag :openUcModal="openUcModal" @ok="resetForm" @close="openUcModal=false"></UpdateCooperate>
+      <!-- 级别设置 -->
+      <UpdateDealerLeve ref="updateDealerLevel" v-drag :openUdModal="openUdModal" @ok="resetForm" @close="openUdModal=false"></UpdateDealerLeve>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -120,9 +124,9 @@ export default {
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined, //  区域
-          subareaAreaSn: undefined, // 分区
+          subareaAreaSn: undefined // 分区
         },
         auditState: undefined, // 审核状态
         cooperateFlag: undefined //  合作状态
@@ -133,20 +137,20 @@ export default {
       total: 0,
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '10%', align: 'center', ellipsis: true },
-        { title: '商户别名', dataIndex: 'dealerAlias', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '联系人', dataIndex: 'contact', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '联系电话', dataIndex: 'dealerTelephone', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '绑定手机号码', dataIndex: 'managerMobile', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核状态', dataIndex: 'auditStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '生效时间', dataIndex: 'cooperateEffectiveTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '10%', align: 'left', ellipsis: true },
+        { title: '商户别名', dataIndex: 'dealerAlias', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系人', dataIndex: 'contact', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系电话', dataIndex: 'dealerTelephone', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '绑定手机号码', dataIndex: 'managerMobile', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核状态', dataIndex: 'auditStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '生效时间', dataIndex: 'cooperateEffectiveTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '16%', align: 'center' }
       ],
       loading: false,
       // 加载数据方法 必须为 Promise 对象
@@ -176,7 +180,7 @@ export default {
     }
   },
   methods: {
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -185,7 +189,7 @@ export default {
       this.queryParam = {
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
@@ -286,7 +290,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 238
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   watch: {

+ 4 - 4
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -111,9 +111,9 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '添加时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '类型', dataIndex: 'type', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型名称', dataIndex: 'goodsName', align: 'center', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型名称', dataIndex: 'goodsName', align: 'left', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'product.name', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -325,7 +325,7 @@ export default {
 <style lang="less" scoped>
   .permissionSetting-wrap{
     .permissionSetting-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 2 - 2
src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue

@@ -32,8 +32,8 @@
               placeholder="请选择日期" />
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
-            <a-button type="primary" @click="onSubmit">确定</a-button>
-            <a-button style="margin-left: 50px;" @click="cansel">取消</a-button>
+            <a-button  @click="cansel">取消</a-button>
+            <a-button style="margin-left: 15px;" type="primary" @click="onSubmit">确定</a-button>
           </div>
         </a-form-model>
       </a-spin>

+ 2 - 2
src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue

@@ -24,8 +24,8 @@
             <v-select code="DEALER_LEVEL" id="ucModal-dealerLevel" v-model="form.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
-            <a-button type="primary" @click="onSubmit">确定</a-button>
-            <a-button style="margin-left: 50px;" @click="cansel">取消</a-button>
+            <a-button @click="cansel">取消</a-button>
+            <a-button style="margin-left: 15px;" type="primary" @click="onSubmit">确定</a-button>
           </div>
         </a-form-model>
       </a-spin>

+ 2 - 2
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -27,8 +27,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="product-category-edit-modal-save" @click="handleSave">确定</a-button>
-          <a-button id="product-category-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">关闭</a-button>
+          <a-button id="product-category-edit-modal-back" @click="isShow = false" >取消</a-button>
+          <a-button type="primary" style="margin-left: 15px;" id="product-category-edit-modal-save" @click="handleSave">确定</a-button>
         </div>
       </a-spin>
     </div>

+ 75 - 70
src/views/dealerManagement/rebateSettings/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="rebateSettingsList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="rebateSettingsList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -27,65 +27,70 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.no"
-        rowKeyName="no"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_rebateSettings_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="rebateSettingsList-edit-btn">编辑</a-button>
-          <span v-else>--</span>
-        </template>
-        <!-- 经销商名称 -->
-        <template slot="jxs" slot-scope="text, record">
-          <span v-if="record.subDealer">{{ record.subDealer.dealerName }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 经销商级别 -->
-        <template slot="dealerLevel" slot-scope="text, record">
-          <span v-if="record.subDealer">{{ record.subDealer.provinceName }} > {{ record.subDealer.dealerLevelDictValue }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 差价归属 -->
-        <template slot="cjgs" slot-scope="text, record">
-          <span v-if="record.rebateDealer">{{ record.rebateDealer.dealerName }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 归属经销商级别 -->
-        <template slot="gsjxsjb" slot-scope="text, record">
-          <span v-if="record.rebateDealer">{{ record.rebateDealer.provinceName }} > {{ record.rebateDealer.dealerLevelDictValue }}</span>
-          <span v-else>--</span>
-        </template>
-         <!-- 上级差价归属 -->
-         <template slot="sjcjgs" slot-scope="text, record">
-          <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 上级归属经销商级别 -->
-        <template slot="sjgsjxsjb" slot-scope="text, record">
-          <span v-if="record.supDealer">{{ record.supDealer.provinceName }} > {{ record.supDealer.dealerLevelDictValue }}</span>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 关联下级 -->
-    <associate-modal v-drag :openModal="openModal" :nowData="nowData" @ok="$refs.table.refresh(true)" @close="closeModal" />
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_rebateSettings_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="rebateSettingsList-edit-btn">编辑</a-button>
+            <span v-else>--</span>
+          </template>
+          <!-- 经销商名称 -->
+          <template slot="jxs" slot-scope="text, record">
+            <span v-if="record.subDealer">{{ record.subDealer.dealerName }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 经销商级别 -->
+          <template slot="dealerLevel" slot-scope="text, record">
+            <span v-if="record.subDealer">{{ record.subDealer.provinceName }} > {{ record.subDealer.dealerLevelDictValue }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 差价归属 -->
+          <template slot="cjgs" slot-scope="text, record">
+            <span v-if="record.rebateDealer">{{ record.rebateDealer.dealerName }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 归属经销商级别 -->
+          <template slot="gsjxsjb" slot-scope="text, record">
+            <span v-if="record.rebateDealer">{{ record.rebateDealer.provinceName }} > {{ record.rebateDealer.dealerLevelDictValue }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 上级差价归属 -->
+          <template slot="sjcjgs" slot-scope="text, record">
+            <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 上级归属经销商级别 -->
+          <template slot="sjgsjxsjb" slot-scope="text, record">
+            <span v-if="record.supDealer">{{ record.supDealer.provinceName }} > {{ record.supDealer.dealerLevelDictValue }}</span>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 关联下级 -->
+      <associate-modal v-drag :openModal="openModal" :nowData="nowData" @ok="$refs.table.refresh(true)" @close="closeModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -107,17 +112,17 @@ export default {
       },
       queryParam: {
         dealerName: '',
-        supDealerName:'',
-        rebateDealerName:''
+        supDealerName: '',
+        rebateDealerName: ''
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'center', ellipsis: true },
-        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'center', width: '15%' },
-        { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'center', width: '15%' },
-        { title: '指定归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'center', width: '15%' },
-        { title: '上级经销商', scopedSlots: { customRender: 'sjcjgs' }, align: 'center', width: '15%' },
-        { title: '上级经销商级别', scopedSlots: { customRender: 'sjgsjxsjb' }, align: 'center', width: '15%' },
+        { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'left', ellipsis: true },
+        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'left', width: '15%' },
+        { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'left', width: '15%' },
+        { title: '指定归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'left', width: '15%' },
+        { title: '上级经销商', scopedSlots: { customRender: 'sjcjgs' }, align: 'left', width: '15%' },
+        { title: '上级经销商级别', scopedSlots: { customRender: 'sjgsjxsjb' }, align: 'left', width: '15%' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -169,7 +174,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 36 - 26
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -5,36 +5,42 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack(0)"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.expenseAccountNo }}</span>
+          <span style="margin: 0 10px;color: #666;">申请人:{{ detailData&&detailData.applyPersonName || '--' }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
-      <a-collapse :activeKey="['1']" class="expenseReimbursementAddcont" v-if="detailData">
-        <a-collapse-panel key="1" header="基础信息">
-          <div slot="extra" style="padding: 0 20px; color: #00aaff;" @click.stop="handleEditBase" >
+      <a-card :bordered="false" size="small" class="expenseReimbursementAddcont" v-show="showDetail">
+        <div slot="title">
+          <span>基础信息</span>
+          <div style="cursor:pointer;color: #00aaff;float:right;" @click.stop="handleEditBase" >
             <a-icon type="edit" /> 编辑基础信息
           </div>
-          <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
-            <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
-            <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="详细说明" :span="3">{{ detailData&&detailData.content.join(',')||'' }}</a-descriptions-item>
-            <a-descriptions-item label="附件" :span="3">
-              <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
-                {{ item.fileName }}
-              </a>
-            </a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
+        </div>
+        <a-descriptions :column="{ xs: 2, sm: 3, md: 3}" v-if="detailData">
+          <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
+          <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
+          <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
+          <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="详细说明" :span="3">{{ detailData&&detailData.content.join(',')||'' }}</a-descriptions-item>
+          <a-descriptions-item label="附件" :span="3">
+            <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
+              {{ item.fileName }}
+            </a>
+          </a-descriptions-item>
+        </a-descriptions>
+      </a-card>
       <!-- 费用明细 -->
-      <a-card :bordered="false" size="small" class="expenseReimbursementAddcont">
+      <a-card :bordered="false" size="small" class="expenseContent">
         <div slot="title">
           <div style="display: flex;justify-content: space-between;align-items: center;">
             <div>费用明细</div>
@@ -170,6 +176,7 @@ export default {
       openEpenseDetailModal: false, // 费用明细弹框
       expenseAccountDetailSn: '',
       openProductInfoModal: false, // 产品信息弹框
+      showDetail: false,
       total: 0,
       loadData: parameter => {
         const params = Object.assign(parameter, { expenseAccountSn: this.$route.params.sn })
@@ -357,7 +364,10 @@ export default {
       height: 100%;
     }
     .expenseReimbursementAddcont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
+    }
+    .expenseContent{
+      min-height: calc(100vh - 190px);
     }
     .upload{
       width: 100%!important;

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/baseDataModal.vue

@@ -90,8 +90,8 @@
           </a-col>
         </a-row>
         <div style="text-align: center;margin-top: 20px;">
+          <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
           <a-button type="primary" :loading="spinning" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </div>
       </a-form-model>
     </a-spin>

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -45,9 +45,9 @@
           </a-form-model>
         </div>
         <div class="btn-cont">
+          <a-button id="departUser-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
+          <a-button :loading="uploading" style="margin-right: 15px;" @click="updateUser">刷新人员</a-button>
           <a-button type="primary" id="departUser-save" @click="handleSave">确定</a-button>
-          <a-button :loading="uploading" style="margin-left: 15px;" @click="updateUser">刷新人员</a-button>
-          <a-button id="departUser-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 35 - 31
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -7,6 +7,11 @@
             <a-icon type="left"></a-icon>
             返回列表
           </a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.expenseAccountNo || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">申请人:{{ detailData&&detailData.applyPersonName }}</span>
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -21,41 +26,36 @@
             :disabled="detailData==null"
             key="2"
             type="primary"
-            class="button-error"
+            class="button-info"
             v-if="$hasPermissions('B_eRPrint')"
             id="expenseManagementDetail-print-btn"
             @click="handlePrint('print')">快捷打印</a-button>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="expenseManagementDetail-cont" v-if="detailData">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions size="small" :column="{ xs: 2, sm: 3, md: 4}">
-              <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
-              <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="打印状态">{{ detailData&&detailData.printStatusDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
-
-              <a-descriptions-item label="详细说明" :span="4">
-                {{ detailData.content.join(',')||'' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="附件" :span="4">
-                <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
-                  {{ item.fileName }}
-                </a>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="expenseManagementDetail-cont" v-show="showDetail">
+         <a-descriptions size="small" :column="{ xs: 2, sm: 3, md: 4}" v-if="detailData">
+           <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
+           <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
+           <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
+           <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="打印状态">{{ detailData&&detailData.printStatusDictValue || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="详细说明" :span="4">
+             {{ detailData.content.join(',')||'' }}
+           </a-descriptions-item>
+           <a-descriptions-item label="附件" :span="4">
+             <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
+               {{ item.fileName }}
+             </a>
+           </a-descriptions-item>
+         </a-descriptions>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <a-alert type="info" style="margin-bottom:10px">
@@ -135,7 +135,8 @@ export default {
       disabled: false,
       baseData: null,
       showTipModal: false,
-      printType: '',
+      showDetail: false,
+      printType:'',
       count: 0,
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
@@ -259,7 +260,10 @@ export default {
 <style lang="less">
 .expenseManagementDetail-wrap {
   .expenseManagementDetail-cont {
-    margin-bottom: 10px;
+    margin-bottom: 6px;
+  }
+  .pages-wrap{
+    min-height: calc(100vh - 140px);
   }
   .footer-cont{
     margin-top: 5px;

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -103,8 +103,8 @@
           <epenseCdfModal ref="epenseCdf" :list="form.detailSplitList" @fyTotal="getFyTotal"></epenseCdfModal>
         </div>
         <div class="btn-cont">
+          <a-button id="epenseDetailModal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="epenseDetailModal-save" @click="handleSave">确定</a-button>
-          <a-button id="epenseDetailModal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 79 - 74
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -1,87 +1,90 @@
 <template>
-  <a-card size="small" :bordered="false" class="salesManagementList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <employee style="width: 100%;" id="salesManagementList-Employee" v-model="queryParam.applyPersonSn"></employee>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="费用类型">
+              <expenseType
+                id="salesManagementList-expenseType"
+                :changeOnSelect="true"
+                v-model="expenseTypes"
+                @change="expenseChange"
+                placeholder="请选择费用类型"
+              ></expenseType>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+              <a-form-item label="费用发生月份">
+                <a-month-picker
+                  placeholder="请选择月份"
+                  locale="zh-cn"
+                  v-model="queryParam.expenseDate"
+                  @change="onChange"
+                  :disabled-date="disabledDate"
+                  style="width: 100%;"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <employee style="width: 100%;" id="salesManagementList-Employee" v-model="queryParam.applyPersonSn"></employee>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="主题">
+                <a-input id="salesManagementList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入主题"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-              <a-form-item label="费用类型">
-                <expenseType
-                  id="salesManagementList-expenseType"
-                  :changeOnSelect="true"
-                  v-model="expenseTypes"
-                  @change="expenseChange"
-                  placeholder="请选择费用类型"
-                ></expenseType>
+              <a-form-item label="打印状态">
+                <v-select
+                  v-model="queryParam.printStatus"
+                  ref="printStatus"
+                  id="pushOrder-printStatus"
+                  code="EXPENSE_ACCOUNT_PRINT_STATUS"
+                  placeholder="请选择打印状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-                <a-form-item label="费用发生月份">
-                  <a-month-picker
-                    placeholder="请选择月份"
-                    locale="zh-cn"
-                    v-model="queryParam.expenseDate"
-                    @change="onChange"
-                    :disabled-date="disabledDate"
-                    style="width: 100%;"/>
-                </a-form-item>
-              </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="主题">
-                  <a-input id="salesManagementList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入主题"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="打印状态">
-                  <v-select
-                    v-model="queryParam.printStatus"
-                    ref="printStatus"
-                    id="pushOrder-printStatus"
-                    code="EXPENSE_ACCOUNT_PRINT_STATUS"
-                    placeholder="请选择打印状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="salesManagementList-state"
-                    code="EXPENSE_STATE"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
+              <a-form-item label="状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="salesManagementList-state"
+                  code="EXPENSE_STATE"
+                  placeholder="请选择状态"
+                  allowClear></v-select>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
+              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="salesManagementList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
+        <a-button type="primary" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
         <a-button type="primary" :loading="spinning" @click="handlePlPrint()" ghost>批量打印</a-button>
         <span style="margin-left: 8px">
           <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
@@ -93,10 +96,11 @@
         ref="table"
         :row-selection="$hasPermissions('B_eRPrint')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: false } })}:null"
         @rowSelection="rowSelectionFun"
-        :style="{ height: tableHeight+70.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -165,6 +169,7 @@
       <previewModal v-if="showTipModal" ref="printModal" @printOk="printOk"></previewModal>
     </commonModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -418,7 +423,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 228
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/productInfoModal.vue

@@ -83,8 +83,8 @@
           </a-table>
         </div>
         <div class="btn-cont">
+          <a-button id="productInfoModal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="productInfoModal-save" @click="handleSave">确定</a-button>
-          <a-button id="productInfoModal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 156 - 155
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -1,185 +1,186 @@
 <template>
-  <a-card size="small" :bordered="false" class="expenseReimbursementDetailList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" ref="ruleForm">
-          <a-row :gutter="15">
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" ref="ruleForm">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="审核时间">
+              <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-input id="expenseReimbursementDetailList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <employee style="width: 100%;" id="expenseReimbursementDetailList-applyPersonSn" @change="employeeChange" v-model="queryParam.applyPersonSn"></employee>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              <a-form-item label="申请部门" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <department style="width: 100%;" id="expenseReimbursementDetailList-applyDepartmentSn" @change="applyDepartmentChange" v-model="queryParam.applyDepartmentSn"></department>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="expenseReimbursementDetailList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-item label="费用类型">
+                <expenseType
+                  id="expenseReimbursementDetailList-expenseType"
+                  v-model="expenseTypes"
+                  :changeOnSelect="true"
+                  @change="expenseChange"
+                  placeholder="请选择费用类型"
+                ></expenseType>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <employee style="width: 100%;" id="expenseReimbursementDetailList-applyPersonSn" @change="employeeChange" v-model="queryParam.applyPersonSn"></employee>
+              <a-form-item label="费用发生月份">
+                <a-month-picker
+                  placeholder="请选择月份"
+                  v-model="queryParam.expenseDate"
+                  @change="onChange"
+                  :disabled-date="disabledDate"
+                  style="width: 100%;"/>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="申请部门" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <department style="width: 100%;" id="expenseReimbursementDetailList-applyDepartmentSn" @change="applyDepartmentChange" v-model="queryParam.applyDepartmentSn"></department>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用类型">
-                  <expenseType
-                    id="expenseReimbursementDetailList-expenseType"
-                    v-model="expenseTypes"
-                    :changeOnSelect="true"
-                    @change="expenseChange"
-                    placeholder="请选择费用类型"
-                  ></expenseType>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用发生月份">
-                  <a-month-picker
-                    placeholder="请选择月份"
-                    v-model="queryParam.expenseDate"
-                    @change="onChange"
-                    :disabled-date="disabledDate"
-                    style="width: 100%;"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="记账类型">
-                  <v-select
-                    v-model="queryParam.accountType"
-                    ref="accountType"
-                    id="expenseReimbursementDetailList-accountType"
-                    code="EXPENSE_ACCOUNT_TYPE"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="记账名称">
-                  <!-- 部门 -->
-                  <department v-show="queryParam.accountType=='INNER_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></department>
-                  <!-- 经销商 -->
-                  <custList v-show="queryParam.accountType=='CUSTOMER'" ref="custList" @change="accountNameSnChange" placeholder="请选择记账名称(输入名称搜索)"></custList>
-                  <!-- 供应商 -->
-                  <supplier v-show="queryParam.accountType=='OUT_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></supplier>
-                  <a-select style="width: 100%" v-if="!queryParam.accountType" placeholder="请选择">
-                    <a-select-option value="" :disabled="true">
-                      请先选择记账类型
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="所属区域">
-                  <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="所属分区">
-                  <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所属省份">
-                  <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属省份" v-model="queryParam.provinceSn"></Area>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所属城市">
-                  <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属城市" leve="city" :parentId="queryParam.provinceSn" v-model="queryParam.citySn"></Area>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用承担方类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <v-select
-                    code="EXPENSE_ACCOUNT_DETAIL_SPLIT_OBJ_TYPE"
-                    allowClear
-                    style="width: 100%;"
-                    v-model="queryParam.splitObjType"
-                    @change="splitObjTypeChange"
-                    placeholder="请选择承担方类型"
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用承担方" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <!-- 部门 -->
-                  <department v-show="queryParam.splitObjType=='DEPARTMENT'" style="width: 100%;" placeholder="请选择承担方" v-model="queryParam.splitObjSn"></department>
-                  <!-- 经销商 -->
-                  <custList v-show="queryParam.splitObjType=='CUSTOMER'" ref="custList" @change="custChange" placeholder="请选择(输入名称搜索)"></custList>
-                  <a-select style="width: 100%" v-if="!queryParam.splitObjType" placeholder="请选择">
-                    <a-select-option value="" :disabled="true">
-                      请先选择承担方类型
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24" v-show="queryParam.splitObjType=='DEPARTMENT'">
-                <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <employee style="width: 100%;" placeholder="请选择承担人员" v-model="queryParam.childSplitObjSn"></employee>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24" v-show="queryParam.splitObjType==undefined">
-                <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <a-select style="width: 100%" placeholder="请选择">
-                    <a-select-option value="" :disabled="true">
-                      请先选择承担方类型
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </template>
             <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a-button
-                  style="margin-left: 10px"
-                  type="primary"
-                  class="button-warning"
-                  @click="handleExport"
-                  :disabled="disabled"
-                  :loading="exportLoading"
-                  v-if="$hasPermissions('B_expenseAcctDetailReport')"
-                  id="expenseAcctDetail-export">导出</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
+              <a-form-item label="记账类型">
+                <v-select
+                  v-model="queryParam.accountType"
+                  ref="accountType"
+                  id="expenseReimbursementDetailList-accountType"
+                  code="EXPENSE_ACCOUNT_TYPE"
+                  placeholder="请选择状态"
+                  allowClear></v-select>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="记账名称">
+                <!-- 部门 -->
+                <department v-show="queryParam.accountType=='INNER_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></department>
+                <!-- 经销商 -->
+                <custList v-show="queryParam.accountType=='CUSTOMER'" ref="custList" @change="accountNameSnChange" placeholder="请选择记账名称(输入名称搜索)"></custList>
+                <!-- 供应商 -->
+                <supplier v-show="queryParam.accountType=='OUT_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></supplier>
+                <a-select style="width: 100%" v-if="!queryParam.accountType" placeholder="请选择">
+                  <a-select-option value="" :disabled="true">
+                    请先选择记账类型
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所属区域">
+                <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所属分区">
+                <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所属省份">
+                <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属省份" v-model="queryParam.provinceSn"></Area>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所属城市">
+                <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属城市" leve="city" :parentId="queryParam.provinceSn" v-model="queryParam.citySn"></Area>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="费用承担方类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <v-select
+                  code="EXPENSE_ACCOUNT_DETAIL_SPLIT_OBJ_TYPE"
+                  allowClear
+                  style="width: 100%;"
+                  v-model="queryParam.splitObjType"
+                  @change="splitObjTypeChange"
+                  placeholder="请选择承担方类型"
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="费用承担方" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <!-- 部门 -->
+                <department v-show="queryParam.splitObjType=='DEPARTMENT'" style="width: 100%;" placeholder="请选择承担方" v-model="queryParam.splitObjSn"></department>
+                <!-- 经销商 -->
+                <custList v-show="queryParam.splitObjType=='CUSTOMER'" ref="custList" @change="custChange" placeholder="请选择(输入名称搜索)"></custList>
+                <a-select style="width: 100%" v-if="!queryParam.splitObjType" placeholder="请选择">
+                  <a-select-option value="" :disabled="true">
+                    请先选择承担方类型
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-show="queryParam.splitObjType=='DEPARTMENT'">
+              <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <employee style="width: 100%;" placeholder="请选择承担人员" v-model="queryParam.childSplitObjSn"></employee>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-show="queryParam.splitObjType==undefined">
+              <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <a-select style="width: 100%" placeholder="请选择">
+                  <a-select-option value="" :disabled="true">
+                    请先选择承担方类型
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a-button
+                style="margin-left: 10px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                v-if="$hasPermissions('B_expenseAcctDetailReport')"
+                id="expenseAcctDetail-export">导出</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="expenseReimbursementDetailList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- alert -->
-      <a-alert type="info" v-if="countData" style="margin-bottom:10px">
-        <div slot="message">
-          <div>
-            总单数:<strong>{{ countData&&(countData.detailNum || countData.detailNum==0) ? countData.detailNum : '--' }}</strong>;
-            总费用金额:<strong>{{ countData&&(countData.expense || countData.expense==0) ? toThousands(countData.expense) : '--' }}</strong>;
-          </div>
-        </div>
-      </a-alert>
+      <div>
+        总单数:<strong>{{ countData&&(countData.detailNum || countData.detailNum==0) ? countData.detailNum : '--' }}</strong>;
+        总费用金额:<strong>{{ countData&&(countData.expense || countData.expense==0) ? toThousands(countData.expense) : '--' }}</strong>;
+      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+70+'px' }"
+        :style="{ height: tableHeight+80+'px' }"
         size="small"
         rowKeyName="no"
         :rowKey="(record) => record.no"
         :columns="columns"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight,x:2250 }"
         :defaultLoadData="false"
         bordered>
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -393,7 +394,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 226
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   watch: {

+ 24 - 33
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="collectionDetail-wrap">
+    <a-card size="small" :bordered="false" class="searchBox">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -122,7 +122,7 @@
             </template>
             <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
+              <a-button style="margin-left: 10px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
               <a-button
                 style="margin-left: 10px"
                 type="primary"
@@ -142,30 +142,32 @@
       </div>
     </a-card>
     <a-card size="small" :bordered="false" class="collectionDetail-wrap" style="margin-top:5px;">
-      <div class="gatherMessage">
-        订单总金额:<strong> {{ toThousands(countData&&countData.orderAmount||0) }}</strong>;
-        收款总金额:<strong>{{ toThousands(countData&&countData.receiptAmount||0) }}</strong>;
-        使用授信总金额:<strong>{{ toThousands(countData&&countData.useCreditAmount||0) }}</strong>;
-        授信还款总金额:<strong>{{ toThousands(countData&&countData.payCreditAmount||0) }}</strong>;
-        余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
-        跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
-      </div>
-      <div class="gatherMessage">
-        <a-dropdown>
-          <a-menu slot="overlay" @click="handleMenuClick">
-            <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
-            <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
-          </a-menu>
-          <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
-        </a-dropdown>
-        <span v-if="selNums" style="margin-left:10px;">已选{{ selNums }}项</span>
+      <div class="flex-center" style="margin-bottom: 10px;">
+        <div class="flex-center">
+          <a-dropdown>
+            <a-menu slot="overlay" @click="handleMenuClick">
+              <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
+              <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
+            </a-menu>
+            <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
+          </a-dropdown>
+          <span v-if="selNums" style="margin-left:10px;">已选{{ selNums }}项</span>
+        </div>
+        <div class="flex-center" style="margin-left:10px;">
+          订单总金额:<strong> {{ toThousands(countData&&countData.orderAmount||0) }}</strong>;
+          收款总金额:<strong>{{ toThousands(countData&&countData.receiptAmount||0) }}</strong>;
+          使用授信总金额:<strong>{{ toThousands(countData&&countData.useCreditAmount||0) }}</strong>;
+          授信还款总金额:<strong>{{ toThousands(countData&&countData.payCreditAmount||0) }}</strong>;
+          余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
+          跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
+        </div>
       </div>
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+60+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -537,7 +539,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 310
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     },
     // 开票操作
     handleInvoice (con) {
@@ -616,15 +618,4 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .collectionDetail-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
-  }
-</style>
+ 

+ 1 - 1
src/views/financialManagement/financialCollection/baseModal.vue

@@ -55,8 +55,8 @@
             upText="上传附件"></Upload>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;margin-top: 50px;">
+          <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
           <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 48 - 26
src/views/financialManagement/financialCollection/detail.vue

@@ -1,34 +1,37 @@
 <template>
-  <div class="financialCollectionAddwrap">
+  <div class="financialCollectionDetailwrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="financialCollectionAddcont" v-if="!bookSn" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack(0)"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.bookNo || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">申请人:{{ detailData&&detailData.applyPersonName }}</span>
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
-      <a-collapse :activeKey="['1']" class="financialCollectionAddcont" v-if="detailData">
-        <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
-            <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收款单号">
-              {{ detailData&&detailData.bookNo || '--' }}
-            </a-descriptions-item>
-            <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item span="2" label="收款事由">{{ detailData&&detailData.bookReason || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="状态">{{ detailData&&detailData.statusDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="付款方类型">{{ detailData&&detailData.payerTypeDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="付款方">{{ detailData&&detailData.payerName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks||'--' }}</a-descriptions-item>
-            <a-descriptions-item label="附件" :span="3">
-              <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.attachmentList" :key="item.id">
-                {{ item.fileName }}
-              </a>
-            </a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
+      <a-card :bordered="false" class="financialCollectionAddcont" v-show="showDetail">
+         <a-descriptions :column="{ xs: 2, sm: 3, md: 3}" v-if="detailData" ref="tableSearch">
+           <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="收款单号">
+             {{ detailData&&detailData.bookNo || '--' }}
+           </a-descriptions-item>
+           <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item span="2" label="收款事由">{{ detailData&&detailData.bookReason || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="状态">{{ detailData&&detailData.statusDictValue || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="付款方类型">{{ detailData&&detailData.payerTypeDictValue || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="付款方">{{ detailData&&detailData.payerName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks||'--' }}</a-descriptions-item>
+           <a-descriptions-item label="附件" :span="3">
+             <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.attachmentList" :key="item.id">
+               {{ item.fileName }}
+             </a>
+           </a-descriptions-item>
+         </a-descriptions>
+      </a-card>
       <!-- 财务明细 -->
       <a-card :bordered="false" size="small" class="financialCollectionAddcont" v-if="$route.params.sn||bookSn">
         <div slot="title">
@@ -51,9 +54,11 @@
           class="sTable fixPagination"
           ref="table"
           size="small"
+          :style="{ height: tableHeight+5+'px' }"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           :showPagination="false"
           bordered>
@@ -99,8 +104,10 @@ export default {
       spinning: false,
       detailData: null,
       openDepartUserModal: false,
+      showDetail: false,
       total: 0,
       bookSn: null,
+      tableHeight: 300,
       loadData: parameter => {
         const params = Object.assign(parameter, { bookSn: this.$route.params.sn || this.bookSn })
         return financeBookDetailQueryList(params).then(res => {
@@ -149,7 +156,22 @@ export default {
       ]
     }
   },
+  watch: {
+    showDetail (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   methods: {
+    setTableH () {
+      const tableSearchH = this.showDetail ? this.$refs.tableSearch.offsetHeight : 0
+      this.tableHeight = window.innerHeight - tableSearchH - 240
+    },
     getTotal (data) {
       let ret = 0
       data.map(item => {
@@ -170,6 +192,7 @@ export default {
       })
       this.$nextTick(() => {
         this.$refs.table.refresh(true)
+        this.setTableH()
       })
     },
     // 返回
@@ -201,13 +224,12 @@ export default {
 </script>
 
 <style lang="less">
-  .financialCollectionAddwrap{
+  .financialCollectionDetailwrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
     box-sizing: border-box;
     .financialCollectionAddcont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .affix{
       .ant-affix{

+ 15 - 6
src/views/financialManagement/financialCollection/edit.vue

@@ -5,13 +5,21 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack(0)"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.bookNo || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">申请人:{{ detailData&&detailData.applyPersonName }}</span>
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
-      <a-collapse :activeKey="['1']" class="financialCollectionAddcont" v-if="detailData">
-        <a-collapse-panel key="1" header="基础信息">
-          <div slot="extra" style="padding: 0 20px; color: #00aaff;" @click.stop="handleEditBase" >
+      <a-card size="small" :bordered="false" class="financialCollectionAddcont" v-show="showDetail">
+        <div slot="title">
+          <span>基础信息</span>
+          <div style="cursor:pointer;color: #00aaff;float:right;" @click.stop="handleEditBase" >
             <a-icon type="edit" /> 编辑基础信息
           </div>
+        </div>
+        <div v-if="detailData">
           <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
             <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="收款单号">
@@ -30,8 +38,8 @@
               </a>
             </a-descriptions-item>
           </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
+        </div>
+      </a-card>
       <!-- 财务明细 -->
       <a-card :bordered="false" size="small" class="financialCollectionAddcont" v-if="$route.params.sn">
         <div slot="title">
@@ -211,6 +219,7 @@ export default {
       openBaseModal: false,
       openDepartUserModal: false,
       openFcDetailModal: false, // 财务明细弹框
+      showDetail: false,
       total: 0,
       loadData: parameter => {
         const params = Object.assign(parameter, { bookSn: this.$route.params.sn })
@@ -497,7 +506,7 @@ export default {
       height: 100%;
     }
     .financialCollectionAddcont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .affix{
       .ant-affix{

+ 1 - 1
src/views/financialManagement/financialCollection/fcDetailModal.vue

@@ -189,8 +189,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;margin-top: 50px;">
+              <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
               <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-              <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
             </a-form-model-item>
           </a-col>
         </a-row>

+ 85 - 79
src/views/financialManagement/financialCollection/list.vue

@@ -1,102 +1,107 @@
 <template>
-  <a-card size="small" :bordered="false" class="financialCollectionList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeDate" :value="creatDate" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="收款单号">
+              <a-input id="financialCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="关联单据单号">
+              <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入关联单据单号"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="申请人">
+                <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="creatDate" @change="dateChange" />
+              <a-form-item label="收款事由">
+                <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收款单号">
-                <a-input id="financialCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
+              <a-form-item label="付款方类型">
+                <v-select
+                  v-model="queryParam.payerType"
+                  ref="payType"
+                  code="PAYER_TYPE"
+                  placeholder="请选择付款方式类型"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="关联单据单号">
-                <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入关联单据单号"/>
+              <a-form-item label="付款方">
+                <a-input id="financialCollectionList-payerNames" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="申请人">
-                  <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收款事由">
-                  <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="付款方类型">
-                  <v-select
-                    v-model="queryParam.payerType"
-                    ref="payType"
-                    code="PAYER_TYPE"
-                    placeholder="请选择付款方式类型"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="付款方">
-                  <a-input id="financialCollectionList-payerNames" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="审核时间">
-                  <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.status"
-                    ref="status"
-                    id="financialCollectionList-status"
-                    code="FINANCE_BOOK_STATE"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <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-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>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="审核时间">
+                <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="状态">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="financialCollectionList-status"
+                  code="FINANCE_BOOK_STATE"
+                  placeholder="请选择状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <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-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>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="financialCollectionList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
-        <div class="table-operator" v-if="$hasPermissions('B_fc_new')">
-          <a-button type="primary" class="button-error" @click="handleAdd">新增</a-button>
-        </div>
-        <a-alert type="info" style="margin-bottom:10px">
-          <div slot="message">
-            订单总金额:{{ toThousands(countData&&countData.orderTotalAmount||0) }};
-            收款总金额:{{ toThousands(countData&&countData.receiptTotalAmount||0) }};
-            使用授信总金额:{{ toThousands(countData&&countData.useTotalAmount||0) }};
-            授信还款总金额:{{ toThousands(countData&&countData.payTotalAmount||0) }};
-            余款抵扣总金额:{{ toThousands(countData&&countData.balanceTotalAmount||0) }};
+        <div class="table-operator">
+          <div class="flex-center">
+            <a-button type="primary" v-if="$hasPermissions('B_fc_new')" @click="handleAdd">新增</a-button>
+            <div class="tongji-bar">
+              订单总金额:{{ toThousands(countData&&countData.orderTotalAmount||0) }};
+              收款总金额:{{ toThousands(countData&&countData.receiptTotalAmount||0) }};
+              使用授信总金额:{{ toThousands(countData&&countData.useTotalAmount||0) }};
+              授信还款总金额:{{ toThousands(countData&&countData.payTotalAmount||0) }};
+              余款抵扣总金额:{{ toThousands(countData&&countData.balanceTotalAmount||0) }};
+            </div>
           </div>
-        </a-alert>
-      </div>
+          <div></div>
+        </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
+        :pageSize="30"
         :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
@@ -157,6 +162,7 @@
     <!-- 关联备货单 -->
     <dispatchModal v-drag ref="openDisModal" :openModal="openDisModal" :itemSn="itemSn" @close="openDisModal=false"></dispatchModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -232,7 +238,7 @@ export default {
         { title: '关联单据', scopedSlots: { customRender: 'dispatchNum' }, width: '6%', align: 'center' },
         { title: '申请人', dataIndex: 'applyPersonName', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
         { title: '收款事由', dataIndex: 'bookReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '付款方', dataIndex: 'payerName', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '付款方', dataIndex: 'payerName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订单总金额', dataIndex: 'orderTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
@@ -357,7 +363,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 206
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 2 - 2
src/views/financialManagement/warehousingConfirmation/detailModal.vue

@@ -79,8 +79,8 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '7%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '45%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '45%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '入库数量(个)', dataIndex: 'putQty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_warehousingConfirmationDetail_costPrice')) {

+ 42 - 37
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -1,49 +1,52 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="入库单号">
+              <a-input id="warehousingConfirmationList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="单据状态">
+              <v-select
+                v-model="queryParam.auditState"
+                ref="auditState"
+                id="warehousingConfirmationList-auditState"
+                code="PUT_CONFIRM_STATE"
+                placeholder="请选择单据状态"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+            <a-form-model-item label="仓库">
+              <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+            </a-form-model-item>
+          </a-col>
+          <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-left: 5px" @click="resetSearchForm" :disabled="disabled" id="warehousingConfirmationList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="warehousingConfirmationList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="入库单号">
-                <a-input id="warehousingConfirmationList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
-                <v-select
-                  v-model="queryParam.auditState"
-                  ref="auditState"
-                  id="warehousingConfirmationList-auditState"
-                  code="PUT_CONFIRM_STATE"
-                  placeholder="请选择单据状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col>
-            <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-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: 10px">
-        <a-button type="primary" class="button-info" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
-        <span style="margin-left: 5px">
+        <a-button type="primary" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
+        <span style="margin-left: 10px">
           <template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length>0"> {{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }} </template>
         </span>
       </div>
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.stockPutSn"
         rowKeyName="stockPutSn"
@@ -51,6 +54,7 @@
         @rowSelection="rowSelectionFun"
         :columns="columns"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -97,6 +101,7 @@
       </div>
     </a-modal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -159,7 +164,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(3, 0, { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(3, 0, { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       if (this.$hasPermissions('M_warehousingConfirmationList_costPrice')) { // 成本价权限
         arr.splice(this.isShowWarehouse?5:4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
@@ -259,7 +264,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

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

@@ -300,7 +300,7 @@ export default {
       }
     }
     .intelligentReplenishmentEdit-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .intelligentReplenishmentEdit-cont{
       height: 100%;

+ 1 - 1
src/views/inventoryManagement/inventoryCheck/addModal.vue

@@ -26,8 +26,8 @@
           </p>
         </div>
         <div class="btn-cont">
+          <a-button id="inventoryCheckAddModal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="inventoryCheckAddModal-save" @click="handleSave">确定</a-button>
-          <a-button id="inventoryCheckAddModal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 24 - 24
src/views/inventoryManagement/inventoryCheck/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="inventoryCheckDetail-wrap">
+  <div class="inventoryCheckDetail-wrap" :style="{paddingBottom:detail&&(detail.state!='FINISH' && detail.state!='DELETE')?'51px':'0px'}">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" @back="handleBack" class="inventoryCheckDetail-cont" >
         <!-- 自定义的二级文字标题 -->
@@ -7,28 +7,27 @@
           <a id="inventoryCheckDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.checkWarehouseNo }}</span>
           <span class="state-c" v-if="detail&&detail.state=='DELETE'">已作废</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="inventoryCheckDetail-cont">
-        <a-collapse>
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="4">
-              <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="作废时间" v-if="detail&&detail.state=='DELETE'">{{ (detail&&detail.deleteTime) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="inventoryCheckDetail-cont" v-show="showDetail">
+        <a-descriptions :column="4">
+          <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="作废时间" v-if="detail&&detail.state=='DELETE'">{{ (detail&&detail.deleteTime) || '--' }}</a-descriptions-item>
+        </a-descriptions>
       </a-card>
       <!-- 产品详情 -->
       <a-card size="small" :bordered="false" class="inventoryCheckDetail-cont">
@@ -59,7 +58,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top:6px;">
                 <a-checkbox v-model="foldState" @change="foldStateChange"><span style="display: inline-block;margin-top: 1px;">折叠列表</span></a-checkbox>
               </div>
             </a-col>
@@ -90,11 +89,10 @@
           @changePage="changePage" />
       </a-card>
     </a-spin>
-    <div class="affix-cont">
+    <div class="affix-cont" v-if="detail&&(detail.state!='FINISH' && detail.state!='DELETE') && $hasPermissions('B_inventoryCheckVoid')">
       <a-button
         type="primary"
         id="inventoryCheckDetail-submit-btn"
-        v-if="detail&&(detail.state!='FINISH' && detail.state!='DELETE') && $hasPermissions('B_inventoryCheckVoid')"
         size="large"
         class="button-primary"
         :disabled="spinning"
@@ -118,6 +116,7 @@ export default {
       spinning: false,
       disabled: false,
       loading: false,
+      showDetail: false,
       queryParam: {
         productCode: ''
       },
@@ -300,7 +299,7 @@ export default {
       height: 100%;
     }
     .inventoryCheckDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .billno{
         font-size: 16px;
         font-weight: bold;
@@ -310,6 +309,7 @@ export default {
         color: #ed1c24;
         font-size: 13px;
         font-weight: bold;
+        margin: 0 15px 0 0;
       }
     }
   }

+ 71 - 80
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -1,76 +1,83 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="盘点单号">
+              <a-input id="inventoryCheckList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24" v-show="isShowWarehouse">
+            <a-form-item label="仓库">
+              <warehouse
+                v-model="queryParam.warehouseSn"
+                isPermission
+                id="inventoryCheckList-warehouseSn"
+                placeholder="请选择仓库"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="盘点状态">
+              <v-select
+                v-model="queryParam.checkState"
+                ref="checkState"
+                id="inventoryCheckList-checkState"
+                code="CHECK_WAREHOUSE_STATE"
+                placeholder="请选择盘点状态"
+                allowClear
+              ></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="监盘状态">
+              <v-select
+                v-model="queryParam.checkSuperviseState"
+                ref="checkSuperviseState"
+                id="inventoryCheckList-checkSuperviseState"
+                code="CHECK_WAREHOUSE_SUPERVISE_STATE"
+                placeholder="请选择监盘状态"
+                allowClear
+              ></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="inventoryCheckList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 标签页 -->
-      <a-tabs type="card" :default-active-key="queryParam.deleteFlag" @change="handleTabChange" class="inventoryCheckList-tabs">
-        <a-tab-pane v-for="item in tabPaneData" :key="item.type">
-          <span slot="tab">{{ item.name }}</span>
-        </a-tab-pane>
-      </a-tabs>
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="inventoryCheckList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24" v-show="isShowWarehouse">
-              <a-form-item label="仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  isPermission
-                  id="inventoryCheckList-warehouseSn"
-                  placeholder="请选择仓库"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="盘点状态">
-                <v-select
-                  v-model="queryParam.checkState"
-                  ref="checkState"
-                  id="inventoryCheckList-checkState"
-                  code="CHECK_WAREHOUSE_STATE"
-                  placeholder="请选择盘点状态"
-                  allowClear
-                ></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="监盘状态">
-                <v-select
-                  v-model="queryParam.checkSuperviseState"
-                  ref="checkSuperviseState"
-                  id="inventoryCheckList-checkSuperviseState"
-                  code="CHECK_WAREHOUSE_SUPERVISE_STATE"
-                  placeholder="请选择监盘状态"
-                  allowClear
-                ></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_inventoryCheckAdd')" id="inventoryCheckList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+      <div class="table-operator flex-center" style="justify-content: space-between;">
+        <div class="flex-center">
+          <a-button v-if="$hasPermissions('B_inventoryCheckAdd')" id="inventoryCheckList-add" type="primary" @click="handleAdd">新增</a-button>
+        </div>
+        <div>
+          <a-radio-group v-model="queryParam.deleteFlag" @change="handleTabChange">
+            <a-radio-button v-for="item in tabPaneData" :key="item.type" :value="item.type">
+              {{ item.name }}
+            </a-radio-button>
+          </a-radio-group>
+        </div>
       </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
+        :pageSize="30"
         :defaultLoadData="false"
         bordered>
         <!-- 操作 -->
@@ -97,6 +104,7 @@
       @ok="openCommonModal=false"
       @cancel="openCommonModal=false" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -195,8 +203,8 @@ export default {
       this.$router.push({ path: `/inventoryManagement/inventoryCheck/detail/${data.checkWarehouseSn}` })
     },
     // 选择类型
-    handleTabChange (key) {
-      this.queryParam.deleteFlag = key
+    handleTabChange (event) {
+      this.queryParam.deleteFlag = event.target.value
       this.$refs.table.refresh(true)
     },
     // 详情
@@ -223,7 +231,7 @@ export default {
       })
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 332
+      this.tableHeight = window.innerHeight - 283
     }
   },
   watch: {
@@ -264,23 +272,6 @@ export default {
 
 <style lang="less">
   .inventoryCheckList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
-    // tab样式
-    .inventoryCheckList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
-      height: 30px!important;
-    }
-    .inventoryCheckList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
-      height: 30px!important;
-    }
-    .inventoryCheckList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
-      line-height: 26px!important;
-      height: 30px!important;
-    }
+    
   }
 </style>

+ 36 - 20
src/views/inventoryManagement/inventoryConfirmation/detail.vue

@@ -6,26 +6,25 @@
         <template slot="subTitle">
           <a id="inventoryConfirmationDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.checkWarehouseNo }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="inventoryConfirmationDetail-cont">
-        <a-collapse>
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="inventoryConfirmationDetail-cont" v-show="showDetail">
+         <a-descriptions :column="3">
+           <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
+         </a-descriptions>
       </a-card>
       <!-- 产品详情 -->
       <a-card size="small" :bordered="false" class="inventoryConfirmationDetail-cont">
@@ -65,7 +64,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top:6px;">
                 <a-checkbox v-model="foldState" @change="foldStateChange"><span style="display: inline-block;margin-top: 1px;">仅显示盈亏</span></a-checkbox>
               </div>
             </a-col>
@@ -73,12 +72,15 @@
         </div>
         <!-- 列表 -->
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
+          :style="{ height: tableHeight+70+'px' }"
           :rowKey="(record) => record.id"
           :columns="columns"
+          :scroll="{ y: tableHeight }"
           :data="loadData"
+          :pageSize="30"
           :defaultLoadData="false"
           bordered>
           <!-- 盈亏数量 -->
@@ -111,6 +113,7 @@ export default {
     return {
       spinning: false,
       disabled: false,
+      showDetail: false,
       queryParam: {
         profitLossFlag: undefined,
         productCode: ''
@@ -136,6 +139,7 @@ export default {
           return data
         })
       },
+      tableHeight: 0,
       detail: null, //  详情数据
       foldState: false, //  是否仅显示盈亏
       productTotal: null //  合计
@@ -175,6 +179,7 @@ export default {
     resetSearchForm () {
       this.queryParam.productCode = ''
       this.$refs.table.refresh(true)
+      this.setTableH()
     },
     getCount (params) {
       checkWarehouseDetailCount(params).then(res => {
@@ -204,6 +209,17 @@ export default {
         this.queryParam.profitLossFlag = undefined
         this.$refs.table.refresh(true)
       }
+    },
+    setTableH () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.tableHeight = window.innerHeight - 315
+      })
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {
@@ -228,7 +244,7 @@ export default {
 <style lang="less">
   .inventoryConfirmationDetail-wrap{
     .inventoryConfirmationDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .billno{
         font-size: 16px;
         font-weight: bold;

+ 34 - 30
src/views/inventoryManagement/inventoryConfirmation/list.vue

@@ -1,42 +1,47 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="盘点单号">
+              <a-input id="inventoryConfirmationList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="仓库">
+              <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryConfirmationList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryConfirmationList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  
   <a-card size="small" :bordered="false" class="inventoryConfirmationList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 标签页 -->
-      <a-tabs type="card" :default-active-key="queryParam.state" @change="handleTabChange" class="inventoryConfirmationList-tabs">
+      <a-tabs :default-active-key="queryParam.state" @change="handleTabChange" class="inventoryConfirmationList-tabs">
         <a-tab-pane v-for="item in tabPaneData" :key="item.type">
           <span slot="tab">{{ item.name }}</span>
         </a-tab-pane>
       </a-tabs>
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="inventoryConfirmationList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryConfirmationList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryConfirmationList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -66,6 +71,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -213,7 +219,7 @@ export default {
       })
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 295
+      this.tableHeight = window.innerHeight - 290
     }
   },
   watch: {
@@ -247,12 +253,10 @@ export default {
 
 <style lang="less">
   .inventoryConfirmationList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
+    .ant-card-body{
+      &:last-child{
+        padding-top: 0;
+      }
     }
     // tab样式
     .inventoryConfirmationList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{

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

@@ -94,9 +94,9 @@ export default {
       let _this=this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', width: '22%', ellipsis: true, customRender: function (text) { return text || '--' }, ellipsis: true},
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text ? text : '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'left', width: '22%', ellipsis: true, customRender: function (text) { return text || '--' }, ellipsis: true},
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'left', customRender: function (text) { return text ? text : '--' } },
         { title: '入库时间', dataIndex: 'putTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },

+ 87 - 76
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -1,87 +1,90 @@
 <template>
+  <div>
+   <a-card size="small" :bordered="false" class="searchBoxNormal">
+     <!-- 搜索条件 -->
+     <div ref="tableSearch" class="table-page-search-wrapper">
+       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+         <a-row :gutter="15">
+           <a-col :md="6" :sm="24">
+             <a-form-item label="产品编码">
+               <a-input id="inventoryQueryList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+             </a-form-item>
+           </a-col>
+           <a-col :md="6" :sm="24">
+             <a-form-item label="原厂编码">
+               <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+             </a-form-item>
+           </a-col>
+           <a-col :md="5" :sm="24">
+             <a-form-item label="产品名称">
+               <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+             </a-form-item>
+           </a-col>
+           <template v-if="advanced">
+             <a-col :md="6" :sm="24">
+               <a-form-item label="产品品牌">
+                 <ProductBrand id="inventoryQueryList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+               </a-form-item>
+             </a-col>
+             <a-col :md="6" :sm="24">
+               <a-form-model-item label="产品分类">
+                 <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+               </a-form-model-item>
+             </a-col>
+             <a-col :md="6" :sm="24">
+               <a-form-item label="仓库">
+                 <warehouse
+                   isPermission
+                   v-model="queryParam.warehouseSn"
+                   id="inventoryQueryList-warehouseSn"
+                   placeholder="请选择仓库"
+                 />
+               </a-form-item>
+             </a-col>
+             <a-col :md="4" :sm="24">
+               <a-form-item label="库存情况">
+                 <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
+               </a-form-item>
+             </a-col>
+           </template>
+           <a-col :md="7" :sm="24">
+             <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
+             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
+             <a-button
+               v-if="$hasPermissions('B_inventoryQuery_export')"
+               type="primary"
+               style="margin-left: 5px"
+               class="button-warning"
+               @click="openExcelModal=true"
+               :disabled="disabled"
+               :loading="exportLoading"
+               id="inventoryQueryList-export">导出</a-button>
+             <a @click="advanced=!advanced" style="margin-left: 5px">
+               {{ advanced ? '收起' : '展开' }}
+               <a-icon :type="advanced ? 'up' : 'down'"/>
+             </a>
+           </a-col>
+         </a-row>
+       </a-form>
+     </div>
+  </a-card>
+  
   <a-card size="small" :bordered="false" class="inventoryQueryList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="inventoryQueryList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="原厂编码">
-                <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="5" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
-              </a-form-item>
-            </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品品牌">
-                  <ProductBrand id="inventoryQueryList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品分类">
-                  <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="仓库">
-                  <warehouse
-                    isPermission
-                    v-model="queryParam.warehouseSn"
-                    id="inventoryQueryList-warehouseSn"
-                    placeholder="请选择仓库"
-                  />
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="库存情况">
-                  <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="7" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
-              <a-button
-                v-if="$hasPermissions('B_inventoryQuery_export')"
-                type="primary"
-                style="margin-left: 5px"
-                class="button-warning"
-                @click="openExcelModal=true"
-                :disabled="disabled"
-                :loading="exportLoading"
-                id="inventoryQueryList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 合计 -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div class="ftext" slot="message">
-          可用库存总数量:<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}个</strong>;
-          <span v-if="$hasPermissions('M_inventoryQueryList_costPrice')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
-        </div>
-      </a-alert>
+      <div class="ftext tongji-bar">
+        可用库存总数量:<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}个</strong>;
+        <span v-if="$hasPermissions('M_inventoryQueryList_costPrice')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
+      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+68+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -111,6 +114,7 @@
     <!-- 导出Excel -->
     <export-excel-modal :openModal="openExcelModal" @ok="handleExcelOk" @close="openExcelModal=false" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -203,9 +207,9 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '货位编号', dataIndex: 'stackPlaceEntity.stackPlaceCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后入库时间', dataIndex: 'lastStockTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -291,7 +295,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 226
     }
   },
   watch: {
@@ -328,3 +332,10 @@ export default {
   }
 }
 </script>
+<style lang="less">
+  .inventoryQueryList-wrap{
+    .sTable{
+      margin-top: 10px;
+    }
+  }
+</style>

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

@@ -100,7 +100,7 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -187,15 +187,15 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '6%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '6%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'stockBatchNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '下推单号', dataIndex: 'bizSubNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据审核时间', dataIndex: 'auditTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位名称', dataIndex: 'unitName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位名称', dataIndex: 'unitName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
@@ -267,7 +267,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 295
+      this.tableHeight = window.innerHeight - tableSearchH - 268
     }
   },
   watch: {
@@ -303,10 +303,10 @@ export default {
 <style lang="less">
   .inventoryQueryWarehouseDetail-wrap{
     .inventoryQueryWarehouseDetail-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .inventoryQueryWarehouseDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .green{
       color: #19be6b;

+ 62 - 58
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -1,70 +1,73 @@
 <template>
-  <a-card size="small" :bordered="false" class="inventoryWarningList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品编码">
+              <a-input id="inventoryWarningList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="原厂编码">
+              <a-input id="inventoryWarningList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品名称">
+              <a-input id="inventoryWarningList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="inventoryWarningList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="产品品牌">
+                <ProductBrand id="inventoryWarningList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="原厂编码">
-                <a-input id="inventoryWarningList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
-              </a-form-item>
+              <a-form-model-item label="产品分类">
+                <ProductType id="inventoryWarningList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+              </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="inventoryWarningList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+              <a-form-item label="仓库">
+                <warehouse
+                  v-model="queryParam.warehouseSn"
+                  isPermission
+                  id="inventoryWarningList-warehouseSn"
+                  placeholder="请选择仓库"
+                />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品品牌">
-                  <ProductBrand id="inventoryWarningList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品分类">
-                  <ProductType id="inventoryWarningList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-                <a-form-item label="仓库">
-                  <warehouse
-                    v-model="queryParam.warehouseSn"
-                    isPermission
-                    id="inventoryWarningList-warehouseSn"
-                    placeholder="请选择仓库"
-                  />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="预警提示">
-                  <v-select
-                    v-model="queryParam.stockState"
-                    ref="stockState"
-                    id="inventoryWarningList-stockState"
-                    code="STOCK_WARN_TIP"
-                    placeholder="请选择预警提示"
-                    allowClear
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
             <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryWarningList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryWarningList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+              <a-form-item label="预警提示">
+                <v-select
+                  v-model="queryParam.stockState"
+                  ref="stockState"
+                  id="inventoryWarningList-stockState"
+                  code="STOCK_WARN_TIP"
+                  placeholder="请选择预警提示"
+                  allowClear
+                ></v-select>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+          </template>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryWarningList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryWarningList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="inventoryWarningList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div v-if="$hasPermissions('B_inventoryWarning_refresh')" class="table-operator">
         <a-button class="button-error" type="primary" id="inventoryWarningList-update" :loading="loading" @click="handleupdate">批量更新</a-button>
@@ -76,7 +79,7 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :row-selection="$hasPermissions('B_inventoryWarning_refresh')?{ columnWidth: '4%' }:null"
         :rowKey="(record) => record.id"
@@ -160,6 +163,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>

+ 20 - 20
src/views/inventoryManagement/makeInventory/check.vue

@@ -6,6 +6,9 @@
         <template slot="subTitle">
           <a id="makeInventoryCheck-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.checkWarehouseNo }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -20,24 +23,20 @@
             @click="handlePdPrint">盘点打印</a-button>
         </template></a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="makeInventoryCheck-cont">
-        <a-collapse>
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="makeInventoryCheck-cont" v-show="showDetail">
+         <a-descriptions :column="3">
+           <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
+         </a-descriptions>
       </a-card>
       <!-- 产品详情 -->
       <a-card size="small" :bordered="false" class="makeInventoryCheck-cont">
@@ -75,7 +74,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top:6px;">
                 <a-checkbox v-model="foldState" @change="foldStateChange"><span style="display: inline-block;margin-top: 1px;">折叠列表</span></a-checkbox>
               </div>
             </a-col>
@@ -161,6 +160,7 @@ export default {
       spinning: false,
       disabled: false,
       loading: false,
+      showDetail: false,
       queryParam: {
         productCode: ''
       },
@@ -403,7 +403,7 @@ export default {
       height: 100%;
     }
     .makeInventoryCheck-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .billno{
         font-size: 16px;
         font-weight: bold;

+ 31 - 27
src/views/inventoryManagement/makeInventory/list.vue

@@ -1,37 +1,40 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="盘点单号">
+              <a-input id="makeInventoryList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+            <a-form-item label="仓库">
+              <warehouse
+                v-model="queryParam.warehouseSn"
+                id="inventoryCheckList-warehouseSn"
+                isPermission
+                placeholder="请选择仓库"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="makeInventoryList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="makeInventoryList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="makeInventoryList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="makeInventoryList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-item label="仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  id="inventoryCheckList-warehouseSn"
-                  isPermission
-                  placeholder="请选择仓库"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="makeInventoryList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="makeInventoryList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+73+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -53,6 +56,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>

+ 21 - 21
src/views/inventoryManagement/supervisionDisk/check.vue

@@ -6,6 +6,9 @@
         <template slot="subTitle">
           <a id="supervisionDiskCheck-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.checkWarehouseNo }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -20,24 +23,20 @@
             @click="handlePdPrint">监盘打印</a-button>
         </template></a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="supervisionDiskCheck-cont">
-        <a-collapse>
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="supervisionDiskCheck-cont" v-show="showDetail">
+         <a-descriptions :column="3">
+           <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
+         </a-descriptions>
       </a-card>
       <!-- 产品详情 -->
       <a-card size="small" :bordered="false" class="supervisionDiskCheck-cont">
@@ -76,7 +75,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top:6px;">
                 <a-checkbox v-model="foldState" @change="foldStateChange"><span style="display: inline-block;margin-top: 1px;">折叠列表</span></a-checkbox>
               </div>
             </a-col>
@@ -132,7 +131,7 @@
     </a-spin>
     <div class="affix-cont">
       <a-button
-        type="primary"
+        type="default"
         id="supervisionDiskCheck-check-btn"
         size="large"
         class="button-primary"
@@ -170,6 +169,7 @@ export default {
       spinning: false,
       disabled: false,
       loading: false,
+      showDetail: false,
       queryParam: {
         productCode: ''
       },
@@ -435,7 +435,7 @@ export default {
       height: 100%;
     }
     .supervisionDiskCheck-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .billno{
         font-size: 16px;
         font-weight: bold;

+ 32 - 34
src/views/inventoryManagement/supervisionDisk/list.vue

@@ -1,37 +1,40 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="盘点单号">
+              <a-input id="supervisionDiskList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+            <a-form-item label="仓库">
+              <warehouse
+                v-model="queryParam.warehouseSn"
+                id="supervisionDiskList-warehouseSn"
+                isPermission
+                placeholder="请选择仓库"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supervisionDiskList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="supervisionDiskList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="supervisionDiskList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="supervisionDiskList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-item label="仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  id="supervisionDiskList-warehouseSn"
-                  isPermission
-                  placeholder="请选择仓库"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supervisionDiskList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="supervisionDiskList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+73+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -53,6 +56,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -176,12 +180,6 @@ export default {
 
 <style lang="less">
   .supervisionDiskList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
+     
   }
 </style>

+ 25 - 21
src/views/power/OperateJournal/OperateJournal.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false">
-    <div class="operateJournal">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索框 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -27,23 +27,27 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <span slot="actDesc" slot-scope="text, record">{{ record.actDate }}-{{ record.actDesc }}</span>
-        <span slot="actorName" slot-scope="text, record">{{ record.actorName }}-{{ record.actorPhone }}</span>
-      </s-table>
-    </div>
-  </a-card>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <div class="operateJournal">
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          rowKey="id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <span slot="actDesc" slot-scope="text, record">{{ record.actDate }}-{{ record.actDesc }}</span>
+          <span slot="actorName" slot-scope="text, record">{{ record.actorName }}-{{ record.actorPhone }}</span>
+        </s-table>
+      </div>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -77,7 +81,7 @@ export default {
         { title: '操作时间', dataIndex: 'actDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: 'IP', dataIndex: 'ip', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作人', dataIndex: 'actorName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '操作信息', dataIndex: 'actDesc', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '操作信息', dataIndex: 'actDesc', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -120,7 +124,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 203
+      this.tableHeight = window.innerHeight - tableSearchH - 210
     }
   },
   watch: {

+ 9 - 5
src/views/power/dataDictionary/dataDictionary.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" :style="{height:windowHeight+'px'}">
     <a-row :gutter="24">
       <!-- 左侧字典列表 -->
       <a-col :span="6">
@@ -19,7 +19,7 @@
           <a-input-search v-model="code" placeholder="输入编码类别/名称 搜索字典" style="width: 100%" @search="getCodeList" />
         </a-row>
         <a-row :gutter="24" >
-          <a-menu class="menu-box" style="border-right: 0;max-height: 650px;overflow: auto;" v-model="selectedKey" >
+          <a-menu class="menu-box" style="border-right: 0;max-height: 660px;overflow: auto;" v-model="selectedKey" >
             <a-menu-item style="margin-bottom: 0px;height: 30px; line-height: 30px;" v-for="(item,index) in codeList" :key="index" :value="item">{{ item.name }}</a-menu-item>
           </a-menu>
           <span v-if="noData" style="line-height: 50px; font-weight: 600;">暂无数据</span>
@@ -217,7 +217,8 @@ export default {
           return res.data
         })
       },
-      optionAlertShow: false
+      optionAlertShow: false,
+      windowHeight: 0
     }
   },
   methods: {
@@ -226,7 +227,6 @@ export default {
     getCodeList () {
       console.log({ code: this.code })
       listLookUp({ code: this.code }).then(res => {
-        console.log(res, 'res1111111')
         if (res.status == 200) {
           this.codeList = res.data
           this.noData = false
@@ -343,8 +343,10 @@ export default {
       console.log(row, 'row')
       this.showItemCodeModal = true
       this.itemCodeData = row
+    },
+    setTableH () {
+      this.windowHeight = window.innerHeight - 90
     }
-
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'miniForm' })
@@ -358,6 +360,7 @@ export default {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.getCodeList()
       this.cancelSel()
+      this.setTableH()
     }
   },
   activated () {
@@ -365,6 +368,7 @@ export default {
     if (this.$store.state.app.isNewTab) {
       this.getCodeList()
       this.cancelSel()
+      this.setTableH()
     }
   },
   watch: {

+ 2 - 2
src/views/power/role/menuModal.vue

@@ -39,8 +39,8 @@
           </a-tree>
           </div>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;margin: 18px 0 0;">
-            <a-button type="primary" id="roleMenuEdit-save" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button id="roleMenuEdit-cancel" :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button id="roleMenuEdit-cancel" :style="{ marginRight: '10px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" id="roleMenuEdit-save" @click="handleSubmit()">保存</a-button>
           </a-form-model-item>
         </a-form-model>
       </a-spin>

+ 52 - 48
src/views/power/role/roleList.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="roleList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="roleList-wrap searchBoxNormal">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
@@ -27,46 +27,49 @@
           </a-row>
         </a-form>
       </div>
-      <div class="table-operator">
-        <a-button type="primary" v-if="$hasPermissions('B_power_role_add')" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
-      </div>
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        style="word-break: break-all;"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 启用禁用 -->
-        <span slot="status" slot-scope="text, record">
-          <a-switch
-            v-if="$hasPermissions('B_power_role_enable')"
-            checkedChildren="启用"
-            unCheckedChildren="禁用"
-            id="roleList-isEnable"
-            v-model="record.isEnable"
-            @change="changeFlagHandle(text, record)" />
-          <span v-else>{{ record.isEnable==1?'已启用':'已禁用' }}</span>
-        </span>
-        <!-- 角色描述 -->
-        <template slot="remarks" slot-scope="text, record">
-          <span class="text-overflows" :title="record.remarks">{{ record.remarks ?record.remarks : '--' }}</span>
-        </template>
-        <!-- 操作 -->
-        <span slot="action" slot-scope="text, record">
-          <a-button
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <div class="table-operator">
+          <a-button type="primary" v-if="$hasPermissions('B_power_role_add')" @click="openModal" id="roleList-openModal">新增</a-button>
+        </div>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          rowKey="id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          style="word-break: break-all;"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 启用禁用 -->
+          <span slot="status" slot-scope="text, record">
+            <a-switch
+              v-if="$hasPermissions('B_power_role_enable')"
+              checkedChildren="启用"
+              unCheckedChildren="禁用"
+              id="roleList-isEnable"
+              v-model="record.isEnable"
+              @change="changeFlagHandle(text, record)" />
+            <span v-else>{{ record.isEnable==1?'已启用':'已禁用' }}</span>
+          </span>
+          <!-- 角色描述 -->
+          <template slot="remarks" slot-scope="text, record">
+            <span class="text-overflows" :title="record.remarks">{{ record.remarks ?record.remarks : '--' }}</span>
+          </template>
+          <!-- 操作 -->
+          <span slot="action" slot-scope="text, record">
+            <a-button
               size="small"
               type="link"
               class="button-info"
               v-if="$hasPermissions('M_power_role_menu')"
               @click="openMenuModal(record,1)"
             >
-            功能权限
+              功能权限
             </a-button>
             <a-button
               size="small"
@@ -75,7 +78,7 @@
               v-if="$hasPermissions('M_power_role_menu')"
               @click="openMenuModal(record,0)"
             >
-            价格权限
+              价格权限
             </a-button>
             <a-button
               size="small"
@@ -84,7 +87,7 @@
               v-if="$hasPermissions('B_power_role_edit')"
               @click="handleEdit(record)"
             >
-            编辑
+              编辑
             </a-button>
             <a-button
               size="small"
@@ -93,15 +96,16 @@
               v-if="!record.isEnable && $hasPermissions('B_power_role_del')"
               @click="delect(record)"
             >
-            删除
+              删除
             </a-button>
-          <span v-if="!$hasPermissions('M_power_role_menu') && !$hasPermissions('B_power_role_edit') && (record.isEnable && !$hasPermissions('B_power_role_del'))">--</span>
-        </span>
-      </s-table>
-    </a-spin>
-    <roleModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeRole"></roleModal>
-    <menuModal :visible="showMenuModal" @refresh="$refs.table.refresh(true)" :nowData="menuData" @close="showMenuModal = false"></menuModal>
-  </a-card>
+            <span v-if="!$hasPermissions('M_power_role_menu') && !$hasPermissions('B_power_role_edit') && (record.isEnable && !$hasPermissions('B_power_role_del'))">--</span>
+          </span>
+        </s-table>
+      </a-spin>
+      <roleModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeRole"></roleModal>
+      <menuModal :visible="showMenuModal" @refresh="$refs.table.refresh(true)" :nowData="menuData" @close="showMenuModal = false"></menuModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -200,7 +204,7 @@ export default {
       this.getMenuList(row.id, type)
     },
     // 获取菜单树列表
-    getMenuList (id,type) {
+    getMenuList (id, type) {
       const _this = this
       getMenuList({
         id: id
@@ -265,7 +269,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 236
     }
   },
   watch: {

+ 2 - 2
src/views/power/role/roleModal.vue

@@ -44,8 +44,8 @@
               placeholder="请输入描述(最多500个字符)"/>
           </a-form-model-item>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button :style="{ marginRight: '10px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()">保存</a-button>
           </a-form-model-item>
         </a-form-model>
       </a-spin>

+ 62 - 58
src/views/power/user/userList.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
@@ -26,61 +26,65 @@
           </a-row>
         </a-form>
       </div>
-      <div class="table-operator">
-        <a-button type="primary" v-if="$hasPermissions('B_power_user_add')" class="button-error" @click="openModal">新增</a-button>
-      </div>
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        size="small"
-        :style="{ height: tableHeight+84.5+'px' }"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        style="word-break: break-all;"
-        :defaultLoadData="false"
-        bordered
-      >
-        <span slot="status" slot-scope="text, record">
-          <!-- 超级管理员不可删除不可编辑不可启禁用 -->
-          <a-switch v-if="record.superAdmin!=1 && $hasPermissions('B_power_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
-          <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
-        </span>
-        <span slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.superAdmin!=1 &&$hasPermissions('B_power_user_edit')"
-            @click="handleEdit(record)"
-          >
-            编辑
-          </a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.loginFlag==1 && record.superAdmin!=1 &&$hasPermissions('B_power_user_resetPsd')"
-            @click="resetPassword(record)"
-          >
-            重置密码
-          </a-button>
-           
-          <a-button
-            size="small"
-            type="link"
-            class="button-error"
-            v-if="record.loginFlag==0 && record.superAdmin!=1 &&$hasPermissions('B_power_user_del')"
-            @click="delect(record)"
-          >
-            删除
-          </a-button>
-        </span>
-      </s-table>
-    </a-spin>
-    <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeModal"></userModal>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <div class="table-operator">
+          <a-button type="primary" v-if="$hasPermissions('B_power_user_add')" @click="openModal">新增</a-button>
+        </div>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          size="small"
+          :style="{ height: tableHeight+70+'px' }"
+          rowKey="id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          style="word-break: break-all;"
+          :defaultLoadData="false"
+          bordered
+        >
+          <span slot="status" slot-scope="text, record">
+            <!-- 超级管理员不可删除不可编辑不可启禁用 -->
+            <a-switch v-if="record.superAdmin!=1 && $hasPermissions('B_power_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+            <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
+          </span>
+          <span slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.superAdmin!=1 &&$hasPermissions('B_power_user_edit')"
+              @click="handleEdit(record)"
+            >
+              编辑
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.loginFlag==1 && record.superAdmin!=1 &&$hasPermissions('B_power_user_resetPsd')"
+              @click="resetPassword(record)"
+            >
+              重置密码
+            </a-button>
+
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="record.loginFlag==0 && record.superAdmin!=1 &&$hasPermissions('B_power_user_del')"
+              @click="delect(record)"
+            >
+              删除
+            </a-button>
+          </span>
+        </s-table>
+      </a-spin>
+      <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeModal"></userModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -234,7 +238,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 2 - 2
src/views/power/user/userModal.vue

@@ -101,8 +101,8 @@
             </a-col>
           </a-row>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button :style="{ marginRight: '10px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()">保存</a-button>
           </a-form-model-item>
         </a-form-model>
       </a-spin>

+ 45 - 41
src/views/productManagement/newProduct/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productInfoList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productInfoList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -48,39 +48,43 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        :scroll="{ x: 1090, y: tableHeight }"
-        bordered>
-        <!-- 上/下线时间 表头 -->
-        <template slot="auditTimeTit">
-          {{ $route.params.onlineFalg=='1'?'上':'下' }}线时间
-        </template>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-success"
-            @click="handleDetail(record)"
-            id="productInfoList-detail-btn">详情</a-button>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ y: tableHeight }"
+          bordered>
+          <!-- 上/下线时间 表头 -->
+          <template slot="auditTimeTit">
+            {{ $route.params.onlineFalg=='1'?'上':'下' }}线时间
+          </template>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-success"
+              @click="handleDetail(record)"
+              id="productInfoList-detail-btn">详情</a-button>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 <script>
 import { commonMixin } from '@/utils/mixin'
@@ -122,13 +126,13 @@ export default {
       ],
       columns: [
         { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
-        { slots: { title: 'auditTimeTit' }, dataIndex: 'auditTime', width: 140, align: 'center',customRender: function (text) { return text || '--' } },
+        { slots: { title: 'auditTimeTit' }, dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 140, align: 'center' },
-        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 350, align: 'left' },
+        { title: '产品名称', dataIndex: 'name', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: 180, align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: 140, align: 'left', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -214,7 +218,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 65 - 60
src/views/productManagement/priceChangeRecord/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productChangeRecordList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productChangeRecordList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -56,55 +56,60 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+122.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ x: 1520, y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productEntity.productTypeName2 || record.productEntity.productTypeName3">{{ record.productEntity.productTypeName2 }} {{ record.productEntity.productTypeName3 ? '>' : '' }} {{ record.productEntity.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 变更状态 -->
-        <span slot="productStatus" slot-scope="text, record">
-          <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enabledFlag" @change="changeFlagHandle(text, record)"/>
-        </span>
-        <!-- 省级价变更后 -->
-        <template slot="afterProvincePrice" slot-scope="text, record">
-          <span v-if="record.afterProvincePrice || record.afterProvincePrice==0" :class="record.beforeProvincePrice != record.afterProvincePrice ? 'red' : ''">{{ toThousands(record.afterProvincePrice) }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 市级价变更后 -->
-        <template slot="afterCityPrice" slot-scope="text, record">
-          <span v-if="record.afterCityPrice || record.afterCityPrice==0" :class="record.beforeCityPrice != record.afterCityPrice ? 'red' : ''">{{ toThousands(record.afterCityPrice) }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 特约价变更后 -->
-        <template slot="afterSpecialPrice" slot-scope="text, record">
-          <span v-if="record.afterSpecialPrice || record.afterSpecialPrice==0" :class="record.beforeSpecialPrice != record.afterSpecialPrice ? 'red' : ''">{{ toThousands(record.afterSpecialPrice) }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 终端价变更后 -->
-        <template slot="afterTerminalPrice" slot-scope="text, record">
-          <span v-if="record.afterTerminalPrice || record.afterTerminalPrice==0" :class="record.beforeTerminalPrice != record.afterTerminalPrice ? 'red' : ''">{{ toThousands(record.afterTerminalPrice) }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 车主价变更后 -->
-        <template slot="afterCarOwnersPrice" slot-scope="text, record">
-          <span v-if="record.afterCarOwnersPrice || record.afterCarOwnersPrice==0" :class="record.beforeCarOwnersPrice != record.afterCarOwnersPrice ? 'red' : ''">{{ toThousands(record.afterCarOwnersPrice) }}</span>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+95+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productEntity.productTypeName2 || record.productEntity.productTypeName3">{{ record.productEntity.productTypeName2 }} {{ record.productEntity.productTypeName3 ? '>' : '' }} {{ record.productEntity.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 变更状态 -->
+          <span slot="productStatus" slot-scope="text, record">
+            <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enabledFlag" @change="changeFlagHandle(text, record)"/>
+          </span>
+          <!-- 省级价变更后 -->
+          <template slot="afterProvincePrice" slot-scope="text, record">
+            <span v-if="record.afterProvincePrice || record.afterProvincePrice==0" :class="record.beforeProvincePrice != record.afterProvincePrice ? 'red' : ''">{{ toThousands(record.afterProvincePrice) }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 市级价变更后 -->
+          <template slot="afterCityPrice" slot-scope="text, record">
+            <span v-if="record.afterCityPrice || record.afterCityPrice==0" :class="record.beforeCityPrice != record.afterCityPrice ? 'red' : ''">{{ toThousands(record.afterCityPrice) }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 特约价变更后 -->
+          <template slot="afterSpecialPrice" slot-scope="text, record">
+            <span v-if="record.afterSpecialPrice || record.afterSpecialPrice==0" :class="record.beforeSpecialPrice != record.afterSpecialPrice ? 'red' : ''">{{ toThousands(record.afterSpecialPrice) }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 终端价变更后 -->
+          <template slot="afterTerminalPrice" slot-scope="text, record">
+            <span v-if="record.afterTerminalPrice || record.afterTerminalPrice==0" :class="record.beforeTerminalPrice != record.afterTerminalPrice ? 'red' : ''">{{ toThousands(record.afterTerminalPrice) }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 车主价变更后 -->
+          <template slot="afterCarOwnersPrice" slot-scope="text, record">
+            <span v-if="record.afterCarOwnersPrice || record.afterCarOwnersPrice==0" :class="record.beforeCarOwnersPrice != record.afterCarOwnersPrice ? 'red' : ''">{{ toThousands(record.afterCarOwnersPrice) }}</span>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -170,12 +175,12 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '序号', dataIndex: 'no', width: 50, align: 'center', fixed: 'left' },
+        { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
         { title: '变更时间', dataIndex: 'updateDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 140, align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'left' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '变更原因', dataIndex: 'changeReason', width: 70, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '变更状态', scopedSlots: { customRender: 'productStatus' }, width: 70, align: 'center' }
@@ -186,7 +191,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeProvincePrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterProvincePrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterProvincePrice' }, width: 70, align: 'right' }
         ]
       })
       arr.push({
@@ -195,7 +200,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeCityPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: 70, align: 'right' }
         ]
       })
       arr.push({
@@ -204,7 +209,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeSpecialPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterSpecialPrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterSpecialPrice' }, width: 70, align: 'right' }
         ]
       })
       arr.push({
@@ -213,7 +218,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeTerminalPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterTerminalPrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterTerminalPrice' }, width: 70, align: 'right' }
         ]
       })
       arr.push({
@@ -222,7 +227,7 @@ export default {
         align: 'center',
         children: [
           { title: '变更前', dataIndex: 'beforeCarOwnersPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-          { title: '变更后', scopedSlots: { customRender: 'afterCarOwnersPrice' }, width: 70, align: 'center' }
+          { title: '变更后', scopedSlots: { customRender: 'afterCarOwnersPrice' }, width: 70, align: 'right' }
         ]
       })
       return arr
@@ -319,7 +324,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 233
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     },
     // 修改状态
     changeFlagHandle (text, record) {

+ 7 - 5
src/views/productManagement/productBrand/detailModal.vue

@@ -8,7 +8,7 @@
     v-model="isShow"
     @cancel="isShow=false"
     :width="960">
-    <div>
+    <div class="modalContext">
       <a-descriptions bordered size="small" :column="1">
         <a-descriptions-item label="品牌名称:">{{ detailsData&&detailsData.brandName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="品牌分类:">{{ detailsData&&detailsData.brandTypeDictValue || '--' }}</a-descriptions-item>
@@ -22,8 +22,8 @@
           <span v-else>--</span>
         </a-descriptions-item>
       </a-descriptions>
-      <div class="btn-cont"><a-button id="productBrandDetail-modal-back" @click="isShow = false">返回列表</a-button></div>
     </div>
+    <div class="btn-cont"><a-button id="productBrandDetail-modal-back" @click="isShow = false">返回列表</a-button></div>
     <a-modal :visible="previewVisible" :footer="null" centered :maskClosable="false" @cancel="previewVisible=false">
       <img alt="example" style="width: 100%;" :src="previewImage" />
     </a-modal>
@@ -92,9 +92,6 @@ export default {
 
 <style lang="less">
   .productBrandDetail-modal{
-    .ant-modal-body {
-      padding: 40px 40px 24px;
-    }
     .productPic{
       cursor: pointer;
       max-width: 100px;
@@ -108,5 +105,10 @@ export default {
     .ant-descriptions-item-label.ant-descriptions-item-colon{
       width: 120px;
     }
+    .modalContext{
+      padding: 0 40px;
+      max-height:630px;
+      overflow-y: scroll;
+    }
   }
 </style>

+ 10 - 8
src/views/productManagement/productBrand/editModal.vue

@@ -9,7 +9,7 @@
     @cancel="isShow=false"
     :width="960">
     <!-- 表单 -->
-    <div>
+    <div class="modalContext">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model
           id="productBrandEdit-form"
@@ -49,12 +49,12 @@
             <editor id="productBrandEdit-brandIntroduce" ref="editor" class="productBrandEdit-brandIntroduce" @on-change="editorChange" :cache="false"></editor>
           </a-form-model-item>
         </a-form-model>
-        <div class="btn-cont">
-          <a-button type="primary" id="product-brand-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
-        </div>
       </a-spin>
     </div>
+    <div class="btn-cont">
+      <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
+      <a-button type="primary" id="product-brand-edit-modal-save" @click="handleSave">保存</a-button>
+    </div>
   </a-modal>
 </template>
 
@@ -191,9 +191,6 @@ export default {
 
 <style lang="less">
   .productBrandEdit-modal{
-    .ant-modal-body {
-    	padding: 40px 40px 24px;
-    }
     .upload{
       width: 100%!important;
     }
@@ -212,5 +209,10 @@ export default {
       text-align: center;
       margin: 35px 0 10px;
     }
+    .modalContext{
+      padding: 0 40px;
+      max-height:630px;
+      overflow-y: scroll;
+    }
   }
 </style>

+ 78 - 67
src/views/productManagement/productBrand/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productBrandList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productBrandList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -29,70 +29,81 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="productBrandList-add" type="primary" v-if="$hasPermissions('B_productBrand_add')" class="button-error" @click="handleEdit()">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品图片 -->
-        <template slot="imageUrl" slot-scope="text, record">
-          <img :src="record.imageUrl+'?x-oss-process=image/resize,h_30,m_lfit' || ''" width="30" height="30" class="imageUrl" @click="lookPic(record.imageUrl)" />
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productBrand_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="productBrandList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productBrand_detail')"
-            class="button-success"
-            @click="handleDetail(record)"
-            id="productBrandList-detail-btn">详情</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productBrand_del')"
-            class="button-error"
-            @click="handleDel(record)"
-            id="productBrandList-del-btn">删除</a-button>
-          <span v-if="!$hasPermissions('B_productBrand_edit') && !$hasPermissions('B_productBrand_detail') && !$hasPermissions('B_productBrand_del')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增/编辑产品品牌 -->
-    <product-brand-edit-modal v-drag :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="$refs.table.refresh()" @close="closeModal" />
-    <!-- 查看产品品牌 -->
-    <product-brand-detail-modal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
-    <!-- 查看图片 -->
-    <a-modal
-      centered
-      v-drag
-      class="productBrandList-modal"
-      :footer="null"
-      :maskClosable="false"
-      title="品牌图片"
-      v-model="openPicModal"
-      @cancel="nowPic=''">
-      <img :src="nowPic" width="100%" />
-    </a-modal>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator" v-if="$hasPermissions('B_productBrand_add')" >
+          <a-button id="productBrandList-add" type="primary" @click="handleEdit()">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品图片 -->
+          <template slot="imageUrl" slot-scope="text, record">
+            <img :src="record.imageUrl+'?x-oss-process=image/resize,h_30,m_lfit' || ''" width="30" height="30" class="imageUrl" @click="lookPic(record.imageUrl)" />
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productBrand_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="productBrandList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productBrand_detail')"
+              class="button-success"
+              @click="handleDetail(record)"
+              id="productBrandList-detail-btn">详情</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productBrand_del')"
+              class="button-error"
+              @click="handleDel(record)"
+              id="productBrandList-del-btn">删除</a-button>
+            <span v-if="!$hasPermissions('B_productBrand_edit') && !$hasPermissions('B_productBrand_detail') && !$hasPermissions('B_productBrand_del')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增/编辑产品品牌 -->
+      <product-brand-edit-modal
+        v-drag
+        :openModal="openModal"
+        :nowData="nowData"
+        :itemSn="itemSn"
+        @ok="$refs.table.refresh()"
+        @close="closeModal" />
+      <!-- 查看产品品牌 -->
+      <product-brand-detail-modal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
+      <!-- 查看图片 -->
+      <a-modal
+        centered
+        v-drag
+        class="productBrandList-modal"
+        :footer="null"
+        :maskClosable="false"
+        title="品牌图片"
+        v-model="openPicModal"
+        @cancel="nowPic=''">
+        <img :src="nowPic" width="100%" />
+      </a-modal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -216,7 +227,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

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

@@ -33,8 +33,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
+          <a-button id="product-category-edit-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="product-category-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="product-category-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </a-spin>
     </div>

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

@@ -2,8 +2,8 @@
   <a-card size="small" :bordered="false" class="productCategoryList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
-      <div class="table-operator-nobor">
-        <a-button id="productCategoryList-add" type="primary" v-if="$hasPermissions('B_productCategory_add')" class="button-error" @click="handleAdd()">新增一级分类</a-button>
+      <div class="table-operator-nobor" v-if="$hasPermissions('B_productCategory_add')" >
+        <a-button id="productCategoryList-add" type="primary"@click="handleAdd()">新增一级分类</a-button>
       </div>
       <!-- 列表 -->
       <s-table

+ 155 - 149
src/views/productManagement/productInfo/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productInfoList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productInfoList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -15,28 +15,28 @@
                 <a-input id="productInfoList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码/原厂编码"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="品牌">
                 <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="产品分类">
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="productInfoList-productType"></productTypeAll>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="产品状态">
                   <v-select code="PRODUCT_STATUS" id="productInfoList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="定价状态">
                   <v-select code="PRICING_STATUS" id="productInfoList-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="产品图片">
                   <a-select id="productInfoList-picFlag" v-model="queryParam.picFlag" allowClear placeholder="请选择产品图片">
                     <a-select-option value="1">
@@ -53,7 +53,7 @@
                   <rangeDate ref="rangeDate" @change="dateChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="停产状态">
                   <a-select v-model="queryParam.haltProdFlag" placeholder="请选择停产状态" allowClear>
                     <a-select-option value="0">
@@ -86,141 +86,147 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="productInfoList-add" type="primary" v-if="$hasPermissions('B_productInfo_add')" class="button-error" @click="handleEdit()">新增</a-button>
-        <a-button
-          id="productInfoList-batchAudit"
-          type="primary"
-          v-if="$hasPermissions('B_productInfo_batchAudit')"
-          class="button-warning"
-          :loading="loadingAudit"
-          @click="handleBatchAudit"
-          style="margin: 0 10px;">批量审核</a-button>
-        <a-button
-          id="productInfoList-batchLaunch"
-          type="primary"
-          v-if="$hasPermissions('B_productInfo_batchLaunch')"
-          class="button-primary"
-          :loading="loadingLaunch"
-          @click="handleBatchLaunch"
-          style="margin: 0 10px;">批量上线</a-button>
-        <a-button
-          id="productInfoList-batchDownline"
-          type="primary"
-          v-if="$hasPermissions('B_productInfo_batchDownline')"
-          class="button-grey"
-          :loading="loadingDownline"
-          @click="handleBatchDownline"
-          style="margin: 0 10px;">批量下线</a-button>
-        <a-button type="primary" class="button-error" @click="handleMenuClick({key:'1'})" v-if="$hasPermissions('B_productInfo_batchImport')" style="margin: 0 10px;"> 新增产品导入</a-button>
-        <a-button type="primary" class="button-info" @click="handleMenuClick({key:'2'})" v-if="$hasPermissions('B_offlineProduct_import')" style="margin: 0 10px;"> 下线产品导入</a-button>
-        <span style="margin-left: 8px" v-if="$hasPermissions('B_productInfo_batchAudit') || $hasPermissions('B_productInfo_batchLaunch') || $hasPermissions('B_productInfo_batchDownline')">
-          <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-        </span>
-      </div>
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :row-selection=" showSelect?{ columnWidth: 40 }:null"
-        :rowKey="(record) => record.id"
-        @rowSelection="rowSelectionFun"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 自定义表头 -->
-        <template slot="arrowFalgTitle">
-          <a-tooltip placement="top">
-            <template slot="title">
-              <span>自有即箭冠产品,非自有即非箭冠产品</span>
-            </template>
-            自有<a-icon type="question-circle" :style="{ marginLeft: '10px' }" />
-          </a-tooltip>
-        </template>
-        <template slot="arrowFalg" slot-scope="text, record">
-          <span v-if="record.arrowFalg">{{ record.arrowFalg == 1 ? '是' : '否' }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 停产状态 -->
-        <template slot="stopStatus" slot-scope="text, record">
-          <a-switch
-            checkedChildren="启用"
-            unCheckedChildren="停产"
-            id="roleList-isEnable"
-            v-model="record.stopFlag"
-            @change="changeFlagHandle(record)" />
-        </template>
-        <!-- 产品图片 -->
-        <template slot="imageUrl" slot-scope="text, record">
-          <div v-if="record.productPicList && record.productPicList.length>0">
-            <img :src="record.productPicList[0].imageUrl+'?x-oss-process=image/resize,h_30,m_lfit' || ''" width="30" height="30" class="imageUrl" @click="inited(record.productPicList)" />
-          </div>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state=='WAIT' && $hasPermissions('B_productInfo_audit')"
-            class="button-warning"
-            @click="handleAudit(record)"
-            id="productInfoList-audit-btn">审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="(record.state=='WAIT_ONLINE'||record.state=='OFFLINE') && $hasPermissions('B_productInfo_launch')"
-            class="button-primary"
-            @click="handleLaunch(record)"
-            id="productInfoList-launch-btn">上线</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state=='ONLINE' && $hasPermissions('B_productInfo_downline')"
-            class="button-grey"
-            @click="handleDownline(record)"
-            id="productInfoList-downline-btn">下线</a-button>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button type="primary" v-if="$hasPermissions('B_productInfo_add')" @click="handleEdit()">新增</a-button>
+          <a-button type="primary" class="button-info" @click="handleMenuClick({key:'1'})" v-if="$hasPermissions('B_productInfo_batchImport')"> 新增产品导入</a-button>
+          <a-button type="primary" class="button-info" @click="handleMenuClick({key:'2'})" v-if="$hasPermissions('B_offlineProduct_import')"> 下线产品导入</a-button>
+          
           <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productInfo_edit')"
+            id="productInfoList-batchAudit"
+            type="primary"
+            v-if="$hasPermissions('B_productInfo_batchAudit')"
+            ghost
             class="button-info"
-            @click="handleEdit(record)"
-            id="productInfoList-edit-btn">编辑</a-button>
+            :loading="loadingAudit"
+            @click="handleBatchAudit"
+            style="margin: 0 5px;">批量审核</a-button>
           <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productInfo_detail')"
-            class="button-success"
-            @click="handleDetail(record)"
-            id="productInfoList-detail-btn">详情</a-button>
+            id="productInfoList-batchLaunch"
+            type="primary"
+            v-if="$hasPermissions('B_productInfo_batchLaunch')"
+            ghost
+            :loading="loadingLaunch"
+            @click="handleBatchLaunch"
+            style="margin: 0 5px;">批量上线</a-button>
           <a-button
-            size="small"
-            type="link"
-            v-if="record.state=='WAIT' && $hasPermissions('B_productInfo_del')"
-            class="button-error"
-            @click="handleDel(record)"
-            id="productInfoList-del-btn">删除</a-button>
-          <span v-if="!(record.state=='WAIT' && $hasPermissions('B_productInfo_audit')) && !((record.state=='WAIT_ONLINE'||record.state=='OFFLINE') && $hasPermissions('B_productInfo_launch')) && !(record.state=='ONLINE' && $hasPermissions('B_productInfo_downline')) && !$hasPermissions('B_productInfo_edit') && !$hasPermissions('B_productInfo_detail') && !(record.state=='WAIT' && $hasPermissions('B_productInfo_del'))">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 产品详情 -->
-    <product-info-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
-    <!-- 产品下线 -->
-    <product-info-offline-modal v-drag :openModal="openOfflineModal" :offlineProductList="offlineProductList" @close="closeOfflineModal" @ok="$refs.table.refresh()" />
-    <!-- 导入产品 -->
-    <importGuideModal :guideType="guideModalType" :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
-  </a-card>
+            id="productInfoList-batchDownline"
+            type="primary"
+            v-if="$hasPermissions('B_productInfo_batchDownline')"
+            ghost
+            :loading="loadingDownline"
+            @click="handleBatchDownline"
+            style="margin: 0 5px;">批量下线</a-button>
+           <span style="margin-left: 8px" v-if="$hasPermissions('B_productInfo_batchAudit') || $hasPermissions('B_productInfo_batchLaunch') || $hasPermissions('B_productInfo_batchDownline')">
+              <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+            </span>
+        </div>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :row-selection=" showSelect?{ columnWidth: 40 }:null"
+          :rowKey="(record) => record.id"
+          @rowSelection="rowSelectionFun"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 自定义表头 -->
+          <template slot="arrowFalgTitle">
+            <a-tooltip placement="top">
+              <template slot="title">
+                <span>自有即箭冠产品,非自有即非箭冠产品</span>
+              </template>
+              自有<a-icon type="question-circle" :style="{ marginLeft: '10px' }" />
+            </a-tooltip>
+          </template>
+          <template slot="arrowFalg" slot-scope="text, record">
+            <span v-if="record.arrowFalg">{{ record.arrowFalg == 1 ? '是' : '否' }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 停产状态 -->
+          <template slot="stopStatus" slot-scope="text, record">
+            <a-switch
+              checkedChildren="启用"
+              unCheckedChildren="停产"
+              id="roleList-isEnable"
+              v-model="record.stopFlag"
+              @change="changeFlagHandle(record)" />
+          </template>
+          <!-- 产品图片 -->
+          <template slot="imageUrl" slot-scope="text, record">
+            <div v-if="record.productPicList && record.productPicList.length>0">
+              <img :src="record.productPicList[0].imageUrl+'?x-oss-process=image/resize,h_30,m_lfit' || ''" width="30" height="30" class="imageUrl" @click="inited(record.productPicList)" />
+            </div>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state=='WAIT' && $hasPermissions('B_productInfo_audit')"
+              class="button-warning"
+              @click="handleAudit(record)"
+              id="productInfoList-audit-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="(record.state=='WAIT_ONLINE'||record.state=='OFFLINE') && $hasPermissions('B_productInfo_launch')"
+              class="button-primary"
+              @click="handleLaunch(record)"
+              id="productInfoList-launch-btn">上线</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state=='ONLINE' && $hasPermissions('B_productInfo_downline')"
+              class="button-grey"
+              @click="handleDownline(record)"
+              id="productInfoList-downline-btn">下线</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productInfo_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="productInfoList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productInfo_detail')"
+              class="button-success"
+              @click="handleDetail(record)"
+              id="productInfoList-detail-btn">详情</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state=='WAIT' && $hasPermissions('B_productInfo_del')"
+              class="button-error"
+              @click="handleDel(record)"
+              id="productInfoList-del-btn">删除</a-button>
+            <span v-if="!(record.state=='WAIT' && $hasPermissions('B_productInfo_audit')) && !((record.state=='WAIT_ONLINE'||record.state=='OFFLINE') && $hasPermissions('B_productInfo_launch')) && !(record.state=='ONLINE' && $hasPermissions('B_productInfo_downline')) && !$hasPermissions('B_productInfo_edit') && !$hasPermissions('B_productInfo_detail') && !(record.state=='WAIT' && $hasPermissions('B_productInfo_del'))">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 产品详情 -->
+      <product-info-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+      <!-- 产品下线 -->
+      <product-info-offline-modal v-drag :openModal="openOfflineModal" :offlineProductList="offlineProductList" @close="closeOfflineModal" @ok="$refs.table.refresh()" />
+      <!-- 导入产品 -->
+      <importGuideModal :guideType="guideModalType" :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -263,19 +269,19 @@ export default {
       openGuideModal: false,
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', align: 'center', width: '15%', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'left', width: '14%', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
-        { slots: { title: 'arrowFalgTitle' }, scopedSlots: { customRender: 'arrowFalg' }, width: '6%', align: 'center' },
-        { title: '最近修改时间', dataIndex: 'updateDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '最新定价时间', dataIndex: 'pricingTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
+        { slots: { title: 'arrowFalgTitle' }, scopedSlots: { customRender: 'arrowFalg' }, width: '5%', align: 'center' },
+        { title: '最近修改时间', dataIndex: 'updateDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '最新定价时间', dataIndex: 'pricingTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '定价状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '停产状态', width: '6%', align: 'center', scopedSlots: { customRender: 'stopStatus' } },
-        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '7%', align: 'center' },
+        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '5%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       loadingAudit: false,
@@ -609,7 +615,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 48 - 41
src/views/productManagement/productLaunchAudit/list.vue

@@ -1,7 +1,40 @@
 <template>
   <div class="productLaunchAuditList-wrap">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="productLaunchAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="5" :sm="24">
+              <a-form-item label="产品编码">
+                <a-input id="productLaunchAuditList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="提交时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24" v-if="queryParam.bizState == 'PASS'">
+              <a-form-item label="是否新品">
+                <v-select code="FLAG" id="productLaunchAuditList-isNew" v-model="queryParam.newProductFlag" allowClear placeholder="请选择产品是否为新品"></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :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-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productLaunchAuditList-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
     <!-- 状态 -->
-    <div style="background-color: #fff;margin-bottom: 5px;">
+    <div style="background-color: #fff;">
       <v-select
         v-model="queryParam.bizState"
         ref="state"
@@ -10,50 +43,19 @@
         code="PRODUCT_LOG_BIZ_STATE"
         allowClear></v-select>
     </div>
-    <a-card size="small" :bordered="false" >
+    <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 搜索条件 -->
-        <div ref="tableSearch" class="table-page-search-wrapper">
-          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-            <a-row :gutter="15">
-              <a-col :md="5" :sm="24">
-                <a-form-item label="产品名称">
-                  <a-input id="productLaunchAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="5" :sm="24">
-                <a-form-item label="产品编码">
-                  <a-input id="productLaunchAuditList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="提交时间">
-                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24" v-if="queryParam.bizState == 'PASS'">
-                <a-form-item label="是否新品">
-                  <v-select code="FLAG" id="productLaunchAuditList-isNew" v-model="queryParam.newProductFlag" allowClear placeholder="请选择产品是否为新品"></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :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-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productLaunchAuditList-reset">重置</a-button>
-              </a-col>
-            </a-row>
-          </a-form>
-        </div>
         <!-- 列表 -->
-        <div style="margin-bottom: 10px">
-          <a-button type="primary" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')&&queryParam.bizState == 'WAIT'" id="productLaunchAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
-          <span style="margin-left: 5px" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')">
+        <div v-if="$hasPermissions('B_productLaunchAudit_batchAudit')&&queryParam.bizState == 'WAIT'">
+          <a-button type="primary" ghost id="productLaunchAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
+          <span style="margin-left: 10px">
             <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
           </span>
         </div>
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.productLogSn"
           rowKeyName="productLogSn"
@@ -61,6 +63,7 @@
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -136,6 +139,7 @@ export default {
             this.disabled = false
           }
           this.spinning = false
+          this.setTableH()
           return data
         })
       },
@@ -145,9 +149,9 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '15%', align: 'center' },
+        { title: '产品名称', dataIndex: 'name', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '15%', align: 'left' },
         { title: '提交时间', dataIndex: 'submitTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提交人', dataIndex: 'submitPerson', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '审核状态', dataIndex: 'bizStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
@@ -289,7 +293,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 285
+      this.tableHeight = window.innerHeight - tableSearchH - (this.queryParam.bizState == 'WAIT' ? 280 : 250)
     }
   },
   watch: {
@@ -319,6 +323,9 @@ export default {
 </script>
 <style lang="less">
   .productLaunchAuditList-wrap{
+    .sTable{
+      margin-top:10px;
+    }
     .ant-tabs-bar{
       margin: 0;
     }

+ 1 - 1
src/views/productManagement/productLevel/editModal.vue

@@ -30,8 +30,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
+          <a-button id="productLevelEdit-cancel" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="productLevelEdit-save" @click="handleSave">保存</a-button>
-          <a-button id="productLevelEdit-cancel" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </a-spin>
     </div>

+ 84 - 79
src/views/productManagement/productLevel/list.vue

@@ -1,90 +1,95 @@
 <template>
-  <a-card size="small" :bordered="false" class="productLevelList-wrap">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品名称">
-              <a-input id="productLevelList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品编码/原厂编码">
-              <a-input id="productLevelList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="产品分类">
-              <ProductType id="productLevelList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
-            </a-form-model-item>
-          </a-col>
-          <template v-if="advanced">
+  <div>
+    <a-card size="small" :bordered="false" class="productLevelList-wrap searchBoxNormal">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productLevelList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              <a-form-item label="产品名称">
+                <a-input id="productLevelList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品级别">
-                <v-select code="PRODUCT_LEVEL" id="productLevelList-level" v-model="queryParam.level" allowClear placeholder="请选择产品级别"></v-select>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="productLevelList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
-          </template>
-          <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>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品分类">
+                <ProductType id="productLevelList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+              </a-form-model-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="品牌">
+                  <ProductBrand id="productLevelList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品级别">
+                  <v-select code="PRODUCT_LEVEL" id="productLevelList-level" v-model="queryParam.level" allowClear placeholder="请选择产品级别"></v-select>
+                </a-form-item>
+              </a-col>
+            </template>
+            <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>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
     <!-- 操作按钮 -->
     <!-- <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
-      class="sTable fixPagination"
-      ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ y: tableHeight }"
-      :defaultLoadData="false"
-      bordered>
-      <!-- 产品分类 -->
-      <template slot="productType" slot-scope="text, record">
-        <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-        <span v-else>--</span>
-      </template>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-button
-          size="small"
-          type="link"
-          v-if="$hasPermissions('B_productLevel_edit')"
-          class="button-info"
-          @click="handleEdit(record)"
-          id="productLevelList-edit-btn">编辑</a-button>
-        <span v-else>--</span>
-      </template>
-    </s-table>
-    <!-- 编辑价格 -->
-    <product-level-edit-modal
-      v-drag
-      :openModal="openModal"
-      :itemId="itemId"
-      :nowData="nowData"
-      @close="closeModal"
-      @ok="$refs.table.refresh()" />
-  </a-card>
+    <a-card size="small" :bordered="false">
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+70+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :pageSize="30"
+        :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
+        bordered>
+        <!-- 产品分类 -->
+        <template slot="productType" slot-scope="text, record">
+          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+          <span v-else>--</span>
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_productLevel_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="productLevelList-edit-btn">编辑</a-button>
+          <span v-else>--</span>
+        </template>
+      </s-table>
+      <!-- 编辑价格 -->
+      <product-level-edit-modal
+        v-drag
+        :openModal="openModal"
+        :itemId="itemId"
+        :nowData="nowData"
+        @close="closeModal"
+        @ok="$refs.table.refresh()" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -117,11 +122,11 @@ export default {
       exportLoading: false, // 导出loading
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', align: 'center', width: '25%', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '19%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'left', width: '25%', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '19%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '16%', align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '16%', align: 'left' },
         { title: '包装数', dataIndex: 'packQtyV', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品级别', dataIndex: 'level', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -218,7 +223,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 41 - 37
src/views/productManagement/productNotOnline/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productPricingList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productPricingList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchForm">
@@ -61,31 +61,35 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator" style="text-align:right;">
-        <a-checkbox v-model="zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag" @change="handleChangeQty">仅显示有库存</a-checkbox>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.no"
-        rowKeyName="no"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator" style="text-align:right;">
+          <a-checkbox v-model="zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag" @change="handleChangeQty">仅显示有库存</a-checkbox>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -97,7 +101,7 @@ import { queryOnlinePage, excelOnlineList } from '@/api/product'
 import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
 export default {
-  name: 'productNotOnlineList',
+  name: 'ProductNotOnlineList',
   mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, ProductBrand, ProductType },
   data () {
@@ -146,19 +150,19 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'code', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'left', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'code', width: '7%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '7%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '7%', align: 'center' },
-        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'left' },
+        { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '可用库存', dataIndex: 'currentStockQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '第一次入库时间', dataIndex: 'skCreateDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '定价状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '定价时间', dataIndex: 'pricingTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '定价时间', dataIndex: 'pricingTime', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
 
       if (this.$hasPermissions('M_productNotOnlineList_costPrice')) {
@@ -243,7 +247,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 226
     }
   },
   watch: {

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.