Browse Source

Merge branch 'deploy_0804' of jianguan-web/jg-ocs-html into master

陈瑞 3 years ago
parent
commit
3474c36cc2
72 changed files with 1574 additions and 204 deletions
  1. 9 0
      src/api/allocateBill.js
  2. 56 0
      src/api/reportData.js
  3. 9 0
      src/api/stock.js
  4. 11 0
      src/components/index.less
  5. 197 146
      src/config/router.config.js
  6. 18 6
      src/layouts/PageView.vue
  7. 8 1
      src/store/modules/app.js
  8. 21 2
      src/views/allocationManagement/transferOut/detail.vue
  9. 22 2
      src/views/allocationManagement/transferOut/edit.vue
  10. 4 1
      src/views/allocationManagement/transferOut/list.vue
  11. 5 0
      src/views/basicData/transferTypeManagement/list.vue
  12. 5 0
      src/views/basicData/warehouse/list.vue
  13. 5 0
      src/views/basicData/warehouse/storingLocation/list.vue
  14. 5 0
      src/views/dealerManagement/dealerAccountManagement/list.vue
  15. 5 0
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  16. 5 0
      src/views/dealerManagement/marketingDivisionSet/list.vue
  17. 4 1
      src/views/dealerManagement/merchantInfoManagement/list.vue
  18. 6 1
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  19. 5 0
      src/views/dealerManagement/rebateSettings/list.vue
  20. 3 0
      src/views/financialManagement/financialCollection/list.vue
  21. 2 2
      src/views/financialManagement/inventoryConfirmation/detail.vue
  22. 6 1
      src/views/financialManagement/inventoryConfirmation/list.vue
  23. 3 0
      src/views/financialManagement/returnConfirmation/list.vue
  24. 5 0
      src/views/financialManagement/warehousingConfirmation/list.vue
  25. 5 0
      src/views/inventoryManagement/intelligentReplenishment/list.vue
  26. 5 4
      src/views/inventoryManagement/inventoryCheck/detail.vue
  27. 8 4
      src/views/inventoryManagement/inventoryCheck/list.vue
  28. 4 1
      src/views/inventoryManagement/inventoryQuery/list.vue
  29. 32 7
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  30. 3 0
      src/views/inventoryManagement/inventoryWarning/list.vue
  31. 4 3
      src/views/inventoryManagement/makeInventory/check.vue
  32. 7 1
      src/views/inventoryManagement/makeInventory/list.vue
  33. 2 3
      src/views/inventoryManagement/supervisionDisk/check.vue
  34. 6 0
      src/views/inventoryManagement/supervisionDisk/list.vue
  35. 5 0
      src/views/power/OperateJournal/OperateJournal.vue
  36. 5 0
      src/views/power/role/roleList.vue
  37. 5 0
      src/views/power/user/userList.vue
  38. 3 0
      src/views/productManagement/newProduct/list.vue
  39. 3 0
      src/views/productManagement/priceChangeRecord/list.vue
  40. 5 0
      src/views/productManagement/productBrand/list.vue
  41. 3 0
      src/views/productManagement/productInfo/list.vue
  42. 5 0
      src/views/productManagement/productLaunchAudit/list.vue
  43. 3 0
      src/views/productManagement/productLevel/list.vue
  44. 3 0
      src/views/productManagement/productOfflineAudit/list.vue
  45. 3 0
      src/views/productManagement/productPricing/list.vue
  46. 3 0
      src/views/productManagement/productUniversal/list.vue
  47. 3 0
      src/views/promotionRulesManagement/orderStatistics/list.vue
  48. 3 0
      src/views/promotionRulesManagement/productStatistics/list.vue
  49. 3 0
      src/views/promotionRulesManagement/promotionRules/detail.vue
  50. 5 0
      src/views/promotionRulesManagement/promotionRules/list.vue
  51. 5 0
      src/views/promotionRulesManagement/promotionRules/rule.vue
  52. 5 0
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  53. 436 0
      src/views/reportData/allocationPresentation/list.vue
  54. 2 2
      src/views/reportData/billingReturnReport/list.vue
  55. 509 0
      src/views/reportData/returnGoodsPresentation/list.vue
  56. 0 1
      src/views/reportData/salesAmountReport/list.vue
  57. 2 2
      src/views/reportData/salesReturnReport/list.vue
  58. 0 1
      src/views/reportData/salesSlipReport/list.vue
  59. 5 0
      src/views/salesManagement/backorder/list.vue
  60. 3 0
      src/views/salesManagement/examineVerify/list.vue
  61. 3 0
      src/views/salesManagement/outboundOrder/list.vue
  62. 3 0
      src/views/salesManagement/priceInquiry/list.vue
  63. 3 0
      src/views/salesManagement/pushOrderManagement/list.vue
  64. 3 0
      src/views/salesManagement/salesQuery/list.vue
  65. 3 0
      src/views/salesManagement/salesReturn/list.vue
  66. 3 0
      src/views/salesManagement/shortageStatisticsC/list.vue
  67. 3 0
      src/views/salesManagement/shortageStatisticsP/list.vue
  68. 15 12
      src/views/setting/notice/list.vue
  69. 5 0
      src/views/setting/noticeManagement/list.vue
  70. 3 0
      src/views/supplierManagement/associatedProduct/add.vue
  71. 3 0
      src/views/supplierManagement/associatedProductDetails/list.vue
  72. 5 0
      src/views/supplierManagement/supplierInfo/list.vue

+ 9 - 0
src/api/allocateBill.js

@@ -158,3 +158,12 @@ export const allocateBillFailExcel = (params) => {
     responseType: 'blob'
   })
 }
+//  调拨 详情  导出
+export const allocateBillDetailExcel = (params) => {
+  return axios({
+    url: '/allocateBill/detail/exportExcel',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 56 - 0
src/api/reportData.js

@@ -363,3 +363,59 @@ export const reportDispatchReportExport = (params) => {
     responseType: 'blob'
   })
 }
+//  调拨交单报表
+export const reportAllocateDbjdReportList = (params) => {
+  const url = `/report/allocateReport/dbjd/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  调拨交单报表  合计
+export const reportAllocateDbjdReportCount = (params) => {
+  return axios({
+    url: '/report/allocateReport/dbjd/queryCount',
+    data: params,
+    method: 'post'
+  })
+}
+// 调拨交单报表 导出
+export const reportAllocateDbjdReportExport = (params) => {
+  return axios({
+    url: '/report/allocateReport/dbjd/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+//  退货交单报表
+export const reportSalesReturnThjdReportList = (params) => {
+  const url = `/report/salesReturnBillReport/thjd/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  退货交单报表  合计
+export const reportSalesReturnThjdReportCount = (params) => {
+  return axios({
+    url: '/report/salesReturnBillReport/thjd/querySum',
+    data: params,
+    method: 'post'
+  })
+}
+// 退货交单报表 导出
+export const reportSalesReturnThjdReportExport = (params) => {
+  return axios({
+    url: '/report/salesReturnBillReport/thjd/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 9 - 0
src/api/stock.js

@@ -109,3 +109,12 @@ export const stockByProductSn = (params) => {
     method: 'post'
   })
 }
+//  库存 出入库明细 导出
+export const stockFlowExport = (params) => {
+  return axios({
+    url: '/stock/exportStockFlow',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 11 - 0
src/components/index.less

@@ -402,4 +402,15 @@
       }
     }
   }
+}
+.ant-collapse{
+  .ant-collapse-header{
+    padding: 3px 0 5px 38px!important;
+  }
+  .ant-collapse-content-box{
+    padding: 10px 10px 0!important;
+    .ant-descriptions-item{
+      padding-bottom: 8px!important;
+    }
+  }
 }

+ 197 - 146
src/config/router.config.js

@@ -528,42 +528,42 @@ export const asyncRouterMap = [
               }
             ]
           },
-          // {
-          //   path: '/financialManagement/inventoryConfirmation',
-          //   redirect: '/financialManagement/inventoryConfirmation/list',
-          //   name: 'inventoryConfirmation',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '盘点确认',
-          //     icon: 'monitor',
-          //     permission: 'M_inventoryConfirmationList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'inventoryConfirmationList',
-          //       component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryConfirmation/list.vue'),
-          //       meta: {
-          //         title: '盘点确认列表',
-          //         icon: 'monitor',
-          //         hidden: true,
-          //         permission: 'M_inventoryConfirmationList'
-          //       }
-          //     },
-          //     {
-          //       path: 'detail/:sn',
-          //       name: 'inventoryConfirmationDetail',
-          //       component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryConfirmation/detail.vue'),
-          //       meta: {
-          //         title: '盘点确认详情',
-          //         icon: 'monitor',
-          //         hidden: true,
-          //         permission: 'B_inventoryConfirmationDetail'
-          //       }
-          //     }
-          //   ]
-          // },
+          {
+            path: '/financialManagement/inventoryConfirmation',
+            redirect: '/financialManagement/inventoryConfirmation/list',
+            name: 'inventoryConfirmation',
+            component: BlankLayout,
+            meta: {
+              title: '盘点确认',
+              icon: 'monitor',
+              permission: 'M_inventoryConfirmationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'inventoryConfirmationList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryConfirmation/list.vue'),
+                meta: {
+                  title: '盘点确认列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_inventoryConfirmationList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'inventoryConfirmationDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryConfirmation/detail.vue'),
+                meta: {
+                  title: '盘点确认详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_inventoryConfirmationDetail'
+                }
+              }
+            ]
+          },
           {
             path: '/financialManagement/financialCollection',
             redirect: '/financialManagement/financialCollection/list',
@@ -639,116 +639,117 @@ export const asyncRouterMap = [
               }
             ]
           },
-          // {
-          //   path: '/inventoryManagement/inventoryCheck',
-          //   redirect: '/inventoryManagement/inventoryCheck/list/0',
-          //   name: 'inventoryCheck',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '库存盘点',
-          //     icon: 'monitor',
-          //     permission: 'M_inventoryCheckList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list/:type',
-          //       name: 'inventoryCheckList',
-          //       component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryCheck/list.vue'),
-          //       meta: {
-          //         title: '库存盘点列表',
-          //         icon: 'monitor',
-          //         hidden: true,
-          //         permission: 'M_inventoryCheckList'
-          //       }
-          //     },
-          //     {
-          //       path: 'detail/:sn',
-          //       name: 'inventoryCheckDetail',
-          //       component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryCheck/detail.vue'),
-          //       meta: {
-          //         title: '库存盘点详情',
-          //         icon: 'monitor',
-          //         hidden: true,
-          //         permission: 'B_inventoryCheckDetail'
-          //       }
-          //     }
-          //   ]
-          // },
-          // {
-          //   path: '/inventoryManagement/makeInventory',
-          //   redirect: '/inventoryManagement/makeInventory/list',
-          //   name: 'makeInventory',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '盘点人盘点',
-          //     icon: 'monitor',
-          //     permission: 'M_inventoryMakeInventoryList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'makeInventoryList',
-          //       component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/makeInventory/list.vue'),
-          //       meta: {
-          //         title: '盘点人盘点列表',
-          //         icon: 'monitor',
-          //         hidden: true,
-          //         permission: 'M_inventoryMakeInventoryList'
-          //       }
-          //     },
-          //     {
-          //       path: 'check/:sn',
-          //       name: 'makeInventoryCheck',
-          //       component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/makeInventory/check.vue'),
-          //       meta: {
-          //         title: '盘点人盘点',
-          //         icon: 'monitor',
-          //         hidden: true,
-          //         replaceTab: true,
-          //         permission: 'B_inventoryMakeInventoryCheck'
-          //       }
-          //     }
-          //   ]
-          // },
-          // {
-          //   path: '/inventoryManagement/supervisionDisk',
-          //   redirect: '/inventoryManagement/supervisionDisk/list',
-          //   name: 'supervisionDisk',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '监盘人盘点',
-          //     icon: 'monitor',
-          //     permission: 'M_supervisionDiskList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'supervisionDiskList',
-          //       component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/supervisionDisk/list.vue'),
-          //       meta: {
-          //         title: '监盘人盘点列表',
-          //         icon: 'monitor',
-          //         hidden: true,
-          //         permission: 'M_supervisionDiskList'
-          //       }
-          //     },
-          //     {
-          //       path: 'check/:sn',
-          //       name: 'supervisionDiskCheck',
-          //       component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/supervisionDisk/check.vue'),
-          //       meta: {
-          //         title: '监盘人监盘',
-          //         icon: 'monitor',
-          //         replaceTab: true,
-          //         hidden: true,
-          //         permission: 'B_supervisionDiskCheck'
-          //       }
-          //     }
-          //   ]
-          // },
+          {
+            path: '/inventoryManagement/inventoryCheck',
+            redirect: '/inventoryManagement/inventoryCheck/list/0',
+            name: 'inventoryCheck',
+            component: BlankLayout,
+            meta: {
+              title: '库存盘点',
+              icon: 'monitor',
+              permission: 'M_inventoryCheckList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list/:type',
+                name: 'inventoryCheckList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryCheck/list.vue'),
+                meta: {
+                  title: '库存盘点列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_inventoryCheckList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'inventoryCheckDetail',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryCheck/detail.vue'),
+                meta: {
+                  title: '库存盘点详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_inventoryCheckDetail'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/makeInventory',
+            redirect: '/inventoryManagement/makeInventory/list',
+            name: 'makeInventory',
+            component: BlankLayout,
+            meta: {
+              title: '盘点人盘点',
+              icon: 'monitor',
+              permission: 'M_inventoryMakeInventoryList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'makeInventoryList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/makeInventory/list.vue'),
+                meta: {
+                  title: '盘点人盘点列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_inventoryMakeInventoryList'
+                }
+              },
+              {
+                path: 'check/:sn',
+                name: 'makeInventoryCheck',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/makeInventory/check.vue'),
+                meta: {
+                  title: '盘点人盘点',
+                  icon: 'monitor',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_inventoryMakeInventoryCheck'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/supervisionDisk',
+            redirect: '/inventoryManagement/supervisionDisk/list',
+            name: 'supervisionDisk',
+            component: BlankLayout,
+            meta: {
+              title: '监盘人盘点',
+              icon: 'monitor',
+              permission: 'M_supervisionDiskList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'supervisionDiskList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/supervisionDisk/list.vue'),
+                meta: {
+                  title: '监盘人盘点列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_supervisionDiskList'
+                }
+              },
+              {
+                path: 'check/:sn',
+                name: 'supervisionDiskCheck',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/supervisionDisk/check.vue'),
+                meta: {
+                  title: '监盘人监盘',
+                  icon: 'monitor',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'B_supervisionDiskCheck'
+                }
+              }
+            ]
+          },
           {
             path: '/inventoryManagement/inventoryWarning',
             name: 'inventoryWarningList',
@@ -1349,6 +1350,56 @@ export const asyncRouterMap = [
               }
             ]
           },
+          {
+            path: '/reportData/allocationPresentation',
+            redirect: '/reportData/allocationPresentation/list',
+            name: 'allocationPresentation',
+            component: BlankLayout,
+            meta: {
+              title: '调拨交单报表',
+              icon: 'profile',
+              permission: 'M_allocationPresentationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'allocationPresentationList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationPresentation/list.vue'),
+                meta: {
+                  title: '调拨交单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_allocationPresentationList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/returnGoodsPresentation',
+            redirect: '/reportData/returnGoodsPresentation/list',
+            name: 'returnGoodsPresentation',
+            component: BlankLayout,
+            meta: {
+              title: '退货交单报表',
+              icon: 'profile',
+              permission: 'M_returnGoodsPresentationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'returnGoodsPresentationList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/returnGoodsPresentation/list.vue'),
+                meta: {
+                  title: '退货交单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_returnGoodsPresentationList'
+                }
+              }
+            ]
+          },
           {
             path: '/reportData/provinceTypeSalesDetails',
             redirect: '/reportData/provinceTypeSalesDetails/list',

+ 18 - 6
src/layouts/PageView.vue

@@ -38,7 +38,7 @@
         </div>
       </div>
     </page-header>
-    <div class="content" :style="{ height: contHeight+'px' }">
+    <div class="content" :style="{ height: pageHeight+'px' }">
       <div class="page-header-index-wide">
         <slot>
           <!-- keep-alive  -->
@@ -86,25 +86,37 @@ export default {
       linkList: [],
       extraImage: '',
       search: false,
-      tabs: {}
+      tabs: {},
+      pageHeight: 0
     }
   },
   computed: {
     ...mapState({
       multiTab: state => state.app.multiTab
-    }),
-    contHeight () {
-      return window.innerHeight - 80
-    }
+    })
+    // contHeight () {
+    //   return window.innerHeight - 80
+    // }
   },
   mounted () {
     this.tabs = this.directTabs
     this.getPageMeta()
+    this.setpageH()
+    const _this = this
+    window.onresize = () => {
+      return (() => {
+        _this.$store.dispatch('SetWinHeight', window.innerHeight)
+        _this.setpageH()
+      })()
+    }
   },
   updated () {
     this.getPageMeta()
   },
   methods: {
+    setpageH () {
+      this.pageHeight = window.innerHeight - 80
+    },
     getPageMeta () {
       // eslint-disable-next-line
       this.pageTitle = (typeof(this.title) === 'string' || !this.title) ? this.title : this.$route.meta.title

+ 8 - 1
src/store/modules/app.js

@@ -27,7 +27,8 @@ const app = {
     multiTab: true,
     isNewTab: false,
     isNewSubTab: false,
-    updateList: false
+    updateList: false,
+    winHeight: 0 //  窗口高度
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -77,6 +78,9 @@ const app = {
     TOGGLE_MULTI_TAB: (state, bool) => {
       Vue.ls.set(DEFAULT_MULTI_TAB, bool)
       state.multiTab = bool
+    },
+    SET_WIN_HEIGHT: (state, val) => {
+      state.winHeight = val
     }
   },
   actions: {
@@ -118,6 +122,9 @@ const app = {
     },
     ToggleMultiTab ({ commit }, bool) {
       commit('TOGGLE_MULTI_TAB', bool)
+    },
+    SetWinHeight ({ commit }, val) {
+      commit('SET_WIN_HEIGHT', val)
     }
   }
 }

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

@@ -14,11 +14,20 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template v-if="$hasPermissions('B_transferOut_print')" slot="extra">
+        <template slot="extra">
+          <a-button
+            key="3"
+            type="primary"
+            class="button-warning"
+            v-if="$hasPermissions('B_transferOut_detail_export')"
+            id="allocateBillDetail-export-btn"
+            :disabled="localDataSource.length==0"
+            @click="handleExcel">导出Excel</a-button>
           <a-button
             key="2"
             type="primary"
             class="button-error"
+            v-if="$hasPermissions('B_transferOut_print')"
             id="allocateBillDetail-db-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('dbPrint')">调拨打印</a-button>
@@ -26,6 +35,7 @@
             key="1"
             type="primary"
             class="button-info"
+            v-if="$hasPermissions('B_transferOut_print')"
             id="allocateBillDetail-dbfl-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('dbflPrint')">调拨分类打印</a-button>
@@ -80,7 +90,8 @@
 <script>
 import { STable, VSelect } from '@/components'
 import printModal from './printModal.vue'
-import { allocateBillDetailList, allocateBillDetail, allocateBillDetailCount, allocateBillDetailPrint } from '@/api/allocateBill'
+import { hdExportExcel } from '@/libs/exportExcel'
+import { allocateBillDetailList, allocateBillDetail, allocateBillDetailCount, allocateBillDetailPrint, allocateBillDetailExcel } from '@/api/allocateBill'
 export default {
   components: { STable, VSelect, printModal },
   props: {
@@ -164,6 +175,14 @@ export default {
     handleEdit () {
       this.$router.push({ path: `/allocationManagement/transferOut/edit/${this.basicInfoData.allocateSn}/${this.basicInfoData.dealerLevel}` })
     },
+    // 导出
+    handleExcel () {
+      const _this = this
+      this.spinning = true
+      hdExportExcel(allocateBillDetailExcel, { allocateSn: this.outBizSn || this.$route.params.sn }, '调拨明细', function () {
+        _this.spinning = false
+      })
+    },
     // 打印预览/快捷打印
     handlePrint (type) {
       this.nowType = type

+ 22 - 2
src/views/allocationManagement/transferOut/edit.vue

@@ -8,11 +8,20 @@
           <a id="allocateBillEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template v-if="$hasPermissions('B_transferOut_print')" slot="extra">
+        <template slot="extra">
+          <a-button
+            key="3"
+            type="primary"
+            class="button-warning"
+            v-if="$hasPermissions('B_transferOut_detail_export')"
+            id="allocateBillEdit-export-btn"
+            :disabled="localDataSource.length==0"
+            @click="handleExcel">导出Excel</a-button>
           <a-button
             key="2"
             type="primary"
             class="button-error"
+            v-if="$hasPermissions('B_transferOut_print')"
             id="allocateBillEdit-db-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('dbPrint')">调拨打印</a-button>
@@ -20,6 +29,7 @@
             key="1"
             type="primary"
             class="button-info"
+            v-if="$hasPermissions('B_transferOut_print')"
             id="allocateBillEdit-dbfl-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('dbflPrint')">调拨分类打印</a-button>
@@ -217,10 +227,11 @@
 import { STable, VSelect } from '@/components'
 import ImportGuideModal from './importGuideModal.vue'
 import printModal from './printModal.vue'
+import { hdExportExcel } from '@/libs/exportExcel'
 import { queryStockProductPage } from '@/api/stock'
 import { productPriceInfo } from '@/api/product'
 import AllocateType from '@/views/common/allocateType.js'
-import { allocateBillSave, allocateBillDetailList, allocateBillDetailCount, allocateBillDetail, allocateBillDetailSave, allocateBillSubmit, allocateBillDetailDel, allocateBillDetailDelAll, allocateBillDetailPrint, allocateBillBatchInsert } from '@/api/allocateBill'
+import { allocateBillSave, allocateBillDetailList, allocateBillDetailCount, allocateBillDetail, allocateBillDetailSave, allocateBillSubmit, allocateBillDetailDel, allocateBillDetailDelAll, allocateBillDetailPrint, allocateBillBatchInsert, allocateBillDetailExcel } from '@/api/allocateBill'
 
 export default {
   components: { STable, VSelect, ImportGuideModal, AllocateType, printModal },
@@ -510,6 +521,14 @@ export default {
         })
       }
     },
+    // 导出
+    handleExcel () {
+      const _this = this
+      this.spinning = true
+      hdExportExcel(allocateBillDetailExcel, { allocateSn: this.$route.params.sn }, '调拨明细', function () {
+        _this.spinning = false
+      })
+    },
     // 打印预览/快捷打印
     handlePrint (type) {
       this.nowType = type
@@ -586,6 +605,7 @@ export default {
     >.ant-spin-nested-loading{
       overflow-y: scroll;
       height: 100%;
+      padding-bottom: 51px;
     }
     .allocateBillEdit-back{
       margin-bottom: 10px;

+ 4 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -287,7 +287,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 238
     }
   },
   watch: {
@@ -296,6 +296,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/basicData/transferTypeManagement/list.vue

@@ -127,6 +127,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.$refs.table.refresh(true)

+ 5 - 0
src/views/basicData/warehouse/list.vue

@@ -163,6 +163,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/basicData/warehouse/storingLocation/list.vue

@@ -173,6 +173,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 285
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -220,6 +220,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -238,6 +238,11 @@ export default {
       })
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.tableHeight = window.innerHeight - 290
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.tableHeight = window.innerHeight - 290

+ 5 - 0
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -140,6 +140,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 4 - 1
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -269,7 +269,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 238
     }
   },
   watch: {
@@ -278,6 +278,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 6 - 1
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -288,7 +288,12 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 295
+      this.tableHeight = window.innerHeight - tableSearchH - 292
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/dealerManagement/rebateSettings/list.vue

@@ -139,6 +139,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

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

@@ -336,6 +336,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

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

@@ -189,14 +189,14 @@ export default {
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.$refs.table.refresh(true)
+      this.resetSearchForm()
       this.getDetail()
     }
   },
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
-      this.$refs.table.refresh(true)
+      this.resetSearchForm()
       this.getDetail()
     }
   },

+ 6 - 1
src/views/financialManagement/inventoryConfirmation/list.vue

@@ -72,6 +72,7 @@ export default {
       spinning: false,
       tableHeight: 0,
       queryParam: { //  查询条件
+        deleteFlag: '0',
         state: 'WAIT_FINANCE_AUDIT',
         checkWarehouseNo: ''
       },
@@ -185,7 +186,6 @@ export default {
       })
     },
     resetSearchForm () {
-      this.queryParam.state = 'WAIT_FINANCE_AUDIT'
       this.queryParam.checkWarehouseNo = ''
       this.$refs.table.refresh(true)
     },
@@ -199,6 +199,11 @@ export default {
       this.tableHeight = window.innerHeight - 295
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/financialManagement/returnConfirmation/list.vue

@@ -225,6 +225,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -252,6 +252,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/inventoryManagement/intelligentReplenishment/list.vue

@@ -190,6 +190,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 4
src/views/inventoryManagement/inventoryCheck/detail.vue

@@ -95,7 +95,7 @@
       <a-button
         type="primary"
         id="inventoryCheckDetail-submit-btn"
-        v-if="detail&&(detail.state!='FINSH' && detail.state!='DELETE') && $hasPermissions('B_inventoryCheckVoid')"
+        v-if="detail&&(detail.state!='FINISH' && detail.state!='DELETE') && $hasPermissions('B_inventoryCheckVoid')"
         size="large"
         class="button-primary"
         :disabled="spinning"
@@ -153,7 +153,7 @@ export default {
     // 重置
     resetSearchForm () {
       this.queryParam.productCode = ''
-      this.getList()
+      this.getList(1)
     },
     // 作废盘点单
     handleSubmit () {
@@ -196,6 +196,7 @@ export default {
           this.paginationProps.total = Number(res.data.count) || 0
           this.paginationProps.current = data.pageNo
           const no = (data.pageNo - 1) * data.pageSize
+          this.expandedRowKeys = []
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             if (!this.foldState) {
@@ -269,14 +270,14 @@ export default {
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.getList(1)
+      this.resetSearchForm()
       this.getDetail()
     }
   },
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
-      this.getList(1)
+      this.resetSearchForm()
       this.getDetail()
     }
   },

+ 8 - 4
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -101,14 +101,14 @@ export default {
       spinning: false,
       tableHeight: 0,
       queryParam: { //  查询条件
-        deleteFlag: this.$route.params.type == '0' ? '' : '1',
+        deleteFlag: this.$route.params.type,
         checkWarehouseNo: '',
         checkState: undefined,
         checkSuperviseState: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       tabPaneData: [
-        { name: '正常', type: '' },
+        { name: '正常', type: '0' },
         { name: '已作废', type: '1' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -136,7 +136,7 @@ export default {
   computed: {
     columns () {
       let arr = []
-      if (this.queryParam.deleteFlag == '') { // 正常
+      if (this.queryParam.deleteFlag == '0') { // 正常
         arr = [
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
           { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '14%', align: 'center' },
@@ -207,7 +207,6 @@ export default {
       }
     },
     resetSearchForm () {
-      this.queryParam.deleteFlag = ''
       this.queryParam.checkWarehouseNo = ''
       this.queryParam.checkState = undefined
       this.queryParam.checkSuperviseState = undefined
@@ -227,6 +226,11 @@ export default {
       this.tableHeight = window.innerHeight - 338
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 4 - 1
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -302,7 +302,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 233
     }
   },
   watch: {
@@ -311,6 +311,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 32 - 7
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -66,8 +66,17 @@
               </template>
               <a-col :md="6" :sm="24">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryWarehouseDetail-refresh">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryWarehouseDetail-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryWarehouseDetail-reset">重置</a-button>
+                <a-button
+                  type="primary"
+                  style="margin-left: 5px"
+                  class="button-warning"
+                  v-if="$hasPermissions('B_inventoryQuery_rkDetail_export')"
+                  @click="handleExcel"
+                  :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>
@@ -110,7 +119,8 @@
 <script>
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { stockFlowCount, stockFlowList } from '@/api/stock'
+import { hdExportExcel } from '@/libs/exportExcel'
+import { stockFlowCount, stockFlowList, stockFlowExport } from '@/api/stock'
 import { warehouseAllList } from '@/api/warehouse'
 export default {
   components: { STable, VSelect, rangeDate },
@@ -151,6 +161,7 @@ export default {
           return data
         })
       },
+      exportLoading: false,
       warehouseList: [], //  仓库  下拉数据
       productTotal: null //  合计
     }
@@ -158,10 +169,10 @@ export default {
   computed: {
     columns () {
       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: '14%',align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '6%',align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'stockBatchNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -209,6 +220,17 @@ export default {
       this.queryParam.state = undefined
       this.$refs.table.refresh(true)
     },
+    // 导出
+    handleExcel () {
+      const _this = this
+      const params = Object.assign(this.queryParam, { productSn: this.$route.params.sn })
+      this.exportLoading = true
+      this.spinning = true
+      hdExportExcel(stockFlowExport, params, '出入库明细', function () {
+        _this.exportLoading = false
+        _this.spinning = false
+      })
+    },
     //  返回列表
     handleBack () {
       this.$router.push({ path: '/inventoryManagement/inventoryQuery/list', query: { closeLastOldTab: true } })
@@ -241,6 +263,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -394,6 +394,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 4 - 3
src/views/inventoryManagement/makeInventory/check.vue

@@ -209,7 +209,7 @@ export default {
     // 重置
     resetSearchForm () {
       this.queryParam.productCode = ''
-      this.getList()
+      this.getList(1)
     },
     // 盘点数量  blur
     checkQtyBlur (val, record) {
@@ -283,6 +283,7 @@ export default {
           this.paginationProps.total = Number(res.data.count) || 0
           this.paginationProps.current = data.pageNo
           const no = (data.pageNo - 1) * data.pageSize
+          this.expandedRowKeys = []
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].checkQtyBackups = data.list[i].checkQty
@@ -411,14 +412,14 @@ export default {
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.getList(1)
+      this.resetSearchForm()
       this.getDetail()
     }
   },
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
-      this.getList(1)
+      this.resetSearchForm()
       this.getDetail()
     }
   },

+ 7 - 1
src/views/inventoryManagement/makeInventory/list.vue

@@ -56,6 +56,7 @@ export default {
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       queryParam: { //  查询条件
+        deleteFlag: '0',
         checkWarehouseNo: ''
       },
       columns: [
@@ -65,7 +66,7 @@ export default {
         { title: '产品款数', dataIndex: 'productTotalCategory', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存数量', dataIndex: 'totalStockQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '盘点数量', dataIndex: 'checkTotalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点亏数量', dataIndex: 'totalProfitLossQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点亏数量', dataIndex: 'totalProfitLossQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '盘点单创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
@@ -105,6 +106,11 @@ export default {
       this.tableHeight = window.innerHeight - 240
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 2 - 3
src/views/inventoryManagement/supervisionDisk/check.vue

@@ -219,7 +219,7 @@ export default {
     // 重置
     resetSearchForm () {
       this.queryParam.productCode = ''
-      this.getList()
+      this.getList(1)
     },
     // 盘点数量  blur
     checkSuperviseQtyBlur (val, record) {
@@ -315,6 +315,7 @@ export default {
           this.paginationProps.total = Number(res.data.count) || 0
           this.paginationProps.current = data.pageNo
           const no = (data.pageNo - 1) * data.pageSize
+          this.expandedRowKeys = []
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].checkSuperviseQtyBackups = data.list[i].checkSuperviseQty
@@ -443,7 +444,6 @@ export default {
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      console.log(111)
       this.resetSearchForm()
       this.getDetail()
     }
@@ -451,7 +451,6 @@ export default {
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
-      console.log(222)
       this.resetSearchForm()
       this.getDetail()
     }

+ 6 - 0
src/views/inventoryManagement/supervisionDisk/list.vue

@@ -56,6 +56,7 @@ export default {
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       queryParam: { //  查询条件
+        deleteFlag: '0',
         checkWarehouseNo: ''
       },
       columns: [
@@ -108,6 +109,11 @@ export default {
       this.tableHeight = window.innerHeight - 240
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/power/OperateJournal/OperateJournal.vue

@@ -120,6 +120,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/power/role/roleList.vue

@@ -229,6 +229,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/power/user/userList.vue

@@ -232,6 +232,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/productManagement/newProduct/list.vue

@@ -228,6 +228,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/productManagement/priceChangeRecord/list.vue

@@ -337,6 +337,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/productManagement/productBrand/list.vue

@@ -212,6 +212,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/productManagement/productInfo/list.vue

@@ -582,6 +582,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

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

@@ -209,6 +209,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/productManagement/productLevel/list.vue

@@ -247,6 +247,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/productManagement/productOfflineAudit/list.vue

@@ -296,6 +296,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/productManagement/productPricing/list.vue

@@ -269,6 +269,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/productManagement/productUniversal/list.vue

@@ -233,6 +233,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -231,6 +231,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -242,6 +242,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/promotionRulesManagement/promotionRules/detail.vue

@@ -240,6 +240,9 @@ export default {
         }
       },
       deep: true
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

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

@@ -216,6 +216,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/promotionRulesManagement/promotionRules/rule.vue

@@ -148,6 +148,11 @@ export default {
       this.tableHeight = window.innerHeight - 250
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -319,6 +319,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 436 - 0
src/views/reportData/allocationPresentation/list.vue

@@ -0,0 +1,436 @@
+<template>
+  <a-card size="small" :bordered="false" class="allocationPresentationList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div class="table-page-search-wrapper">
+        <a-form-model
+          id="allocationPresentationList-form"
+          ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
+          :model="queryParam"
+          :rules="rules"
+          @keyup.enter.native="handleSearch">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="调拨日期" prop="time">
+                <rangeDateTime 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="allocationPresentationList-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="客户级别">
+                <v-select
+                  v-model="queryParam.dealer.dealerLevel"
+                  ref="dealerLevel"
+                  id="allocationPresentationList-dealerLevel"
+                  code="DEALER_LEVEL"
+                  placeholder="请选择客户级别"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="调拨单号">
+                  <a-input id="allocationPresentationList-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="所在区域">
+                  <subarea id="allocationPresentationList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="12" :sm="24">
+                <a-row>
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
+                    <a-col span="7">
+                      <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-model-item prop="dealerCitySn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-model-item prop="dealerCountySn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
+                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                  </a-form-model-item>
+                </a-row>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="handleSearch" :disabled="disabled" id="allocationPresentationList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocationPresentationList-reset">重置</a-button>
+              <a-button
+                style="margin-left: 5px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                v-if="$hasPermissions('B_allocationPresentationExport')"
+                id="allocationPresentationList-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-model>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :defaultLoadData="false"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 1840 }"
+        bordered>
+        <template slot="footer">
+          <a-row>
+            <a-col span="2">合计:</a-col>
+            <a-col span="22">
+              <a-row>
+                <a-col span="4">配送品调拨:{{ (totalData && (totalData.pspdb || totalData.pspdb==0)) ? totalData.pspdb : '--' }}</a-col>
+                <a-col span="4">有偿调拨:{{ (totalData && (totalData.ycdb || totalData.ycdb==0)) ? totalData.ycdb : '--' }}</a-col>
+                <a-col span="4">促销调拨:{{ (totalData && (totalData.cxdb || totalData.cxdb==0)) ? totalData.cxdb : '--' }}</a-col>
+                <a-col span="4">退换品调拨:{{ (totalData && (totalData.thpdb || totalData.thpdb==0)) ? totalData.thpdb : '--' }}</a-col>
+                <a-col span="4">样品调拨:{{ (totalData && (totalData.ypdb || totalData.ypdb==0)) ? totalData.ypdb : '--' }}</a-col>
+                <a-col span="4">仓库误差调拨:{{ (totalData && (totalData.ckwcdb || totalData.ckwcdb==0)) ? totalData.ckwcdb : '--' }}</a-col>
+                <a-col span="4">TBU刹车片配送品调拨:{{ (totalData && (totalData.tbudb || totalData.tbudb==0)) ? totalData.tbudb : '--' }}</a-col>
+                <a-col span="4">NGK配送品调拨:{{ (totalData && (totalData.ngkdb || totalData.ngkdb==0)) ? totalData.ngkdb : '--' }}</a-col>
+                <a-col span="4">德路斯调拨:{{ (totalData && (totalData.dlsdb || totalData.dlsdb==0)) ? totalData.dlsdb : '--' }}</a-col>
+                <a-col span="4">新加盟商政策调拨:{{ (totalData && (totalData.xjmszcdb || totalData.xjmszcdb==0)) ? totalData.xjmszcdb : '--' }}</a-col>
+                <a-col span="4">特殊申请配送品调拨:{{ (totalData && (totalData.tssqpspdb || totalData.tssqpspdb==0)) ? totalData.tssqpspdb : '--' }}</a-col>
+                <a-col span="4">特殊申请促销调拨:{{ (totalData && (totalData.tssqcxdb || totalData.tssqcxdb==0)) ? totalData.tssqcxdb : '--' }}</a-col>
+                <a-col span="4">卡扣配送品调拨:{{ (totalData && (totalData.kkpspdb || totalData.kkpspdb==0)) ? totalData.kkpspdb : '--' }}</a-col>
+                <a-col span="4">客诉样品调拨:{{ (totalData && (totalData.ksypdb || totalData.ksypdb==0)) ? totalData.ksypdb : '--' }}</a-col>
+                <a-col span="6">调拨单合计金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }}</a-col>
+              </a-row>
+            </a-col>
+          </a-row>
+        </template>
+      </s-table>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import subarea from '@/views/common/subarea.js'
+import { getArea } from '@/api/data'
+import { hdExportExcel } from '@/libs/exportExcel'
+import { reportAllocateDbjdReportList, reportAllocateDbjdReportCount, reportAllocateDbjdReportExport } from '@/api/reportData'
+export default {
+  components: { STable, VSelect, rangeDateTime, subarea },
+  data () {
+    return {
+      spinning: false,
+      advanced: true, // 高级搜索 展开/关闭
+      queryParam: { //  查询条件
+        time: [],
+        beginDate: '',
+        endDate: '',
+        allocateNo: '',
+        targetName: '',
+        dealer: {
+          'provinceSn': undefined,
+          'citySn': undefined,
+          'districtSn': undefined,
+          'subareaSn': undefined,
+          'dealerLevel': undefined
+        }
+      },
+      rules: {
+        'time': [{ required: true, message: '请选择调拨日期', trigger: 'change' }]
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false,
+      columns: [
+        { title: '区域', dataIndex: 'dealerEntity.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
+        { title: '调拨单号', dataIndex: 'allocateNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'targetName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型',
+          align: 'center',
+          children: [
+            {
+              title: '配送品调拨',
+              dataIndex: 'pspdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '有偿调拨',
+              dataIndex: 'ycdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '促销调拨',
+              dataIndex: 'cxdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '退换品调拨',
+              dataIndex: 'thpdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '样品调拨',
+              dataIndex: 'ypdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '仓库误差调拨',
+              dataIndex: 'ckwcdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: 'TBU刹车片配送品调拨',
+              dataIndex: 'tbudb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: 'NGK配送品调拨',
+              dataIndex: 'ngkdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '德路斯调拨',
+              dataIndex: 'dlsdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '新加盟商政策调拨',
+              dataIndex: 'xjmszcdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '特殊申请配送品调拨',
+              dataIndex: 'tssqpspdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '特殊申请促销调拨',
+              dataIndex: 'tssqcxdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '卡扣配送品调拨',
+              dataIndex: 'kkpspdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '客诉样品调拨',
+              dataIndex: 'ksypdb',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            }
+          ]
+        },
+        { title: '调拨单合计金额', width: 90, dataIndex: 'totalCost', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
+        return reportAllocateDbjdReportList(paramsPage).then(res => {
+          this.getCount(paramsPage)
+          const 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
+        })
+      },
+      totalData: null,
+      addrProvinceList: [], //  省下拉
+      addrCityList: [], //  市下拉
+      addrDistrictList: [] //  区下拉
+    }
+  },
+  methods: {
+    //  导出
+    handleExport () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const params = _this.queryParam
+          delete params.time
+          _this.exportLoading = true
+          _this.spinning = true
+          hdExportExcel(reportAllocateDbjdReportExport, params, '调拨交单报表', function () {
+            _this.exportLoading = false
+            _this.spinning = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 总计
+    getCount (params) {
+      reportAllocateDbjdReportCount(params).then(res => {
+        if (res.status == 200 && res.data) {
+          this.totalData = res.data
+        } else {
+          this.totalData = null
+        }
+      })
+    },
+    handleSearch () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          _this.$refs.table.refresh(true)
+        } else {
+          return false
+        }
+      })
+    },
+    //  创建时间  change
+    dateChange (date) {
+      if (date[0] && date[1]) {
+        this.queryParam.time = date
+      } else {
+        this.queryParam.time = []
+      }
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.time = []
+      this.$refs.rangeDate.resetDate(this.queryParam.time)
+      this.queryParam.beginDate = ''
+      this.queryParam.endDate = ''
+      this.queryParam.allocateNo = ''
+      this.queryParam.targetName = ''
+      this.queryParam.dealer = {
+        'provinceSn': undefined,
+        'citySn': undefined,
+        'districtSn': undefined,
+        'subareaSn': undefined,
+        'dealerLevel': undefined
+      }
+      this.totalData = null
+      this.$refs.ruleForm.resetFields()
+      this.$refs.table.clearTable()
+    },
+    // 获取城市列表
+    getCityList (val) {
+      this.addrCityList = []
+      this.addrDistrictList = []
+      this.queryParam.dealer.citySn = undefined
+      this.queryParam.dealer.districtSn = undefined
+      if (val) {
+        this.getArea('city', val)
+      }
+    },
+    // 获取区县列表
+    getAreaList (val) {
+      this.addrDistrictList = []
+      this.queryParam.dealer.districtSn = undefined
+      if (val) {
+        this.getArea('district', val)
+      }
+    },
+    //  省/市/区
+    getArea (leve, sn) {
+      let params
+      if (leve == 'province') {
+        params = { type: '2' }
+      } else {
+        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
+      }
+      getArea(params).then(res => {
+        if (res.status == 200) {
+          if (leve == 'province') {
+            this.addrProvinceList = res.data || []
+          } else if (leve == 'city') {
+            this.addrCityList = res.data || []
+          } else if (leve == 'district') {
+            this.addrDistrictList = res.data || []
+          }
+        } else {
+          if (leve == 'province') {
+            this.addrProvinceList = []
+          } else if (leve == 'city') {
+            this.addrCityList = []
+          } else if (leve == 'district') {
+            this.addrDistrictList = []
+          }
+        }
+      })
+    },
+    pageInit () {
+      this.getArea('province')
+    }
+  },
+  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 => {})
+  }
+}
+</script>

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

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售日期" prop="time">
+              <a-form-model-item label="退货日期" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -167,7 +167,7 @@ export default {
         }
       },
       rules: {
-        'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading

+ 509 - 0
src/views/reportData/returnGoodsPresentation/list.vue

@@ -0,0 +1,509 @@
+<template>
+  <a-card size="small" :bordered="false" class="returnGoodsPresentationList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div class="table-page-search-wrapper">
+        <a-form-model
+          id="returnGoodsPresentationList-form"
+          ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
+          :model="queryParam"
+          :rules="rules"
+          @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="returnGoodsPresentationList-dealerName" v-model.trim="queryParam.dealer.dealerName" allowClear placeholder="请输入客户名称"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户级别">
+                <v-select
+                  v-model="queryParam.dealer.dealerLevel"
+                  ref="dealerLevel"
+                  id="returnGoodsPresentationList-dealerLevel"
+                  code="DEALER_LEVEL"
+                  placeholder="请选择客户级别"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货单号">
+                  <a-input id="returnGoodsPresentationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="returnGoodsPresentationList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="12" :sm="24">
+                <a-row>
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
+                    <a-col span="7">
+                      <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-model-item prop="dealerCitySn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-model-item prop="dealerCountySn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
+                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                  </a-form-model-item>
+                </a-row>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnGoodsPresentationList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnGoodsPresentationList-reset">重置</a-button>
+              <a-button
+                style="margin-left: 5px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                v-if="$hasPermissions('B_returnGoodsPresentationExport')"
+                id="returnGoodsPresentationList-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-model>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :defaultLoadData="false"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 2370 }"
+        bordered>
+        <template slot="footer">
+          <a-row>
+            <a-col span="2">合计:</a-col>
+            <a-col span="22">
+              <a-row>
+                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
+                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
+                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
+                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? totalData.jpGyxAmount : '--' }}</a-col>
+                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
+                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
+                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
+                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
+                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
+                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
+                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
+                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
+                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
+                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
+                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? totalData.wetAmount : '--' }}</a-col>
+                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
+                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
+                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
+                <a-col span="6">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+              </a-row>
+            </a-col>
+          </a-row>
+        </template>
+      </s-table>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import rangeDate from '@/views/common/rangeDate.vue'
+import subarea from '@/views/common/subarea.js'
+import { getArea } from '@/api/data'
+import { hdExportExcel } from '@/libs/exportExcel'
+import { reportSalesReturnThjdReportList, reportSalesReturnThjdReportCount, reportSalesReturnThjdReportExport } from '@/api/reportData'
+export default {
+  components: { STable, VSelect, rangeDate, subarea },
+  data () {
+    return {
+      spinning: false,
+      advanced: true, // 高级搜索 展开/关闭
+      queryParam: { //  查询条件
+        time: [],
+        beginDate: '',
+        endDate: '',
+        salesReturnBillNo: '',
+        dealer: {
+          'dealerName': '',
+          'provinceSn': undefined,
+          'citySn': undefined,
+          'districtSn': undefined,
+          'subareaSn': undefined,
+          'dealerLevel': undefined
+        }
+      },
+      rules: {
+        'time': [{ required: true, message: '请选择调拨日期', trigger: 'change' }]
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false,
+      columns: [
+        { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
+        { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌',
+          align: 'center',
+          children: [
+            {
+              title: '箭牌',
+              align: 'center',
+              children: [
+                {
+                  title: '滤清器',
+                  dataIndex: 'jpLqqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '雨刮片',
+                  dataIndex: 'jpYgpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '喇叭',
+                  dataIndex: 'jpLbAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '刹车片',
+                  dataIndex: 'jpScpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '感应线',
+                  dataIndex: 'jpGyxAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
+            },
+            {
+              title: '冠牌',
+              align: 'center',
+              children: [
+                {
+                  title: '滤清器',
+                  dataIndex: 'gpLqqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '雨刮片',
+                  dataIndex: 'gpYgpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '刹车片',
+                  dataIndex: 'gpScpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
+            },
+            {
+              title: '汇箭',
+              dataIndex: 'hjAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '德路斯',
+              dataIndex: 'dlsAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '稳升',
+              dataIndex: 'wsAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: 'TBU',
+              dataIndex: 'tbuAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: 'TBU-P',
+              dataIndex: 'tbupAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '布瑞斯',
+              dataIndex: 'brsAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            }
+          ]
+        },
+        { title: '代理品牌',
+          align: 'center',
+          children: [
+            {
+              title: 'NGK',
+              dataIndex: 'ngkAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '飞利浦',
+              dataIndex: 'flpAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '车仆',
+              dataIndex: 'cpAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '瓦尔塔',
+              dataIndex: 'wetAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '雷贝斯托',
+              dataIndex: 'lbstAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '德尔福',
+              dataIndex: 'defAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '巴诺德',
+              dataIndex: 'bndAmount',
+              align: 'center',
+              width: 80,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            }
+          ]
+        },
+        { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
+        return reportSalesReturnThjdReportList(paramsPage).then(res => {
+          this.getCount(paramsPage)
+          const 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
+        })
+      },
+      totalData: null,
+      addrProvinceList: [], //  省下拉
+      addrCityList: [], //  市下拉
+      addrDistrictList: [] //  区下拉
+    }
+  },
+  methods: {
+    //  导出
+    handleExport () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const params = _this.queryParam
+          delete params.time
+          _this.exportLoading = true
+          _this.spinning = true
+          hdExportExcel(reportSalesReturnThjdReportExport, params, '退货交单报表', function () {
+            _this.exportLoading = false
+            _this.spinning = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 总计
+    getCount (params) {
+      reportSalesReturnThjdReportCount(params).then(res => {
+        if (res.status == 200 && res.data) {
+          this.totalData = res.data
+        } else {
+          this.totalData = null
+        }
+      })
+    },
+    handleSearch () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          _this.$refs.table.refresh(true)
+        } else {
+          return false
+        }
+      })
+    },
+    //  创建时间  change
+    dateChange (date) {
+      if (date[0] && date[1]) {
+        this.queryParam.time = date
+      } else {
+        this.queryParam.time = []
+      }
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.time = []
+      this.$refs.rangeDate.resetDate(this.queryParam.time)
+      this.queryParam.beginDate = ''
+      this.queryParam.endDate = ''
+      this.queryParam.salesReturnBillNo = ''
+      this.queryParam.dealer = {
+        'dealerName': '',
+        'provinceSn': undefined,
+        'citySn': undefined,
+        'districtSn': undefined,
+        'subareaSn': undefined,
+        'dealerLevel': undefined
+      }
+      this.totalData = null
+      this.$refs.ruleForm.resetFields()
+      this.$refs.table.clearTable()
+    },
+    // 获取城市列表
+    getCityList (val) {
+      this.addrCityList = []
+      this.addrDistrictList = []
+      this.queryParam.dealer.citySn = undefined
+      this.queryParam.dealer.districtSn = undefined
+      if (val) {
+        this.getArea('city', val)
+      }
+    },
+    // 获取区县列表
+    getAreaList (val) {
+      this.addrDistrictList = []
+      this.queryParam.dealer.districtSn = undefined
+      if (val) {
+        this.getArea('district', val)
+      }
+    },
+    //  省/市/区
+    getArea (leve, sn) {
+      let params
+      if (leve == 'province') {
+        params = { type: '2' }
+      } else {
+        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
+      }
+      getArea(params).then(res => {
+        if (res.status == 200) {
+          if (leve == 'province') {
+            this.addrProvinceList = res.data || []
+          } else if (leve == 'city') {
+            this.addrCityList = res.data || []
+          } else if (leve == 'district') {
+            this.addrDistrictList = res.data || []
+          }
+        } else {
+          if (leve == 'province') {
+            this.addrProvinceList = []
+          } else if (leve == 'city') {
+            this.addrCityList = []
+          } else if (leve == 'district') {
+            this.addrDistrictList = []
+          }
+        }
+      })
+    },
+    pageInit () {
+      this.getArea('province')
+    }
+  },
+  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 => {})
+  }
+}
+</script>

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

@@ -354,7 +354,6 @@ export default {
           this.tableHeight = window.innerHeight - 380
         }
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
-        delete paramsPage.time
         return salesBillReportGroupByBuyerList(paramsPage).then(res => {
           this.getCount(paramsPage)
           const data = res.data

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

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售日期" prop="time">
+              <a-form-model-item label="退货日期" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -168,7 +168,7 @@ export default {
         }
       },
       rules: {
-        'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading

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

@@ -361,7 +361,6 @@ export default {
           this.tableHeight = window.innerHeight - 380
         }
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
-        delete paramsPage.time
         return salesBillReportList(paramsPage).then(res => {
           this.getCount(paramsPage)
           const data = res.data

+ 5 - 0
src/views/salesManagement/backorder/list.vue

@@ -132,6 +132,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/salesManagement/examineVerify/list.vue

@@ -301,6 +301,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/salesManagement/outboundOrder/list.vue

@@ -400,6 +400,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/salesManagement/priceInquiry/list.vue

@@ -202,6 +202,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/salesManagement/pushOrderManagement/list.vue

@@ -246,6 +246,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -441,6 +441,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

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

@@ -395,6 +395,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -398,6 +398,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -179,6 +179,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 15 - 12
src/views/setting/notice/list.vue

@@ -95,18 +95,6 @@ export default {
       return this.$store.getters.wsMessageData()
     }
   },
-  watch: {
-    // 监听ws消息通知
-    wsMessage (a, b) {
-      if (a !== b && a) {
-        // 新未读消息
-        if (a.type == 'no_read_count') {
-          this.resetData()
-          this.handelSearch()
-        }
-      }
-    }
-  },
   methods: {
     ...mapActions([
       'getMessageList', // 查询列表
@@ -208,6 +196,21 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
+  watch: {
+    // 监听ws消息通知
+    wsMessage (a, b) {
+      if (a !== b && a) {
+        // 新未读消息
+        if (a.type == 'no_read_count') {
+          this.resetData()
+          this.handelSearch()
+        }
+      }
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 5 - 0
src/views/setting/noticeManagement/list.vue

@@ -197,6 +197,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()

+ 3 - 0
src/views/supplierManagement/associatedProduct/add.vue

@@ -273,6 +273,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 3 - 0
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -153,6 +153,9 @@ export default {
       setTimeout(() => {
         _this.setTableH()
       }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {

+ 5 - 0
src/views/supplierManagement/supplierInfo/list.vue

@@ -150,6 +150,11 @@ export default {
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()