Browse Source

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

lilei 4 years ago
parent
commit
5ba6db89d1
100 changed files with 1327 additions and 2150 deletions
  1. 21 4
      src/components/MultiTab/MultiTab.vue
  2. 0 58
      src/config/router.config.js
  3. 2 1
      src/store/getters.js
  4. 15 14
      src/store/modules/app.js
  5. 13 7
      src/views/allocationManagement/chainTransferIn/detail.vue
  6. 16 8
      src/views/allocationManagement/chainTransferIn/edit.vue
  7. 20 16
      src/views/allocationManagement/chainTransferIn/list.vue
  8. 13 7
      src/views/allocationManagement/chainTransferOut/detail.vue
  9. 11 14
      src/views/allocationManagement/chainTransferOut/edit.vue
  10. 17 13
      src/views/allocationManagement/chainTransferOut/list.vue
  11. 15 9
      src/views/allocationManagement/storeTransferOut/detail.vue
  12. 13 14
      src/views/allocationManagement/storeTransferOut/edit.vue
  13. 17 13
      src/views/allocationManagement/storeTransferOut/list.vue
  14. 12 34
      src/views/allocationManagement/warehouseAllocation/detail.vue
  15. 17 19
      src/views/allocationManagement/warehouseAllocation/edit.vue
  16. 16 12
      src/views/allocationManagement/warehouseAllocation/list.vue
  17. 14 6
      src/views/basicData/bulkPartsTypeManagement/list.vue
  18. 14 6
      src/views/basicData/customerTypeManagement/list.vue
  19. 14 6
      src/views/basicData/expenseType/list.vue
  20. 14 6
      src/views/basicData/storeTransferOutTypeManagement/list.vue
  21. 13 6
      src/views/bulkManagement/bulkImport/list.vue
  22. 10 6
      src/views/bulkManagement/bulkReturnGoods/edit.vue
  23. 10 6
      src/views/bulkManagement/bulkReturnGoods/grabEdit.vue
  24. 17 13
      src/views/bulkManagement/bulkReturnGoods/list.vue
  25. 15 9
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  26. 11 7
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  27. 17 13
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  28. 10 4
      src/views/customerManagement/customerInfo/edit.vue
  29. 17 13
      src/views/customerManagement/customerInfo/list.vue
  30. 13 12
      src/views/financialManagement/companyCollectionPayment/detail.vue
  31. 16 13
      src/views/financialManagement/companyCollectionPayment/list.vue
  32. 14 4
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  33. 15 10
      src/views/financialManagement/companyReceivablePayable/detail.vue
  34. 13 9
      src/views/financialManagement/companyReceivablePayable/list.vue
  35. 10 4
      src/views/financialManagement/expenseManagement/edit.vue
  36. 15 11
      src/views/financialManagement/expenseManagement/list.vue
  37. 24 21
      src/views/financialManagement/financialCollection/list.vue
  38. 24 21
      src/views/financialManagement/financialPayment/list.vue
  39. 15 11
      src/views/financialManagement/inventoryCheckAudit/list.vue
  40. 0 161
      src/views/financialManagement/inventoryReview/detail.vue
  41. 0 190
      src/views/financialManagement/inventoryReview/list.vue
  42. 15 11
      src/views/financialManagement/ledgerRecord/list.vue
  43. 13 7
      src/views/financialManagement/warehousingAudit/detail.vue
  44. 15 11
      src/views/financialManagement/warehousingAudit/list.vue
  45. 16 10
      src/views/financialManagement/withdrawalManagement/list.vue
  46. 15 11
      src/views/inventoryManagement/inventoryChecking/list.vue
  47. 13 7
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  48. 15 3
      src/views/inventoryManagement/inventoryChecking/overall.vue
  49. 16 8
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  50. 13 6
      src/views/inventoryManagement/inventoryImport/list.vue
  51. 15 11
      src/views/inventoryManagement/inventoryQuery/list.vue
  52. 21 12
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  53. 17 13
      src/views/inventoryManagement/inventoryWarning/list.vue
  54. 12 9
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  55. 15 11
      src/views/inventoryManagement/warehouse/list.vue
  56. 15 11
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  57. 13 8
      src/views/notice/list.vue
  58. 15 11
      src/views/outboundOrderManagement/outboundOrder/list.vue
  59. 18 4
      src/views/power/role/roleList.vue
  60. 18 4
      src/views/power/user/userList.vue
  61. 12 14
      src/views/productManagement/newProduct/detail.vue
  62. 16 11
      src/views/productManagement/newProduct/list.vue
  63. 18 11
      src/views/productManagement/priceChangeRecord/list.vue
  64. 14 9
      src/views/productManagement/productBrand/list.vue
  65. 12 6
      src/views/productManagement/productCategory/list.vue
  66. 10 4
      src/views/productManagement/productInfo/edit.vue
  67. 17 13
      src/views/productManagement/productInfo/list.vue
  68. 18 14
      src/views/productManagement/productInfoJg/list.vue
  69. 2 6
      src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue
  70. 15 9
      src/views/purchasingManagement/purchaseOrder/detail.vue
  71. 15 10
      src/views/purchasingManagement/purchaseOrder/edit.vue
  72. 18 14
      src/views/purchasingManagement/purchaseOrder/list.vue
  73. 14 8
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  74. 13 12
      src/views/purchasingManagement/purchaseReturn/detail.vue
  75. 12 9
      src/views/purchasingManagement/purchaseReturn/edit.vue
  76. 16 12
      src/views/purchasingManagement/purchaseReturn/list.vue
  77. 13 5
      src/views/reportData/chainCustomerReport/list.vue
  78. 13 5
      src/views/reportData/chainReceivedSendStorageReport/list.vue
  79. 17 9
      src/views/reportData/chainSalesDetailReport/list.vue
  80. 14 6
      src/views/reportData/chainSalesReport/list.vue
  81. 13 5
      src/views/reportData/chainStockReport/list.vue
  82. 12 4
      src/views/reportData/customerReport/list.vue
  83. 12 4
      src/views/reportData/receivedSendStorageReport/list.vue
  84. 12 7
      src/views/reportData/stockExpenditureReport/list.vue
  85. 12 7
      src/views/reportData/stockIncomeReport/list.vue
  86. 15 11
      src/views/salesManagement/giftRecord/list.vue
  87. 0 132
      src/views/salesManagement/quotation/basicInfoModal.vue
  88. 0 136
      src/views/salesManagement/quotation/detail.vue
  89. 0 370
      src/views/salesManagement/quotation/edit.vue
  90. 0 209
      src/views/salesManagement/quotation/list.vue
  91. 13 7
      src/views/salesManagement/salesQuery/detail.vue
  92. 11 9
      src/views/salesManagement/salesQuery/edit.vue
  93. 14 11
      src/views/salesManagement/salesQuery/list.vue
  94. 13 7
      src/views/salesManagement/salesReturn/detail.vue
  95. 15 11
      src/views/salesManagement/salesReturn/list.vue
  96. 11 7
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  97. 13 9
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  98. 13 9
      src/views/salesManagement/salesman/list.vue
  99. 13 20
      src/views/salesManagement/urgentItemsOffset/detail.vue
  100. 13 9
      src/views/salesManagement/urgentItemsOffset/list.vue

+ 21 - 4
src/components/MultiTab/MultiTab.vue

@@ -44,6 +44,17 @@ export default {
     onEdit (targetKey, action) {
     onEdit (targetKey, action) {
       this[action](targetKey)
       this[action](targetKey)
     },
     },
+    onChange (targetKey) {
+      const index = this.tabsList.indexOf(targetKey)
+      if (index >= 0) {
+        const row = this.pages[index]
+        if (row && row.fullPath && row.fullPath.indexOf('/list') == -1) { // 非列表页
+          this.$store.state.app.isNewSubTab = true
+        } else {
+          this.$store.state.app.isNewSubTab = false
+        }
+      }
+    },
     remove (targetKey) {
     remove (targetKey) {
       this.pages = this.pages.filter(page => page.name !== targetKey)
       this.pages = this.pages.filter(page => page.name !== targetKey)
       this.tabsList = this.tabsList.filter(name => name !== targetKey)
       this.tabsList = this.tabsList.filter(name => name !== targetKey)
@@ -55,7 +66,6 @@ export default {
     selectedLastPath () {
     selectedLastPath () {
       this.activeKey = this.tabsList[this.tabsList.length - 1]
       this.activeKey = this.tabsList[this.tabsList.length - 1]
     },
     },
-
     // content menu
     // content menu
     refashThat (e) {
     refashThat (e) {
       this.reloadView()
       this.reloadView()
@@ -104,9 +114,16 @@ export default {
       this[key](route)
       this[key](route)
     },
     },
     renderTabPaneMenu (e) {
     renderTabPaneMenu (e) {
+      // return (
+      //   <a-menu {...{ on: { click: ({ key, item, domEvent }) => { this.closeMenuClick(key, e) } } }}>
+      //     {this.activeKey == e ? (<a-menu-item key="refashThat">刷新页面</a-menu-item>) : ''}
+      //     <a-menu-item key="closeRight">关闭右侧</a-menu-item>
+      //     <a-menu-item key="closeLeft">关闭左侧</a-menu-item>
+      //     <a-menu-item key="closeAll">关闭全部</a-menu-item>
+      //   </a-menu>
+      // )
       return (
       return (
         <a-menu {...{ on: { click: ({ key, item, domEvent }) => { this.closeMenuClick(key, e) } } }}>
         <a-menu {...{ on: { click: ({ key, item, domEvent }) => { this.closeMenuClick(key, e) } } }}>
-          {this.activeKey == e ? (<a-menu-item key="refashThat">刷新页面</a-menu-item>) : ''}
           <a-menu-item key="closeRight">关闭右侧</a-menu-item>
           <a-menu-item key="closeRight">关闭右侧</a-menu-item>
           <a-menu-item key="closeLeft">关闭左侧</a-menu-item>
           <a-menu-item key="closeLeft">关闭左侧</a-menu-item>
           <a-menu-item key="closeAll">关闭全部</a-menu-item>
           <a-menu-item key="closeAll">关闭全部</a-menu-item>
@@ -155,7 +172,7 @@ export default {
     }
     }
   },
   },
   render () {
   render () {
-    const { onEdit, refashThat, $data: { pages } } = this
+    const { onEdit, onChange, refashThat, $data: { pages } } = this
     const panes = pages.map(page => {
     const panes = pages.map(page => {
       return (
       return (
         <a-tab-pane
         <a-tab-pane
@@ -180,7 +197,7 @@ export default {
             type={'editable-card'}
             type={'editable-card'}
             v-model={this.activeKey}
             v-model={this.activeKey}
             tabBarStyle={{ background: '#FFF', margin: 0, paddingLeft: '16px', paddingTop: '1px' }}
             tabBarStyle={{ background: '#FFF', margin: 0, paddingLeft: '16px', paddingTop: '1px' }}
-            {...{ on: { edit: onEdit } }}>
+            {...{ on: { edit: onEdit, 'change': onChange } }}>
             {panes}
             {panes}
           </a-tabs>
           </a-tabs>
         </div>
         </div>

+ 0 - 58
src/config/router.config.js

@@ -233,64 +233,6 @@ export const asyncRouterMap = [
               }
               }
             ]
             ]
           },
           },
-          // {    二期
-          //   path: '/salesManagement/quotation',
-          //   redirect: '/salesManagement/quotation/list',
-          //   name: 'quotation',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '报价单',
-          //     icon: 'idcard'
-          //     // permission: 'M_goodsManage_list'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'quotationList',
-          //       component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/list.vue'),
-          //       meta: {
-          //         title: '报价单列表',
-          //         icon: 'idcard',
-          //         hidden: true
-          //         // permission: 'M_goodsManage_list'
-          //       }
-          //     },
-          //     {
-          //       path: 'add',
-          //       name: 'quotationAdd',
-          //       component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/edit.vue'),
-          //       meta: {
-          //         title: '新增报价单',
-          //         icon: 'idcard',
-          //         hidden: true
-          //         // permission: 'M_goodsManage_list'
-          //       }
-          //     },
-          //     {
-          //       path: 'edit/:id',
-          //       name: 'quotationEdit',
-          //       component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/edit.vue'),
-          //       meta: {
-          //         title: '编辑报价单',
-          //         icon: 'idcard',
-          //         hidden: true
-          //         // permission: 'M_goodsManage_list'
-          //       }
-          //     },
-          //     {
-          //       path: 'detail/:id',
-          //       name: 'quotationDetail',
-          //       component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/detail.vue'),
-          //       meta: {
-          //         title: '报价单详情',
-          //         icon: 'idcard',
-          //         hidden: true
-          //         // permission: 'M_goodsManage_list'
-          //       }
-          //     }
-          //   ]
-          // },
           {
           {
             path: '/salesManagement/giftRecord',
             path: '/salesManagement/giftRecord',
             redirect: '/salesManagement/giftRecord/list',
             redirect: '/salesManagement/giftRecord/list',

+ 2 - 1
src/store/getters.js

@@ -16,7 +16,8 @@ const getters = {
   lang: state => state.i18n.lang,
   lang: state => state.i18n.lang,
   nowRoute: state => state.app.nowRoute,
   nowRoute: state => state.app.nowRoute,
   isShowVideo: state => state.app.isShowVideo,
   isShowVideo: state => state.app.isShowVideo,
-  isNewTab: state => state.app.isNewTab
+  isNewTab: state => state.app.isNewTab,
+  isNewSubTab: state => state.app.isNewSubTab
 }
 }
 
 
 export default getters
 export default getters

+ 15 - 14
src/store/modules/app.js

@@ -26,8 +26,9 @@ const app = {
     weak: false,
     weak: false,
     multiTab: true,
     multiTab: true,
     nowRoute: '', // 当前路由
     nowRoute: '', // 当前路由
-    isShowVideo: false ,// 是否显示视频弹窗
-    isNewTab: false
+    isShowVideo: false, // 是否显示视频弹窗
+    isNewTab: false,
+    isNewSubTab: false
   },
   },
   mutations: {
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -88,32 +89,32 @@ const app = {
     }
     }
   },
   },
   actions: {
   actions: {
-    setSidebar({
+    setSidebar ({
       commit
       commit
     }, type) {
     }, type) {
       commit('SET_SIDEBAR_TYPE', type)
       commit('SET_SIDEBAR_TYPE', type)
     },
     },
-    CloseSidebar({
+    CloseSidebar ({
       commit
       commit
     }) {
     }) {
       commit('CLOSE_SIDEBAR')
       commit('CLOSE_SIDEBAR')
     },
     },
-    ToggleDevice({
+    ToggleDevice ({
       commit
       commit
     }, device) {
     }, device) {
       commit('TOGGLE_DEVICE', device)
       commit('TOGGLE_DEVICE', device)
     },
     },
-    ToggleTheme({
+    ToggleTheme ({
       commit
       commit
     }, theme) {
     }, theme) {
       commit('TOGGLE_THEME', theme)
       commit('TOGGLE_THEME', theme)
     },
     },
-    ToggleLayoutMode({
+    ToggleLayoutMode ({
       commit
       commit
     }, mode) {
     }, mode) {
       commit('TOGGLE_LAYOUT_MODE', mode)
       commit('TOGGLE_LAYOUT_MODE', mode)
     },
     },
-    ToggleFixedHeader({
+    ToggleFixedHeader ({
       commit
       commit
     }, fixedHeader) {
     }, fixedHeader) {
       if (!fixedHeader) {
       if (!fixedHeader) {
@@ -121,32 +122,32 @@ const app = {
       }
       }
       commit('TOGGLE_FIXED_HEADER', fixedHeader)
       commit('TOGGLE_FIXED_HEADER', fixedHeader)
     },
     },
-    ToggleFixSiderbar({
+    ToggleFixSiderbar ({
       commit
       commit
     }, fixSiderbar) {
     }, fixSiderbar) {
       commit('TOGGLE_FIXED_SIDERBAR', fixSiderbar)
       commit('TOGGLE_FIXED_SIDERBAR', fixSiderbar)
     },
     },
-    ToggleFixedHeaderHidden({
+    ToggleFixedHeaderHidden ({
       commit
       commit
     }, show) {
     }, show) {
       commit('TOGGLE_FIXED_HEADER_HIDDEN', show)
       commit('TOGGLE_FIXED_HEADER_HIDDEN', show)
     },
     },
-    ToggleContentWidth({
+    ToggleContentWidth ({
       commit
       commit
     }, type) {
     }, type) {
       commit('TOGGLE_CONTENT_WIDTH', type)
       commit('TOGGLE_CONTENT_WIDTH', type)
     },
     },
-    ToggleColor({
+    ToggleColor ({
       commit
       commit
     }, color) {
     }, color) {
       commit('TOGGLE_COLOR', color)
       commit('TOGGLE_COLOR', color)
     },
     },
-    ToggleWeak({
+    ToggleWeak ({
       commit
       commit
     }, weakFlag) {
     }, weakFlag) {
       commit('TOGGLE_WEAK', weakFlag)
       commit('TOGGLE_WEAK', weakFlag)
     },
     },
-    ToggleMultiTab({
+    ToggleMultiTab ({
       commit
       commit
     }, bool) {
     }, bool) {
       commit('TOGGLE_MULTI_TAB', bool)
       commit('TOGGLE_MULTI_TAB', bool)

+ 13 - 7
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -54,6 +54,7 @@
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
           :scroll="{ x: 1335 }"
           :scroll="{ x: 1335 }"
+          :defaultLoadData="false"
           bordered>
           bordered>
         </s-table>
         </s-table>
       </a-card>
       </a-card>
@@ -179,15 +180,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.spinning) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 16 - 8
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -345,19 +345,27 @@ export default {
         window.frames['printfcie'].focus()
         window.frames['printfcie'].focus()
         window.frames['printfcie'].print()
         window.frames['printfcie'].print()
       }
       }
+    },
+    pageInit () {
+      this.getDetail()
+      this.getWarehouseCascade()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getWarehouseCascade()
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 20 - 16
src/views/allocationManagement/chainTransferIn/list.vue

@@ -80,6 +80,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1310, y: tableHeight }"
         :scroll="{ x: 1310, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 连锁调入单号 -->
         <!-- 连锁调入单号 -->
         <template slot="allocationLinkagePutNo" slot-scope="text, record">
         <template slot="allocationLinkagePutNo" slot-scope="text, record">
@@ -169,17 +170,7 @@ export default {
       outTenantSnData: []
       outTenantSnData: []
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   methods: {
   methods: {
-    setTableH () {
-      const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 197
-    },
     //  时间  change
     //  时间  change
     dateChange (date) {
     dateChange (date) {
       this.queryParam.beginDate = date[0]
       this.queryParam.beginDate = date[0]
@@ -239,6 +230,17 @@ export default {
       return (
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
       )
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getPutTenantList()
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 197
     }
     }
   },
   },
   watch: {
   watch: {
@@ -249,19 +251,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getPutTenantList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 7
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -58,6 +58,7 @@
               :columns="columns"
               :columns="columns"
               :data="loadData"
               :data="loadData"
               :scroll="{ x: 1090 }"
               :scroll="{ x: 1090 }"
+              :defaultLoadData="false"
               bordered>
               bordered>
             </s-table>
             </s-table>
           </a-collapse-panel>
           </a-collapse-panel>
@@ -189,15 +190,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新 或 为弹框时调用
+      this.getDetail()
+      this.$refs.table.refresh(true)
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getDetail()
+      this.$refs.table.refresh(true)
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 11 - 14
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -425,10 +425,6 @@ export default {
         }
         }
       })
       })
     },
     },
-    //  导入明细
-    handleImport () {
-      console.log(333)
-    },
     //  返回列表
     //  返回列表
     handleBack () {
     handleBack () {
       this.$router.push({ path: '/allocationManagement/chainTransferOut/list', query: { closeLastOldTab: true } })
       this.$router.push({ path: '/allocationManagement/chainTransferOut/list', query: { closeLastOldTab: true } })
@@ -520,23 +516,24 @@ export default {
       }
       }
     },
     },
     pageInit () {
     pageInit () {
+      this.chooseResetSearchForm()
       this.getDetail()
       this.getDetail()
       this.getWarehouseList()
       this.getWarehouseList()
-      if (!this.disabled) {
-        this.resetSearchForm()
-      }
-      if (!this.chooseDisabled) {
-        this.chooseResetSearchForm()
-      }
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 17 - 13
src/views/allocationManagement/chainTransferOut/list.vue

@@ -84,6 +84,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1380, y: tableHeight }"
         :scroll="{ x: 1380, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 连锁调出单号 -->
         <!-- 连锁调出单号 -->
         <template slot="allocationLinkageOutNo" slot-scope="text, record">
         <template slot="allocationLinkageOutNo" slot-scope="text, record">
@@ -291,17 +292,19 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
       )
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.openModal = false
+      this.getPutTenantList()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -310,20 +313,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      vm.getPutTenantList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 9
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -56,6 +56,7 @@
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
           :scroll="{ x: 995 }"
           :scroll="{ x: 995 }"
+          :defaultLoadData="false"
           bordered>
           bordered>
         </s-table>
         </s-table>
       </a-card>
       </a-card>
@@ -184,17 +185,22 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
-    this.getDetailCount()
+    if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新 或 为弹框时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+      this.getDetailCount()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+      this.getDetailCount()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.spinning) {
-        vm.getDetail()
-        vm.getDetailCount()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 14
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -93,6 +93,7 @@
               :customRow="handleClickRow"
               :customRow="handleClickRow"
               :data="loadData"
               :data="loadData"
               :scroll="{ x: 1180, y: 300 }"
               :scroll="{ x: 1180, y: 300 }"
+              :defaultLoadData="false"
               bordered>
               bordered>
               <!-- 操作 -->
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
               <template slot="action" slot-scope="text, record">
@@ -450,10 +451,6 @@ export default {
         }
         }
       })
       })
     },
     },
-    //  导入明细
-    handleImport () {
-      console.log(333)
-    },
     //  返回列表
     //  返回列表
     handleBack () {
     handleBack () {
       this.$router.push({ path: '/allocationManagement/storeTransferOut/list', query: { closeLastOldTab: true } })
       this.$router.push({ path: '/allocationManagement/storeTransferOut/list', query: { closeLastOldTab: true } })
@@ -512,21 +509,23 @@ export default {
       this.getWarehouseList()
       this.getWarehouseList()
       this.getProductBrand()
       this.getProductBrand()
       this.getProductType()
       this.getProductType()
-      if (!this.disabled) {
-        this.resetSearchForm()
-      }
-      if (!this.chooseDisabled) {
-        this.chooseResetSearchForm()
-      }
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 17 - 13
src/views/allocationManagement/storeTransferOut/list.vue

@@ -73,6 +73,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1500, y: tableHeight }"
         :scroll="{ x: 1500, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 店内调出单号 -->
         <!-- 店内调出单号 -->
         <template slot="storeCallOutNo" slot-scope="text, record">
         <template slot="storeCallOutNo" slot-scope="text, record">
@@ -276,17 +277,19 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.openModal = false
+      this.getStoreCallOutTypeAllList()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -295,20 +298,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      vm.getStoreCallOutTypeAllList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 34
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -14,12 +14,6 @@
           编辑
           编辑
         </a-button>
         </a-button>
       </template>
       </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="warehouseAllocationDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="warehouseAllocationDetail-print-btn">快速打印</a-button>
-        <a-button key="3" type="danger" @click="handleExport" :loading="exportLoading" id="warehouseAllocationDetail-export-btn">导出</a-button>
-      </template> -->
     </a-page-header>
     </a-page-header>
     <!-- 基础信息 -->
     <!-- 基础信息 -->
     <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
     <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
@@ -151,39 +145,23 @@ export default {
           this.productTotal = null
           this.productTotal = null
         }
         }
       })
       })
-    },
-    //  导出
-    handleExport () {
-      const params = this.queryParam
-      this.exportLoading = true
-      // customerBundleExportDelay(params).then(res => {
-      //   this.exportLoading = false
-      //   this.download(res)
-      // })
-    },
-    download (data) {
-      if (!data) { return }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      const a = moment().format('YYYYMMDDHHmmss')
-      const fname = '仓库调拨' + a
-      link.setAttribute('download', fname + '.xlsx')
-      document.body.appendChild(link)
-      link.click()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getHouse()
+    if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新 或 为弹框时调用
+      this.$refs.table.refresh(true)
+      this.getHouse()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getHouse()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getHouse()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 17 - 19
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -8,11 +8,6 @@
           <span style="margin: 0 15px;color: #666;">调出仓库:{{ (basicInfoData&&basicInfoData.outWarehouseName) || '--' }}</span>
           <span style="margin: 0 15px;color: #666;">调出仓库:{{ (basicInfoData&&basicInfoData.outWarehouseName) || '--' }}</span>
           <span style="margin: 0 15px;color: #666;">调入仓库:{{ (basicInfoData&&basicInfoData.putWarehouseName) || '--' }}</span>
           <span style="margin: 0 15px;color: #666;">调入仓库:{{ (basicInfoData&&basicInfoData.putWarehouseName) || '--' }}</span>
         </template>
         </template>
-        <!-- 操作区,位于 title 行的行尾 -->
-        <!-- <template slot="extra">
-          <a-button key="2" id="warehouseAllocationEdit-preview-btn">打印预览</a-button>
-          <a-button key="1" type="primary" id="warehouseAllocationEdit-print-btn">快速打印</a-button>
-        </template> -->
       </a-page-header>
       </a-page-header>
       <!-- 选择产品 -->
       <!-- 选择产品 -->
       <a-card size="small" :bordered="false" class="warehouseAllocationEdit-cont">
       <a-card size="small" :bordered="false" class="warehouseAllocationEdit-cont">
@@ -479,10 +474,6 @@ export default {
         }
         }
       })
       })
     },
     },
-    //  导入明细
-    handleImport () {
-      console.log(333)
-    },
     //  返回列表
     //  返回列表
     handleBack () {
     handleBack () {
       this.$router.push({ path: '/allocationManagement/warehouseAllocation/list', query: { closeLastOldTab: true } })
       this.$router.push({ path: '/allocationManagement/warehouseAllocation/list', query: { closeLastOldTab: true } })
@@ -539,21 +530,28 @@ export default {
       return (
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
       )
+    },
+    pageInit () {
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
+      this.getProductBrand()
+      this.getProductType()
+      this.getDetail()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
-    this.chooseResetSearchForm()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getProductBrand()
-      vm.getProductType()
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.chooseResetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 16 - 12
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -61,6 +61,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1260, y: tableHeight }"
         :scroll="{ x: 1260, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 单号 -->
         <!-- 单号 -->
         <template slot="allocationWarehouseNo" slot-scope="text, record">
         <template slot="allocationWarehouseNo" slot-scope="text, record">
@@ -234,17 +235,18 @@ export default {
     handleEdit (row) {
     handleEdit (row) {
       this.$router.push({ path: `/allocationManagement/warehouseAllocation/edit/${row.id}/${row.allocationWarehouseSn}` })
       this.$router.push({ path: `/allocationManagement/warehouseAllocation/edit/${row.id}/${row.allocationWarehouseSn}` })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getWarehouseList()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -253,19 +255,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getWarehouseList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 6
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -15,6 +15,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
@@ -122,22 +123,29 @@ export default {
       this.openModal = false
       this.openModal = false
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
-  },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 6
src/views/basicData/customerTypeManagement/list.vue

@@ -31,6 +31,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
@@ -138,22 +139,29 @@ export default {
       this.openModal = false
       this.openModal = false
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
-  },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 6
src/views/basicData/expenseType/list.vue

@@ -17,6 +17,7 @@
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
         :showPagination="false"
         :showPagination="false"
         :defaultExpandedRowKeys="defaultExpandedRowKeys"
         :defaultExpandedRowKeys="defaultExpandedRowKeys"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
@@ -158,22 +159,29 @@ export default {
         })
         })
       }
       }
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.$refs.table.refresh(true)
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     }
     }
-  },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 6
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -20,6 +20,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+		:defaultLoadData="false"
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
@@ -123,22 +124,29 @@ export default {
       this.openModal = false
       this.openModal = false
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  }
 }
 }
 </script>
 </script>

+ 13 - 6
src/views/bulkManagement/bulkImport/list.vue

@@ -212,17 +212,17 @@ export default {
       document.body.appendChild(link)
       document.body.appendChild(link)
       link.click()
       link.click()
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 400
       this.tableHeight = window.innerHeight - tableSearchH - 400
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -231,9 +231,16 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },

+ 10 - 6
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -424,14 +424,18 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.initPage()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.initPage()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.initPage()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.initPage()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 10 - 6
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -422,14 +422,18 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.initPage()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.initPage()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.initPage()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.initPage()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 17 - 13
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -71,6 +71,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1330, y: tableHeight }"
         :scroll="{ x: 1330, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 散件退货单号 -->
         <!-- 散件退货单号 -->
         <template slot="sparePartsReturnNo" slot-scope="text, record">
         <template slot="sparePartsReturnNo" slot-scope="text, record">
@@ -304,17 +305,19 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.openModal = false
+      this.getSupplierList()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -323,20 +326,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      vm.getSupplierList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 9
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -74,6 +74,7 @@
               :columns="columns"
               :columns="columns"
               :data="loadData"
               :data="loadData"
               :scroll="{ x: 1180 }"
               :scroll="{ x: 1180 }"
+              :defaultLoadData="false"
               bordered>
               bordered>
             </s-table>
             </s-table>
           </a-collapse-panel>
           </a-collapse-panel>
@@ -215,17 +216,22 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
-    this.getDetailCount()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+      this.getDetailCount()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+      this.getDetailCount()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.getDetailCount()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 11 - 7
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -663,18 +663,22 @@ export default {
       this.getProductType()
       this.getProductType()
       this.resetSearchForm()
       this.resetSearchForm()
       this.$refs.chooseTable.refresh(true)
       this.$refs.chooseTable.refresh(true)
+      this.openModal = false
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.initPage()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.initPage()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.initPage()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      if (!vm.disabled) {
-        vm.initPage()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 17 - 13
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -99,6 +99,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1120, y: tableHeight }"
         :scroll="{ x: 1120, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 散件单号 -->
         <!-- 散件单号 -->
         <template slot="sparePartsPurchaseNo" slot-scope="text, record">
         <template slot="sparePartsPurchaseNo" slot-scope="text, record">
@@ -334,17 +335,19 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.openModal = false
+      this.getSupplierList()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 270
       this.tableHeight = window.innerHeight - tableSearchH - 270
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -353,20 +356,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      vm.getSupplierList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 10 - 4
src/views/customerManagement/customerInfo/edit.vue

@@ -339,12 +339,18 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.initPage()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.initPage()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.initPage()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.initPage()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 17 - 13
src/views/customerManagement/customerInfo/list.vue

@@ -88,6 +88,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1220, y: tableHeight }"
         :scroll="{ x: 1220, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
@@ -323,17 +324,19 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getArea('province')
+      this.getCustTypeList()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -342,20 +345,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getArea('province')
-      vm.getCustTypeList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 12
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -6,11 +6,6 @@
         <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
         <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
       </template>
       </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="companyCollectionPaymentDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="companyCollectionPaymentDetail-print-btn">快速打印</a-button>
-      </template> -->
     </a-page-header>
     </a-page-header>
     <!-- 基础信息 -->
     <!-- 基础信息 -->
     <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
     <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
@@ -51,6 +46,7 @@
             :columns="columns"
             :columns="columns"
             :data="loadData"
             :data="loadData"
             :scroll="{ x: 640 }"
             :scroll="{ x: 640 }"
+            :defaultLoadData="false"
             bordered>
             bordered>
           </s-table>
           </s-table>
         </a-collapse-panel>
         </a-collapse-panel>
@@ -118,15 +114,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 16 - 13
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -83,6 +83,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ x: 1340, y: tableHeight }"
       :scroll="{ x: 1340, y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       bordered>
       <!-- 结算单号 -->
       <!-- 结算单号 -->
       <template slot="unitSettleNo" slot-scope="text, record">
       <template slot="unitSettleNo" slot-scope="text, record">
@@ -194,17 +195,18 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getSettleStyle()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -213,20 +215,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getSettleStyle()
-      vm.resetSearchForm()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 4
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -306,11 +306,21 @@ export default {
       this.openModal = false
       this.openModal = false
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getSettleStyle()
+      this.chooseLoadData = []
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getSettleStyle()
+      this.chooseLoadData = []
+    }
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getSettleStyle()
-      vm.chooseLoadData = []
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 10
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -6,11 +6,6 @@
         <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name || '--' }}</p>
         <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name || '--' }}</p>
       </template>
       </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="companyCollectionPaymentDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="companyCollectionPaymentDetail-print-btn">快速打印</a-button>
-      </template> -->
     </a-page-header>
     </a-page-header>
     <a-card>
     <a-card>
       <!-- 搜索条件 -->
       <!-- 搜索条件 -->
@@ -60,6 +55,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 800 }"
         :scroll="{ x: 800 }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 采购数量 -->
         <!-- 采购数量 -->
         <template slot="purchaseNum" slot-scope="text, record">
         <template slot="purchaseNum" slot-scope="text, record">
@@ -171,12 +167,21 @@ export default {
       link.click()
       link.click()
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.resetSearchForm()
+    }
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 9
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -47,6 +47,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ y: tableHeight }"
       :scroll="{ y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
@@ -141,29 +142,32 @@ export default {
       this.queryParam.settleClientType = undefined
       this.queryParam.settleClientType = undefined
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 10 - 4
src/views/financialManagement/expenseManagement/edit.vue

@@ -201,12 +201,18 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    // this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 11
src/views/financialManagement/expenseManagement/list.vue

@@ -76,6 +76,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1120, y: tableHeight }"
         :scroll="{ x: 1120, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 费用类别 -->
         <!-- 费用类别 -->
         <template slot="expensesType" slot-scope="text, record">
         <template slot="expensesType" slot-scope="text, record">
@@ -303,17 +304,17 @@ export default {
       this.costType = []
       this.costType = []
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 270
       this.tableHeight = window.innerHeight - tableSearchH - 270
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -322,18 +323,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 24 - 21
src/views/financialManagement/financialCollection/list.vue

@@ -86,6 +86,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1660, y: tableHeight }"
         :scroll="{ x: 1660, y: tableHeight }"
+        :defaultLoadData="false"
         bordered
         bordered
       >
       >
         <!-- 操作 -->
         <!-- 操作 -->
@@ -212,20 +213,6 @@ export default {
       }
       }
     }
     }
   },
   },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.resetSearchForm()
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.queryByTypeSum()
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
-  },
   methods: {
   methods: {
     //  时间  change
     //  时间  change
     dateChange (date) {
     dateChange (date) {
@@ -338,18 +325,18 @@ export default {
         })
         })
       }
       }
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.queryByTypeSum()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 330
       this.tableHeight = window.innerHeight - tableSearchH - 330
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-      _this.queryByTypeSum()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -357,6 +344,22 @@ export default {
         _this.setTableH()
         _this.setTableH()
       }, 400)
       }, 400)
     }
     }
+  },
+  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>
 </script>

+ 24 - 21
src/views/financialManagement/financialPayment/list.vue

@@ -85,6 +85,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1660, y: tableHeight }"
         :scroll="{ x: 1660, y: tableHeight }"
+        :defaultLoadData="false"
         bordered
         bordered
       >
       >
         <!-- 操作 -->
         <!-- 操作 -->
@@ -211,20 +212,6 @@ export default {
       }
       }
     }
     }
   },
   },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.resetSearchForm()
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.queryByTypeSum()
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
-  },
   methods: {
   methods: {
     //  时间  change
     //  时间  change
     dateChange (date) {
     dateChange (date) {
@@ -337,18 +324,18 @@ export default {
         })
         })
       }
       }
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.queryByTypeSum()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 330
       this.tableHeight = window.innerHeight - tableSearchH - 330
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-      _this.queryByTypeSum()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -356,6 +343,22 @@ export default {
         _this.setTableH()
         _this.setTableH()
       }, 400)
       }, 400)
     }
     }
+  },
+  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>
 </script>

+ 15 - 11
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -34,6 +34,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1150, y: tableHeight }"
         :scroll="{ x: 1150, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 单号 -->
         <!-- 单号 -->
         <template slot="checkWarehouseNo" slot-scope="text, record">
         <template slot="checkWarehouseNo" slot-scope="text, record">
@@ -166,17 +167,17 @@ export default {
       this.queryParam.checkWarehouseNo = ''
       this.queryParam.checkWarehouseNo = ''
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -185,18 +186,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 0 - 161
src/views/financialManagement/inventoryReview/detail.vue

@@ -1,161 +0,0 @@
-<template>
-  <div class="inventoryReviewDetail-wrap">
-    <a-page-header :ghost="false" @back="handleBack" >
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="inventoryReviewDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
-      </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="inventoryReviewDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="inventoryReviewDetail-print-btn">快速打印</a-button>
-      </template> -->
-    </a-page-header>
-    <!-- 内容 -->
-    <a-page-header title="盘点单号:CG2021010100001" ></a-page-header>
-    <!-- alert -->
-    <a-alert type="info" style="margin-bottom:10px">
-      <div slot="message"><strong class="red">红色代表盘盈</strong>,<strong class="green">绿色代表盈亏</strong></div>
-    </a-alert>
-    <!-- 盈亏统计 -->
-    <a-card size="small" :bordered="false" class="inventoryReviewDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="盈亏统计">
-          <a-descriptions :column="2" bordered>
-            <a-descriptions-item label="库存数量">2</a-descriptions-item>
-            <a-descriptions-item label="库存成本">20</a-descriptions-item>
-            <a-descriptions-item label="盘盈数量">¥120.36</a-descriptions-item>
-            <a-descriptions-item label="盘盈成本">3</a-descriptions-item>
-            <a-descriptions-item label="盘亏数量">4</a-descriptions-item>
-            <a-descriptions-item label="盘亏成本">¥11.2</a-descriptions-item>
-            <a-descriptions-item>
-              <template slot="label">
-                盈亏总数量
-                <a-popover>
-                  <template slot="content">
-                    盘盈数量与盘亏数量之和
-                  </template>
-                  <a-icon type="question-circle" theme="twoTone" />
-                </a-popover>
-              </template>
-              4
-            </a-descriptions-item>
-            <a-descriptions-item>
-              <template slot="label">
-                盈亏总成本
-                <a-popover>
-                  <template slot="content">
-                    盘盈成本与盘亏成本之和
-                  </template>
-                  <a-icon type="question-circle" theme="twoTone" />
-                </a-popover>
-              </template>
-              4
-            </a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <!-- 产品明细 -->
-    <a-card size="small" :bordered="false" class="inventoryReviewDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="产品明细">
-          <!-- 列表 -->
-          <s-table
-            class="sTable"
-            ref="table"
-            size="small"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            :scroll="{ x: 1290 }"
-            bordered>
-            <!-- 采购数量 -->
-            <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{ record.purchaseNum }}</span>
-            </template>
-            <!-- 缺货数量 -->
-            <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{ record.outOfStockNum }}</span>
-            </template>
-          </s-table>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-export default {
-  components: { STable, VSelect },
-  data () {
-    return {
-      // 表头
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 160, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center' },
-        { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存数量', dataIndex: 'qtsy', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存成本', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点数量', dataIndex: 'qtssy', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点盈亏数量', dataIndex: 'qtdsy', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点盈亏成本', dataIndex: 'prifce', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-        //   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
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-            ],
-            count: 10
-          }
-          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
-          resolve(data)
-        })
-      }
-    }
-  },
-  methods: {
-    //  返回列表
-    handleBack () {
-      this.$router.push({ path: '/financialManagement/inventoryReview/list', query: { closeLastOldTab: true } })
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .inventoryReviewDetail-wrap{
-    .inventoryReviewDetail-cont{
-      margin-bottom: 10px;
-    }
-    .green{
-      color: #19be6b;
-    }
-    .red{
-      color: #ed1c24;
-    }
-  }
-</style>

+ 0 - 190
src/views/financialManagement/inventoryReview/list.vue

@@ -1,190 +0,0 @@
-<template>
-  <a-card size="small" :bordered="false" class="inventoryReviewList-wrap">
-    <!-- 搜索条件 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="盘点单号">
-              <a-input id="inventoryReviewList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入盘点单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="盘点审核时间">
-              <rangeDate ref="rangeDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="财务审核状态">
-              <v-select
-                v-model="queryParam.billStatus"
-                ref="billStatus"
-                id="inventoryReviewList-billStatus"
-                code="PAYMENT_TYPE"
-                placeholder="请选择财务审核状态"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryReviewList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="inventoryReviewList-reset">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- alert -->
-    <a-alert type="info" style="margin-bottom:10px">
-      <div slot="message">共 <strong>6</strong> 条记录,其中待审核 <strong>14</strong> 条 </div>
-    </a-alert>
-    <!-- 列表 -->
-    <s-table
-      class="sTable"
-      ref="table"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ x: 1300 }"
-      bordered>
-      <!-- 采购单号 -->
-      <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
-      </template>
-      <!-- 采购入库单号 -->
-      <template slot="purchaseNos" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
-      </template>
-      <!-- 状态 -->
-      <template slot="state" slot-scope="text, record">
-        <span>{{ record.state == 1 ? '已启用' : '已禁用' }}</span>
-      </template>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" class="button-info" @click="handleExamine(record, 1)" id="inventoryReview-adopt-btn">通过</a-button>
-        <a-button size="small" type="primary" class="button-warning" @click="handleExamine(record, 2)" id="inventoryReview-unadopt-btn">不通过</a-button>
-        <a-button size="small" type="primary" class="button-success" @click="handleDetail(record)" id="inventoryReview-detail-btn">详情</a-button>
-      </template>
-    </s-table>
-  </a-card>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import rangeDate from '@/views/common/rangeDate.vue'
-// import { getRoleList, getServiceList } from '@/api/manage'
-export default {
-  components: { STable, VSelect, rangeDate },
-  data () {
-    return {
-      disabled: false, //  查询、重置按钮是否可操作
-      // 查询参数
-      queryParam: {
-        beginDate: '',
-        endDate: ''
-      },
-      // 表头
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '盘点单号', scopedSlots: { customRender: 'purchaseBillNo' }, align: 'center' },
-        { title: '盘点产品款数', dataIndex: 'totalCategory', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存总成本', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘盈总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘亏总数量', dataIndex: 'totalssQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点审核时间', dataIndex: 'sauditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', scopedSlots: { customRender: 'auditStatus' }, width: 120, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-        //   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
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-            ],
-            count: 10
-          }
-          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
-          resolve(data)
-        })
-      }
-    }
-  },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.resetSearchForm()
-    }
-  },
-  methods: {
-    //  时间  change
-    dateChange (date) {
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
-    },
-    //  详情
-    handleDetail (row) {
-      this.$router.push({ path: `/financialManagement/inventoryReview/detail/${row.id}` })
-    },
-    //  审核
-    handleExamine (row, type) {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
-        centered: true,
-        onOk () {
-          // delectRolePower({
-          //   id: row.id
-          // }).then(res => {
-          //   console.log(res, 'res1111')
-          //   if (res.status == 200) {
-          //     _this.$message.success(res.message)
-          //     _this.$refs.table.refresh()
-          //   }
-          // })
-        }
-      })
-    },
-    //  重置
-    resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
-      this.queryParam.orderBundleNo = ''
-      this.queryParam.orderBundle.custMobile = ''
-      this.queryParam.bundleName = ''
-      this.queryParam.itemName = ''
-      this.oldTime = undefined
-      this.newTime = undefined
-      this.$refs.table.refresh(true)
-    }
-  }
-}
-</script>
-<style lang="less">
-  .inventoryReviewList-wrap{
-    .sTable{
-      margin-top: 15px;
-    }
-  }
-</style>

+ 15 - 11
src/views/financialManagement/ledgerRecord/list.vue

@@ -56,6 +56,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ x: 1690 }"
       :scroll="{ x: 1690 }"
+      :defaultLoadData="false"
       bordered>
       bordered>
     </s-table>
     </s-table>
   </a-card>
   </a-card>
@@ -154,17 +155,17 @@ export default {
       this.$refs.custSatelliteList.resetForm()
       this.$refs.custSatelliteList.resetForm()
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -173,18 +174,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 7
src/views/financialManagement/warehousingAudit/detail.vue

@@ -50,6 +50,7 @@
               :columns="columns"
               :columns="columns"
               :data="loadData"
               :data="loadData"
               :scroll="{ x: 1520 }"
               :scroll="{ x: 1520 }"
+              :defaultLoadData="false"
               bordered>
               bordered>
             </s-table>
             </s-table>
           </a-collapse-panel>
           </a-collapse-panel>
@@ -150,15 +151,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 11
src/views/financialManagement/warehousingAudit/list.vue

@@ -63,6 +63,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1420, y: tableHeight }"
         :scroll="{ x: 1420, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 采购入库单号 -->
         <!-- 采购入库单号 -->
         <template slot="receivingBillNo" slot-scope="text, record">
         <template slot="receivingBillNo" slot-scope="text, record">
@@ -204,17 +205,17 @@ export default {
       this.queryParam.auditState = undefined
       this.queryParam.auditState = undefined
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 238
       this.tableHeight = window.innerHeight - tableSearchH - 238
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -223,18 +224,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 16 - 10
src/views/financialManagement/withdrawalManagement/list.vue

@@ -33,6 +33,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ x: 1320 }"
       :scroll="{ x: 1320 }"
+      :defaultLoadData="false"
       bordered>
       bordered>
     </s-table>
     </s-table>
     <!-- 提现说明 -->
     <!-- 提现说明 -->
@@ -139,18 +140,18 @@ export default {
       this.queryParam.endDate = ''
       this.queryParam.endDate = ''
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getAccount()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235 - 217.5
       this.tableHeight = window.innerHeight - tableSearchH - 235 - 217.5
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-    _this.getAccount()
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -159,16 +160,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getAccount()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 11
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -56,6 +56,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ x: 1160, y: tableHeight }"
       :scroll="{ x: 1160, y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       bordered>
       <!-- 单号 -->
       <!-- 单号 -->
       <template slot="checkWarehouseNo" slot-scope="text, record">
       <template slot="checkWarehouseNo" slot-scope="text, record">
@@ -265,17 +266,17 @@ export default {
       this.itemSn = null
       this.itemSn = null
       this.openDetailModal = false
       this.openDetailModal = false
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -284,18 +285,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 7
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -113,6 +113,7 @@
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
           :scroll="{ x: 990 }"
           :scroll="{ x: 990 }"
+          :defaultLoadData="false"
           bordered>
           bordered>
           <!-- 产品分类 -->
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
           <template slot="productType" slot-scope="text, record">
@@ -424,15 +425,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getDetail()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getDetail()
+      this.resetSearchForm()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 3
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -55,6 +55,7 @@
           :rowKey="(record) => record.id"
           :rowKey="(record) => record.id"
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
+          :defaultLoadData="false"
           bordered>
           bordered>
         </s-table>
         </s-table>
       </a-card>
       </a-card>
@@ -161,10 +162,21 @@ export default {
       })
       })
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getDetail()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getDetail()
+      this.resetSearchForm()
+    }
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getDetail()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 16 - 8
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -94,6 +94,7 @@
           :customRow="handleClickRow"
           :customRow="handleClickRow"
           :data="loadData"
           :data="loadData"
           :scroll="{ x: 1340, y: 300 }"
           :scroll="{ x: 1340, y: 300 }"
+          :defaultLoadData="false"
           bordered>
           bordered>
           <!-- 产品分类 -->
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
           <template slot="productType" slot-scope="text, record">
@@ -183,6 +184,7 @@
           :columns="chooseColumns"
           :columns="chooseColumns"
           :data="chooseLoadData"
           :data="chooseLoadData"
           :scroll="{ x: 1420, y: 300 }"
           :scroll="{ x: 1420, y: 300 }"
+          :defaultLoadData="false"
           bordered>
           bordered>
           <!-- 产品分类 -->
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
           <template slot="productType" slot-scope="text, record">
@@ -607,16 +609,22 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.getDetail()
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.getDetail()
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.resetSearchForm()
-        vm.chooseResetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 6
src/views/inventoryManagement/inventoryImport/list.vue

@@ -206,17 +206,17 @@ export default {
       document.body.appendChild(link)
       document.body.appendChild(link)
       link.click()
       link.click()
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 400
       this.tableHeight = window.innerHeight - tableSearchH - 400
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -225,9 +225,16 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },

+ 15 - 11
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -89,6 +89,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1340, y: tableHeight }"
         :scroll="{ x: 1340, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 产品分类 -->
         <!-- 产品分类 -->
         <template slot="productTypeName" slot-scope="text, record">
         <template slot="productTypeName" slot-scope="text, record">
@@ -334,17 +335,17 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
       )
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230
       this.tableHeight = window.innerHeight - tableSearchH - 230
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -353,18 +354,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 21 - 12
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -80,6 +80,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1760, y: tableHeight }"
         :scroll="{ x: 1760, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 数量 -->
         <!-- 数量 -->
         <template slot="qty" slot-scope="text, record">
         <template slot="qty" slot-scope="text, record">
@@ -196,17 +197,19 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getWarehouseList()
+      this.resetSearchForm()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 285
       this.tableHeight = window.innerHeight - tableSearchH - 285
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -215,13 +218,19 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getWarehouseList()
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

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

@@ -104,6 +104,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1490, y: tableHeight }"
         :scroll="{ x: 1490, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 产品分类 -->
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
         <template slot="productType" slot-scope="text, record">
@@ -423,17 +424,19 @@ export default {
       document.body.appendChild(link)
       document.body.appendChild(link)
       link.click()
       link.click()
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getProductType()
+      this.getProductBrand()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -442,20 +445,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getProductType()
-      vm.getProductBrand()
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 9
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -185,29 +185,32 @@ export default {
     closeModal () {
     closeModal () {
       this.openModal = false
       this.openModal = false
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 11
src/views/inventoryManagement/warehouse/list.vue

@@ -31,6 +31,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
@@ -153,29 +154,32 @@ export default {
     goStoringLocation (row) {
     goStoringLocation (row) {
       this.$router.push({ path: `/inventoryManagement/storingLocation/${row.warehouseSn}`, query: { name: row.name } })
       this.$router.push({ path: `/inventoryManagement/storingLocation/${row.warehouseSn}`, query: { name: row.name } })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 11
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -39,6 +39,7 @@
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
           :scroll="{ y: tableHeight }"
           :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
           bordered>
           bordered>
           <!-- 操作 -->
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
           <template slot="action" slot-scope="text, record">
@@ -164,29 +165,32 @@ export default {
     handleBack () {
     handleBack () {
       this.$router.push({ path: '/inventoryManagement/warehouse/list', query: { closeLastOldTab: true } })
       this.$router.push({ path: '/inventoryManagement/warehouse/list', query: { closeLastOldTab: true } })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 290
       this.tableHeight = window.innerHeight - tableSearchH - 290
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   },
   activated () {
   activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 8
src/views/notice/list.vue

@@ -196,28 +196,33 @@ export default {
       this.itemId = ''
       this.itemId = ''
       this.openModal = false
       this.openModal = false
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.openModal = false
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 210
       this.tableHeight = window.innerHeight - tableSearchH - 210
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      vm.handelSearch(1)
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 11
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -61,6 +61,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
@@ -306,17 +307,17 @@ export default {
     onSelectChange (selectedRowKeys) {
     onSelectChange (selectedRowKeys) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRowKeys = selectedRowKeys
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -325,18 +326,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 18 - 4
src/views/power/role/roleList.vue

@@ -39,6 +39,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 启用禁用 -->
         <!-- 启用禁用 -->
         <span slot="status" slot-scope="text, record">
         <span slot="status" slot-scope="text, record">
@@ -216,16 +217,29 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.reset()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.reset()
+    }
   }
   }
 }
 }
 </script>
 </script>

+ 18 - 4
src/views/power/user/userList.vue

@@ -38,6 +38,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1200, y: tableHeight }"
         :scroll="{ x: 1200, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <span slot="status" slot-scope="text, record">
         <span slot="status" slot-scope="text, record">
           <a-switch v-if="$hasPermissions('B_powerMD_user_enable') && record.superAdmin!=1" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
           <a-switch v-if="$hasPermissions('B_powerMD_user_enable') && record.superAdmin!=1" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
@@ -221,16 +222,29 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.reset()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.reset()
+    }
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 14
src/views/productManagement/newProduct/detail.vue

@@ -21,7 +21,6 @@
             <a-descriptions-item label="商品尺寸:">{{ (detailsData && detailsData.size) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="商品尺寸:">{{ (detailsData && detailsData.size) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="重量:">{{ (detailsData && detailsData.weight) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="重量:">{{ (detailsData && detailsData.weight) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="计量单位:">{{ (detailsData && detailsData.unit) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="计量单位:">{{ (detailsData && detailsData.unit) || '--' }}</a-descriptions-item>
-            <!-- <a-descriptions-item label="适用车型:">{{ productTypeName || '--' }}</a-descriptions-item> -->
           </a-descriptions>
           </a-descriptions>
           <div class="productDetail">
           <div class="productDetail">
             <h4>产品介绍</h4>
             <h4>产品介绍</h4>
@@ -37,13 +36,6 @@
             <div slot="nextArrow" slot-scope="props" class="custom-slick-arrow" style="right: 10px"><a-icon type="right-circle" /></div>
             <div slot="nextArrow" slot-scope="props" class="custom-slick-arrow" style="right: 10px"><a-icon type="right-circle" /></div>
             <div><img :src="detailsData.productMsg" /></div>
             <div><img :src="detailsData.productMsg" /></div>
           </a-carousel>
           </a-carousel>
-          <!-- <div class="sycxImg">
-            <p>适用车型图片</p>
-            <div>
-              <img src="../../../assets/avatar2.jpg" />
-              <div>江陵凯瑞200</div>
-            </div>
-          </div> -->
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
@@ -82,14 +74,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.itemId = this.$route.params.sn
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.itemId = this.$route.params.sn
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.itemId = this.$route.params.sn
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.itemId = vm.$route.params.sn
-      vm.getDetail()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 16 - 11
src/views/productManagement/newProduct/list.vue

@@ -222,17 +222,19 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getProductBrand()
+      this.getProductType()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 215
       this.tableHeight = window.innerHeight - tableSearchH - 215
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -241,18 +243,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.$refs.table.refresh(true)
-      vm.getProductBrand()
-      vm.getProductType()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 18 - 11
src/views/productManagement/priceChangeRecord/list.vue

@@ -77,6 +77,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ x: 1760, y: tableHeight }"
       :scroll="{ x: 1760, y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       bordered>
       <!-- 产品分类 -->
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">
       <template slot="productType" slot-scope="text, record">
@@ -316,17 +317,20 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getColumns()
+      this.getProductBrand()
+      this.getProductType()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 233
       this.tableHeight = window.innerHeight - tableSearchH - 233
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -335,18 +339,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getColumns()
-      vm.getProductBrand()
-      vm.getProductType()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 9
src/views/productManagement/productBrand/list.vue

@@ -25,7 +25,6 @@
       <!-- 操作按钮 -->
       <!-- 操作按钮 -->
       <div class="table-operator">
       <div class="table-operator">
         <a-button v-if="$hasPermissions('B_product_dealerProductBrand_add')" id="productBrandList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
         <a-button v-if="$hasPermissions('B_product_dealerProductBrand_add')" id="productBrandList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
-        <!-- <a-button id="productBrandList-import" @click="handleImport">导入品牌</a-button> -->
       </div>
       </div>
       <!-- 列表 -->
       <!-- 列表 -->
       <s-table
       <s-table
@@ -37,6 +36,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+		:defaultLoadData="false"
         bordered>
         bordered>
         <!-- 状态 -->
         <!-- 状态 -->
         <template slot="enabledFlag" slot-scope="text, record">
         <template slot="enabledFlag" slot-scope="text, record">
@@ -152,24 +152,29 @@ export default {
         }
         }
       })
       })
     },
     },
-    //  导入
-    handleImport () {},
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
-  },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 6
src/views/productManagement/productCategory/list.vue

@@ -16,6 +16,7 @@
         :showPagination="false"
         :showPagination="false"
         :defaultExpandedRowKeys="defaultExpandedRowKeys"
         :defaultExpandedRowKeys="defaultExpandedRowKeys"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
@@ -94,12 +95,6 @@ export default {
       nowData: null //  当前记录数据
       nowData: null //  当前记录数据
     }
     }
   },
   },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.$refs.table.refresh(true)
-    }
-  },
   methods: {
   methods: {
     //  新增子级
     //  新增子级
     handleAdd (row) {
     handleAdd (row) {
@@ -164,6 +159,17 @@ export default {
         })
         })
       }
       }
     }
     }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.$refs.table.refresh(true)
+    }
   }
   }
 }
 }
 </script>
 </script>

+ 10 - 4
src/views/productManagement/productInfo/edit.vue

@@ -306,12 +306,18 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 17 - 13
src/views/productManagement/productInfo/list.vue

@@ -88,6 +88,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1300, y: tableHeight }"
         :scroll="{ x: 1300, y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 产品分类 -->
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
         <template slot="productType" slot-scope="text, record">
@@ -320,17 +321,19 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getProductBrand()
+      this.getProductType()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -339,20 +342,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getProductBrand()
-      vm.getProductType()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 18 - 14
src/views/productManagement/productInfoJg/list.vue

@@ -82,6 +82,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ x: 1540, y: tableHeight }"
       :scroll="{ x: 1540, y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       bordered>
       <!-- 产品图片 -->
       <!-- 产品图片 -->
       <template slot="imageUrl" slot-scope="text, record">
       <template slot="imageUrl" slot-scope="text, record">
@@ -274,18 +275,20 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getColumns()
+      this.getProductBrand()
+      this.getProductType()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-    this.getColumns()
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -294,20 +297,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getProductBrand()
-      vm.getProductType()
-      if (!vm.disabled) {
-        vm.getColumns()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 2 - 6
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :maskClosable="false"
     title="新增采购单"
     title="新增采购单"
     v-model="isShow"
     v-model="isShow"
-    @cancel="cancel"
+    @cancel="isShow=false"
     :width="800">
     :width="800">
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
       <a-form-model
@@ -38,7 +38,7 @@
         </a-form-model-item>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
           <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
           <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
         </a-form-model-item>
       </a-form-model>
       </a-form-model>
     </a-spin>
     </a-spin>
@@ -152,10 +152,6 @@ export default {
         }
         }
       })
       })
     },
     },
-    // 取消
-    cancel () {
-      this.$emit('cancel')
-    },
     //  选择地址
     //  选择地址
     handleChoose () {
     handleChoose () {
       this.openAddrModal = true
       this.openAddrModal = true

+ 15 - 9
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -31,14 +31,14 @@
             id="purchaseOrderDetail-export-btn"
             id="purchaseOrderDetail-export-btn"
             :disabled="localDataSource.length==0"
             :disabled="localDataSource.length==0"
             @click="handlePrint('export')">导出Excel</a-button>
             @click="handlePrint('export')">导出Excel</a-button>
-          <a-button
+          <!-- <a-button
             key="1"
             key="1"
             v-if="$hasPermissions('B_purchaseExportProduct') && (detail&&detail.billStatus=='FINISH')"
             v-if="$hasPermissions('B_purchaseExportProduct') && (detail&&detail.billStatus=='FINISH')"
             type="primary"
             type="primary"
             class="button-info"
             class="button-info"
             id="purchaseOrderDetail-export-btn"
             id="purchaseOrderDetail-export-btn"
             :disabled="localDataSource.length==0"
             :disabled="localDataSource.length==0"
-            @click="handlePrint('exportProduct')">导出产品</a-button>
+            @click="handlePrint('exportProduct')">导出产品</a-button> -->
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <!-- 基础信息 -->
       <!-- 基础信息 -->
@@ -87,6 +87,7 @@
               :rowKey="(record) => record.id"
               :rowKey="(record) => record.id"
               :columns="columns"
               :columns="columns"
               :data="loadData"
               :data="loadData"
+              :defaultLoadData="false"
               bordered>
               bordered>
               <!-- 采购数量 -->
               <!-- 采购数量 -->
               <template slot="origqty" slot-scope="text, record">
               <template slot="origqty" slot-scope="text, record">
@@ -281,15 +282,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 10
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -573,21 +573,26 @@ export default {
     //  返回列表
     //  返回列表
     handleBack () {
     handleBack () {
       this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
       this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
+    },
+    pageInit () {
+      this.getOrderDetail()
+      this.resetPurchaseForm()
+      this.resetSearchForm()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getOrderDetail()
-    this.resetPurchaseForm()
-    this.resetSearchForm()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getOrderDetail()
-        vm.resetPurchaseForm()
-        vm.resetSearchForm()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 18 - 14
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -98,6 +98,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 采购单号 -->
         <!-- 采购单号 -->
         <template slot="purchaseBillNo" slot-scope="text, record">
         <template slot="purchaseBillNo" slot-scope="text, record">
@@ -132,7 +133,7 @@
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>
     <!-- 选择基本信息弹框 -->
     <!-- 选择基本信息弹框 -->
-    <basic-info-modal :openModal="openModal" @ok="handleOk" @cancel="openModal=false" />
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </a-card>
   </a-card>
 </template>
 </template>
 
 
@@ -291,17 +292,19 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.openModal = false
+      this.getSupperList()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 275
       this.tableHeight = window.innerHeight - tableSearchH - 275
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -310,20 +313,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.openModal = false
-      vm.getSupperList()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 8
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -275,19 +275,25 @@ export default {
           this.spinning = false
           this.spinning = false
         }
         }
       })
       })
+    },
+    pageInit () {
+      this.getDetail()
+      this.getWarehouseCascade()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
-    this.getWarehouseCascade()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.spinning) {
-        vm.getDetail()
-        vm.getWarehouseCascade()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 12
src/views/purchasingManagement/purchaseReturn/detail.vue

@@ -12,11 +12,6 @@
           id="purchaseReturnDetail-edit-btn"
           id="purchaseReturnDetail-edit-btn"
           @click.stop="handleEdit">编辑</a-button>
           @click.stop="handleEdit">编辑</a-button>
       </template>
       </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="purchaseReturnDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="purchaseReturnDetail-print-btn">快速打印</a-button>
-      </template> -->
     </a-page-header>
     </a-page-header>
     <!-- 基础信息 -->
     <!-- 基础信息 -->
     <a-card size="small" :bordered="false" class="purchaseReturnDetail-cont">
     <a-card size="small" :bordered="false" class="purchaseReturnDetail-cont">
@@ -46,6 +41,7 @@
             :rowKey="(record) => record.id"
             :rowKey="(record) => record.id"
             :columns="columns"
             :columns="columns"
             :data="loadData"
             :data="loadData"
+            :defaultLoadData="false"
             bordered>
             bordered>
           </s-table>
           </s-table>
         </a-collapse-panel>
         </a-collapse-panel>
@@ -126,15 +122,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新 或 为弹框时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 9
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -84,7 +84,6 @@
           <a-collapse-panel key="1">
           <a-collapse-panel key="1">
             <template slot="header">
             <template slot="header">
               已选产品
               已选产品
-              <!-- <a-button size="small" class="import-btn" id="purchaseReturnEdit-import-btn" @click.stop="handleImport">导入明细</a-button> -->
               <a-button
               <a-button
                 size="small"
                 size="small"
                 type="primary"
                 type="primary"
@@ -359,16 +358,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.$refs.chooseTable.refresh()
-    this.resetSearchForm()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.chooseTable.refresh(true)
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.chooseTable.refresh(true)
+      this.resetSearchForm()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.resetSearchForm()
-        vm.$refs.chooseTable.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 16 - 12
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -65,6 +65,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 采退单号 -->
         <!-- 采退单号 -->
         <template slot="purchaseReturnNo" slot-scope="text, record">
         <template slot="purchaseReturnNo" slot-scope="text, record">
@@ -257,17 +258,18 @@ export default {
         }
         }
       })
       })
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getParentDealer()
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235
       this.tableHeight = window.innerHeight - tableSearchH - 235
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -276,19 +278,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getParentDealer()
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 5
src/views/reportData/chainCustomerReport/list.vue

@@ -316,20 +316,28 @@ export default {
           this.linkageGroupData = []
           this.linkageGroupData = []
         }
         }
       })
       })
+    },
+    pageInit () {
+      this.getLinkageGroup()
+      this.getArea('province')
+      this.getProductType()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getLinkageGroup()
-      vm.getArea('province')
-      vm.getProductType()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 5
src/views/reportData/chainReceivedSendStorageReport/list.vue

@@ -300,20 +300,28 @@ export default {
           this.linkageGroupData = []
           this.linkageGroupData = []
         }
         }
       })
       })
+    },
+    pageInit () {
+      this.getLinkageGroup()
+      this.getProductBrand()
+      this.getProductType()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getLinkageGroup()
-      vm.getProductBrand()
-      vm.getProductType()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 17 - 9
src/views/reportData/chainSalesDetailReport/list.vue

@@ -475,24 +475,32 @@ export default {
           }
           }
         }
         }
       })
       })
+    },
+    pageInit () {
+      this.getLinkageGroup()
+      this.getArea('province')
+      this.getCustTypeList()
+      this.getSettleStyleList()
+      this.getProductBrand()
+      this.getProductType()
+      this.getWarehouseCascade()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getLinkageGroup()
-      vm.getArea('province')
-      vm.getCustTypeList()
-      vm.getSettleStyleList()
-      vm.getProductBrand()
-      vm.getProductType()
-      vm.getWarehouseCascade()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 6
src/views/reportData/chainSalesReport/list.vue

@@ -340,21 +340,29 @@ export default {
           }
           }
         }
         }
       })
       })
+    },
+    pageInit () {
+      this.getLinkageGroup()
+      this.getArea('province')
+      this.getCustTypeList()
+      this.getSettleStyleList()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getLinkageGroup()
-      vm.getArea('province')
-      vm.getCustTypeList()
-      vm.getSettleStyleList()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 5
src/views/reportData/chainStockReport/list.vue

@@ -301,20 +301,28 @@ export default {
           this.linkageGroupData = []
           this.linkageGroupData = []
         }
         }
       })
       })
+    },
+    pageInit () {
+      this.getLinkageGroup()
+      this.getProductBrand()
+      this.getProductType()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getLinkageGroup()
-      vm.getProductBrand()
-      vm.getProductType()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 4
src/views/reportData/customerReport/list.vue

@@ -287,19 +287,27 @@ export default {
           }
           }
         }
         }
       })
       })
+    },
+    pageInit () {
+      this.getArea('province')
+      this.getProductType()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getArea('province')
-      vm.getProductType()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 4
src/views/reportData/receivedSendStorageReport/list.vue

@@ -267,19 +267,27 @@ export default {
       return (
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
       )
+    },
+    pageInit () {
+      this.getProductBrand()
+      this.getProductType()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getProductBrand()
-      vm.getProductType()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 7
src/views/reportData/stockExpenditureReport/list.vue

@@ -260,25 +260,30 @@ export default {
       this.tableData = []
       this.tableData = []
       this.totalData = null
       this.totalData = null
       this.chartInit()
       this.chartInit()
+    },
+    pageInit () {
+      window.onresize = () => {
+        return (() => {
+          this.chart1.resize()
+        })()
+      }
     }
     }
   },
   },
   mounted () {
   mounted () {
-    window.onresize = () => {
-      return (() => {
-        this.chart1.resize()
-      })()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.chartInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 7
src/views/reportData/stockIncomeReport/list.vue

@@ -260,25 +260,30 @@ export default {
       this.tableData = []
       this.tableData = []
       this.totalData = null
       this.totalData = null
       this.chartInit()
       this.chartInit()
+    },
+    pageInit () {
+      window.onresize = () => {
+        return (() => {
+          this.chart1.resize()
+        })()
+      }
     }
     }
   },
   },
   mounted () {
   mounted () {
-    window.onresize = () => {
-      return (() => {
-        this.chart1.resize()
-      })()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
     }
     }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.chartInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 11
src/views/salesManagement/giftRecord/list.vue

@@ -52,6 +52,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ y: tableHeight }"
       :scroll="{ y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       bordered>
     </s-table>
     </s-table>
   </a-card>
   </a-card>
@@ -130,17 +131,17 @@ export default {
       }
       }
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -149,18 +150,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 0 - 132
src/views/salesManagement/quotation/basicInfoModal.vue

@@ -1,132 +0,0 @@
-<template>
-  <a-modal
-    centered
-    class="quotation-basicInfo-modal"
-    :footer="null"
-    :maskClosable="false"
-    title="选择客户"
-    v-model="isShow"
-    @cancle="isShow=false"
-    width="80%">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <a-form-model
-        id="quotation-basicInfo-form"
-        ref="ruleForm"
-        :model="form"
-        :rules="rules"
-        :label-col="formItemLayout.labelCol"
-        :wrapper-col="formItemLayout.wrapperCol" >
-        <a-form-model-item label="客户名称" prop="name" extra="(未搜索到客户时可直接录入,但客户信息不保存于客户资料)">
-          <a-auto-complete id="quotation-basicInfo-bundleName" allowClear v-model="form.name" placeholder="请输入客户名称">
-            <template slot="dataSource">
-              <a-select-option v-for="item in optData" :key="item">{{ item }}</a-select-option>
-            </template>
-          </a-auto-complete>
-        </a-form-model-item>
-        <a-form-model-item label="价格类型" prop="priceType">
-          <v-select code="PRICE_TYPE" id="quotation-basicInfo-priceType" v-model="form.priceType" allowClear placeholder="请选择价格类型" ></v-select>
-        </a-form-model-item>
-        <a-form-model-item label="电话" prop="phone">
-          <a-input id="quotation-basicInfo-bundleName" v-model="form.bundleName" allowClear :maxLength="30" placeholder="请输入电话(最多30个字符)"/>
-        </a-form-model-item>
-        <a-form-model-item label="联系人" prop="phone">
-          <a-input id="quotation-basicInfo-bundleName" v-model="form.bundleName" allowClear :maxLength="30" placeholder="请输入联系人(最多30个字符)"/>
-        </a-form-model-item>
-        <a-form-model-item label="备注" prop="phone">
-          <a-textarea id="quotation-basicInfo-bundleName" v-model="form.bundleName" allowClear :maxLength="120" placeholder="请输入备注(最多120个字符)"/>
-        </a-form-model-item>
-      </a-form-model>
-      <div class="btn-cont">
-        <a-button type="primary" id="quotation-basicInfo-modal-submit" @click="handleSubmit">提交</a-button>
-        <a-button id="quotation-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
-      </div>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { VSelect } from '@/components'
-  export default{
-    name: 'BasicInfoModal',
-    components: { VSelect },
-    props: {
-      openModal: { //  弹框显示状态
-        type: Boolean,
-        default: false
-      }
-    },
-    data(){
-      return{
-        spinning: false,
-        isShow: this.openModal, //  是否打开弹框
-        formItemLayout: {
-          labelCol: { span: 6 },
-          wrapperCol: { span: 16 }
-        },
-        form: {
-          name: '', // 仓库名称
-          priceType: undefined,  //  价格类型
-        },
-        rules: {
-          name: [
-            { required: true, message: '请输入客户名称', trigger: 'blur' }
-          ],
-          priceType: [
-            { required: true, message: '请选择价格类型', trigger: 'change' },
-          ],
-        },
-        optData: ['aa', 'bb', 'cc'],
-        dataSource: [
-          {name: '111', id:1},
-          {name: '222', id:2},
-          {name: '333', id:3},
-        ],
-      }
-    },
-    methods: {
-      //  提交
-      handleSubmit(){
-        const _this = this
-        // this.$refs.ruleForm.validate(valid => {
-        //   if (valid) {
-            _this.$emit('ok')
-            _this.isShow = false
-        //   } else {
-        //     console.log('error submit!!')
-        //     return false
-        //   }
-        // })
-      },
-      filterOption(input, option) {
-        console.log(input, option)
-      	return (
-      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      	)
-      },
-    },
-    watch: {
-      //  父页面传过来的弹框状态
-      openModal (newValue, oldValue) {
-        this.isShow = newValue
-      },
-      //  重定义的弹框状态
-      isShow (newValue, oldValue) {
-        if (!newValue) {
-          this.$emit('close')
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-  .quotation-basicInfo-modal{
-    .ant-modal-body {
-    	padding: 40px 40px 24px;
-    }
-    .btn-cont {
-    	text-align: center;
-    	margin: 35px 0 10px;
-    }
-  }
-</style>

+ 0 - 136
src/views/salesManagement/quotation/detail.vue

@@ -1,136 +0,0 @@
-<template>
-  <div class="quotationDetail-wrap">
-    <a-page-header :ghost="false" @back="handleBack" class="quotationDetail-back">
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="quotationDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
-      </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="3" type="danger" id="quotationDetail-export-btn">导出</a-button>
-        <a-button key="2" id="quotationDetail-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="quotationDetail-print-btn">快速打印</a-button>
-      </template> -->
-    </a-page-header>
-    <a-card size="small" :bordered="false" class="quotationDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="3">
-            <a-descriptions-item label="客户名称">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="客户地址">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="报价单号">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="联系电话">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="备注">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="业务员">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="制单人">箭冠营销中心</a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <a-card size="small" :bordered="false" class="quotationDetail-cont">
-      <!-- 总计 -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">总款数:<strong>1</strong>,总数量:<strong>1</strong>,总赠品数量:<strong>0</strong>,总售价:<strong>14</strong>,总成本:<strong>6.33</strong>,总毛利: <strong>6</strong></div>
-      </a-alert>
-      <!-- 列表 -->
-      <s-table
-        class="sTable"
-        ref="table"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ x: 1160 }"
-        bordered></s-table>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-export default {
-  components: { STable, VSelect },
-  data () {
-    return {
-      queryParam: {
-
-      },
-      disabled: false, //  查询、重置按钮是否可操作
-      brandData: [], //  产品品牌  下拉数据
-      typeData: [], //  产品类别  下拉数据
-      // 表头
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'producstOrigCode', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'costPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '销售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '售价小计', dataIndex: 'salePriceSubtotal', width: 100, align: 'center' }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-        //   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
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-            ],
-            count: 10
-          }
-          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
-          resolve(data)
-        })
-      }
-    }
-  },
-  methods: {
-    //  重置
-    resetSearchForm () {
-      this.queryParam.orderBundleNo = ''
-      this.queryParam.orderBundle.custMobile = ''
-      this.queryParam.bundleName = ''
-      this.queryParam.itemName = ''
-      this.oldTime = undefined
-      this.newTime = undefined
-      this.$refs.table.refresh(true)
-    },
-    //  提交
-    handleSubmit () {},
-    //  返回列表
-    handleBack () {
-      this.$router.push({ path: '/salesManagement/quotation/list', query: { closeLastOldTab: true } })
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .quotationDetail-wrap{
-    .quotationDetail-back{
-      margin-bottom: 10px;
-    }
-    .quotationDetail-cont{
-      margin-bottom: 10px;
-    }
-  }
-</style>

+ 0 - 370
src/views/salesManagement/quotation/edit.vue

@@ -1,370 +0,0 @@
-<template>
-  <div class="quotationEdit-wrap">
-    <!-- 内容 -->
-    <a-page-header :ghost="false" @back="handleBack" class="quotationEdit-cont">
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="quotationEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
-      </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <!-- <template slot="extra">
-        <a-button key="2" id="quotationEdit-preview-btn">打印预览</a-button>
-        <a-button key="1" type="primary" id="quotationEdit-print-btn">快速打印</a-button>
-      </template> -->
-    </a-page-header>
-    <!-- 基础信息 -->
-    <a-card size="small" :bordered="false" class="quotationEdit-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1">
-          <template slot="header">
-            基础信息
-            <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="quotationEdit-edit-circle-btn" @click.stop="handleEditInfo" />
-          </template>
-          <a-descriptions :column="3">
-            <a-descriptions-item label="客户名称">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="价格类型">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="电话">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="联系人">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="备注">箭冠营销中心</a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <!-- 选择产品 -->
-    <a-card size="small" :bordered="false" class="quotationEdit-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1">
-          <template slot="header">选择产品</template>
-          <!-- 选择产品 -->
-          <div>
-            <!-- 搜索条件 -->
-            <div class="table-page-search-wrapper">
-              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-                <a-row :gutter="15">
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="产品编码">
-                      <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码"/>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="产品名称">
-                      <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品名称"/>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="原厂编码">
-                      <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入原厂编码"/>
-                    </a-form-item>
-                  </a-col>
-                  <template v-if="advanced">
-                    <a-col :md="6" :sm="24">
-                      <a-form-item label="车架号(VIN)">
-                        <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入车架号(VIN)"/>
-                      </a-form-item>
-                    </a-col>
-                    <a-col :md="6" :sm="24">
-                      <a-form-item label="产品品牌">
-                        <a-select placeholder="请选择" id="quotationEdit-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
-                          <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
-                        </a-select>
-                      </a-form-item>
-                    </a-col>
-                    <a-col :md="6" :sm="24">
-                      <a-form-item label="产品类别">
-                        <a-cascader :options="typeData" expand-trigger="hover" id="quotationEdit-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
-                      </a-form-item>
-                    </a-col>
-                  </template>
-                  <a-col :md="6" :sm="24">
-                    <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="quotationEdit-refresh">查询</a-button>
-                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="quotationEdit-reset">重置</a-button>
-                    <a @click="advanced=!advanced" style="margin-left: 8px">
-                      {{ advanced ? '收起' : '展开' }}
-                      <a-icon :type="advanced ? 'up' : 'down'"/>
-                    </a>
-                  </a-col>
-                </a-row>
-              </a-form>
-            </div>
-            <!-- 列表 -->
-            <s-table
-              class="sTable"
-              ref="table"
-              size="small"
-              :rowKey="(record) => record.id"
-              :columns="columns"
-              :data="loadData"
-              bordered>
-              <!-- 采购数量 -->
-              <template slot="storageQuantity" slot-scope="text, record">
-                <a-input-number
-                  id="quotationEdit-storageQuantity"
-                  :value="record.storageQuantity"
-                  :precision="0"
-                  :min="0"
-                  :max="999999"
-                  placeholder="请输入" />
-              </template>
-              <!-- 操作 -->
-              <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleAdd(record)" id="quotationEdit-add-btn">添加</a-button>
-              </template>
-            </s-table>
-          </div>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <!-- 已选产品 -->
-    <a-card size="small" :bordered="false" class="quotationEdit-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1">
-          <template slot="header">已选产品</template>
-          <!-- 已选产品 -->
-          <div>
-            <!-- 总计 -->
-            <a-alert type="info" style="margin-bottom:10px">
-              <div slot="message">总售价:<strong>6</strong> ,总款数:<strong>6</strong> ,总数量:<strong>6.33</strong></div>
-            </a-alert>
-            <!-- 搜索条件 -->
-            <div class="table-page-search-wrapper">
-              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-                <a-row :gutter="15">
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="产品编码">
-                      <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码"/>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="产品名称">
-                      <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品名称"/>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="quotationEdit-refresh">查询</a-button>
-                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="quotationEdit-reset">重置</a-button>
-                  </a-col>
-                </a-row>
-              </a-form>
-            </div>
-            <!-- 列表 -->
-            <s-table
-              class="sTable"
-              ref="table"
-              size="small"
-              :rowKey="(record) => record.id"
-              :columns="chooseColumns"
-              :data="chooseLoadData"
-              bordered>
-              <!-- 销售价 -->
-              <template slot="mementPay" slot-scope="text, record">
-                <a-input-number
-                  id="quotationEdit-mementPay"
-                  :value="record.mementPay"
-                  :precision="0"
-                  :min="0"
-                  :max="999999"
-                  placeholder="请输入" />
-              </template>
-              <!-- 销售数量 -->
-              <template slot="storageQuantity" slot-scope="text, record">
-                <a-input-number
-                  id="quotationEdit-storageQuantity"
-                  :value="record.storageQuantity"
-                  :precision="0"
-                  :min="0"
-                  :max="999999"
-                  placeholder="请输入" />
-              </template>
-              <!-- 操作 -->
-              <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleDel(record)" id="quotationEdit-del-btn">删除</a-button>
-              </template>
-            </s-table>
-          </div>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="danger" id="quotationEdit-transfer-order" size="large" @click="handleTransferOrder" style="padding: 0 60px;margin: 0 30px;">转销售单</a-button>
-        <a-button type="primary" id="quotationEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;margin: 0 30px;">提交</a-button>
-      </div>
-    </a-affix>
-    <!-- 选择基本信息弹框 -->
-    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
-  </div>
-</template>
-
-<script>
-  import { STable, VSelect } from '@/components'
-  import basicInfoModal from './basicInfoModal.vue'
-  export default{
-    components: { STable, VSelect, basicInfoModal },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        advanced: false,  //  高级搜索 展开/关闭
-        disabled: false, //  查询、重置按钮是否可操作
-        // 表头
-        columns: [
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', sorter: true },
-          { title: '产品名称', dataIndex: 'custName', align: 'center' },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
-          { title: '产品级别', dataIndex: 'custsName', align: 'center' },
-          { title: '品牌', dataIndex: 'totalNums', align: 'center', sorter: true },
-          { title: '单位', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '成本价(¥)', dataIndex: 'mementPay', align: 'center' },
-          { title: '销售指导价(¥)', dataIndex: 'storageQuantity', align: 'center' },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   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
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            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
-            resolve(data)
-          })
-        },
-        // 表头
-        chooseColumns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDaite', align: 'center', sorter: true },
-          { title: '产品名称', dataIndex: 'custNayme', align: 'center' },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
-          { title: '品牌', dataIndex: 'totalNums', align: 'center', sorter: true },
-          { title: '销售价', scopedSlots: { customRender: 'mementPay' }, align: 'center' },
-          { title: '销售数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
-          { title: '单位', dataIndex: 'custsNakme', align: 'center' },
-          { title: '售价小计', dataIndex: 'custssNakme', align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥'+text : '--') } },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        chooseLoadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   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
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            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
-            resolve(data)
-          })
-        },
-        openModal: false, // 选择基本信息弹框是否显示
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  转销售单
-      handleTransferOrder(){},
-      //  提交
-      handleSubmit(){},
-      //  添加
-      handleAdd(row){},
-      //  删除
-      handleDel(row){},
-      //  编辑基本信息
-      handleEditInfo(){
-        this.openModal = true
-      },
-      //  基本信息  保存
-      handleOk(){
-        
-      },
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/salesManagement/quotation/list', query: { closeLastOldTab: true }})
-      },
-      //  编辑客户名称
-      handleEditCustom(){},
-      filterOption(input, option) {
-      	return (
-      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      	)
-      },
-    },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-        vm.openModal = false
-      })
-    }
-  }
-</script>
-
-<style lang="less">
-  .quotationEdit-wrap{
-    .quotationEdit-cont{
-      margin-bottom: 10px;
-      .sub-title{
-        font-size: 12px;
-        color: #808695;
-        margin-left: 10px;
-      }
-      .tag-txt{
-        font-size: 12px;
-        color: #ed1c24;
-      }
-      .edit-circle-btn{
-        margin-left: 15px;
-        i{
-          vertical-align: text-bottom;
-        }
-      }
-      .import-btn{
-        margin-left: 15px;
-      }
-    }
-  }
-</style>

+ 0 - 209
src/views/salesManagement/quotation/list.vue

@@ -1,209 +0,0 @@
-<template>
-  <a-card size="small" :bordered="false" class="quotationList-wrap">
-    <!-- 搜索条件 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="创建时间">
-              <rangeDate ref="rangeDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称">
-              <a-select
-                id="quotationList-bundleName"
-                placeholder="请选择"
-                allowClear
-                v-model="queryParam.dataSourceNo"
-                :showSearch="true"
-                option-filter-prop="children"
-                :filter-option="filterOption">
-                <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="关联销售单号">
-              <a-input id="quotationList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入关联销售单号"/>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="报价单号">
-                <a-input id="quotationList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入报价单号"/>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="quotationList-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="quotationList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 操作按钮 -->
-    <div class="table-operator">
-      <a-button id="quotationList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
-    </div>
-    <!-- 列表 -->
-    <s-table
-      class="sTable"
-      ref="table"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ x: 1310 }"
-      bordered>
-      <!-- 是否转销售单 -->
-      <template slot="invenstoryNum" slot-scope="text, record">
-        <span>{{ record.invenstoryNum == 1 ? '是' : '否' }}</span>
-      </template>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="quotationList-edit-btn">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDetail(record)" id="quotationList-detail-btn">详情</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="quotationList-del-btn">删除</a-button>
-      </template>
-    </s-table>
-    <!-- 选择基本信息弹框 -->
-    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
-  </a-card>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import rangeDate from '@/views/common/rangeDate.vue'
-import basicInfoModal from './basicInfoModal.vue'
-export default {
-  components: { STable, VSelect, basicInfoModal, rangeDate },
-  data () {
-    return {
-      advanced: true, // 高级搜索 展开/关闭
-      queryParam: { //  查询条件
-        beginDate: '',
-        endDate: '',
-        bundleName: '', //  供应商名称
-        state: undefined //  状态
-      },
-      disabled: false, //  查询、重置按钮是否可操作
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'inventoryMoney', width: 160, align: 'center' },
-        { title: '报价单号', dataIndex: 'inventosryMoney', width: 140, align: 'center' },
-        { title: '关联销售单号', dataIndex: 'productType', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productBrand', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'psroductBrand', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总价格', dataIndex: 'invdentoryNum', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '是否转销售单', scopedSlots: { customRender: 'invenstoryNum' }, width: 120, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-        //   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
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
-            ]
-          }
-          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
-          resolve(data)
-        })
-      },
-      brandData: [],
-      openModal: false // 基本信息弹框是否显示
-    }
-  },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.resetSearchForm()
-    }
-  },
-  methods: {
-    //  时间  change
-    dateChange (date) {
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
-    },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
-    //  重置
-    resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
-      this.queryParam.orderBundleNo = ''
-      this.queryParam.orderBundle.custMobile = ''
-      this.queryParam.bundleName = ''
-      this.queryParam.itemName = ''
-      this.oldTime = undefined
-      this.newTime = undefined
-      this.$refs.table.refresh(true)
-    },
-    //  基本信息  保存
-    handleOk () {
-      this.$router.push({ path: `/salesManagement/quotation/add` })
-    },
-    //  新增
-    handleAdd () {
-      this.openModal = true
-    },
-    //  编辑
-    handleEdit (row) {
-      this.$router.push({ path: `/salesManagement/quotation/edit/${row.id}` })
-    },
-    //  详情
-    handleDetail (row) {
-      this.$router.push({ path: `/salesManagement/quotation/detail/${row.id}` })
-    },
-    //  删除
-    handleDel (row) {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '删除后不可恢复,确定要进行删除吗?',
-        centered: true,
-        onOk () {
-          // warehouseDel({
-          //   id: row.id
-          // }).then(res => {
-          //   if (res.status == 200) {
-          //     _this.$message.success(res.message)
-          //     _this.$refs.table.refresh()
-          //   }
-          // })
-        }
-      })
-    }
-  }
-}
-</script>

+ 13 - 7
src/views/salesManagement/salesQuery/detail.vue

@@ -82,6 +82,7 @@
           :rowKey="(record) => record.id"
           :rowKey="(record) => record.id"
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
+          :defaultLoadData="false"
           bordered>
           bordered>
         </s-table>
         </s-table>
       </a-card>
       </a-card>
@@ -261,15 +262,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新 或 为弹框时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 11 - 9
src/views/salesManagement/salesQuery/edit.vue

@@ -284,7 +284,6 @@ export default {
       }).then(res => {
       }).then(res => {
         this.resetSearchForm(true)
         this.resetSearchForm(true)
         if (res.status == 200) {
         if (res.status == 200) {
-          // this.$refs.partQuery.resetCurForm()
           this.$refs.partQuery.pageInit()
           this.$refs.partQuery.pageInit()
           this.$message.info(res.message)
           this.$message.info(res.message)
         }
         }
@@ -527,7 +526,6 @@ export default {
       }).then(res => {
       }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.resetSearchForm(true)
           this.resetSearchForm(true)
-          // this.$refs.partQuery.resetCurForm()
           this.$message.success('产品添加成功', 2.5)
           this.$message.success('产品添加成功', 2.5)
           this.$refs.partQuery.pageInit()
           this.$refs.partQuery.pageInit()
         }
         }
@@ -565,18 +563,22 @@ export default {
       vm.orderId = vm.$route.params.id
       vm.orderId = vm.$route.params.id
       vm.salesBillSn = vm.$route.params.sn
       vm.salesBillSn = vm.$route.params.sn
       vm.getOrderDetail()
       vm.getOrderDetail()
-      if (!vm.disabled) {
-        vm.resetForm()
-      }
+      vm.$refs.table.refresh(true)
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 14 - 11
src/views/salesManagement/salesQuery/list.vue

@@ -102,6 +102,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y:tableHeight }"
         :scroll="{ y:tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 销售单号 -->
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
         <template slot="salesBillNo" slot-scope="text, record">
@@ -415,14 +416,20 @@ export default {
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 265
       this.tableHeight = window.innerHeight - tableSearchH - 265
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      _this.getSettleStyle()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-    _this.getSettleStyle()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
@@ -435,16 +442,12 @@ export default {
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getSettleStyle()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 7
src/views/salesManagement/salesReturn/detail.vue

@@ -65,6 +65,7 @@
           :rowKey="(record) => record.id"
           :rowKey="(record) => record.id"
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
+          :defaultLoadData="false"
           bordered>
           bordered>
         </s-table>
         </s-table>
       </a-card>
       </a-card>
@@ -212,15 +213,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 15 - 11
src/views/salesManagement/salesReturn/list.vue

@@ -74,6 +74,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 单号 -->
         <!-- 单号 -->
         <template slot="salesReturnNo" slot-scope="text, record">
         <template slot="salesReturnNo" slot-scope="text, record">
@@ -266,17 +267,17 @@ export default {
     custChange (obj) {
     custChange (obj) {
       this.queryParam.buyerSn = obj.key || undefined
       this.queryParam.buyerSn = obj.key || undefined
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 270
       this.tableHeight = window.innerHeight - tableSearchH - 270
     }
     }
   },
   },
-  mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
-  },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
       const _this = this
       const _this = this
@@ -285,18 +286,21 @@ export default {
       }, 400)
       }, 400)
     }
     }
   },
   },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 11 - 7
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -555,18 +555,22 @@ export default {
       this.buyerSn = this.$route.params.buyerSn
       this.buyerSn = this.$route.params.buyerSn
       this.getOrderDetail()
       this.getOrderDetail()
       this.getWarehouseCascade()
       this.getWarehouseCascade()
-      if (!this.disabled) {
-        this.resetForm()
-      }
+      this.resetForm()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 9
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -541,20 +541,24 @@ export default {
       this.orderId = this.$route.params.id
       this.orderId = this.$route.params.id
       this.orderSn = this.$route.params.sn
       this.orderSn = this.$route.params.sn
       this.buyerSn = this.$route.params.buyerSn
       this.buyerSn = this.$route.params.buyerSn
-      if (!this.disabled) {
-        this.getOrderDetail()
-        this.getWarehouseCascade()
-        this.resetForm()
-      }
+      this.getOrderDetail()
+      this.getWarehouseCascade()
+      this.resetForm()
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.pageInit()
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.pageInit()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.pageInit()
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 9
src/views/salesManagement/salesman/list.vue

@@ -45,6 +45,7 @@
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
       :scroll="{ y: tableHeight }"
       :scroll="{ y: tableHeight }"
+      :defaultLoadData="false"
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
@@ -179,6 +180,12 @@ export default {
       this.openModal = false
       this.openModal = false
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 245
       this.tableHeight = window.innerHeight - tableSearchH - 245
@@ -193,23 +200,20 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   },
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 20
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -7,11 +7,6 @@
         <template slot="subTitle" v-if="!outBizSn">
         <template slot="subTitle" v-if="!outBizSn">
           <a id="urgentItemsOffsetDetail-btn-back" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a id="urgentItemsOffsetDetail-btn-back" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         </template>
         </template>
-        <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
-          <!-- <a-button key="2" @click="handlePreview" id="urgentItemsOffsetDetail-btn-preview">打印预览</a-button>
-          <a-button key="1" type="primary" @click="handlePrint" id="urgentItemsOffsetDetail-btn-print">快速打印</a-button> -->
-        </template>
       </a-page-header>
       </a-page-header>
       <!-- 急件单信息 -->
       <!-- 急件单信息 -->
       <a-card size="small" :bordered="false" class="urgentItemsOffsetDetail-info-wrapper">
       <a-card size="small" :bordered="false" class="urgentItemsOffsetDetail-info-wrapper">
@@ -52,6 +47,7 @@
           :rowKey="(record) => record.id"
           :rowKey="(record) => record.id"
           :columns="isWriteDown ? columns : unColumns"
           :columns="isWriteDown ? columns : unColumns"
           :data="loadData"
           :data="loadData"
+          :defaultLoadData="false"
           bordered>
           bordered>
           <!-- 库存数量 -->
           <!-- 库存数量 -->
           <template slot="inventoryQuantity" slot-scope="text, record">
           <template slot="inventoryQuantity" slot-scope="text, record">
@@ -169,26 +165,23 @@ export default {
           })
           })
         }
         }
       })
       })
-    },
-    //  快速打印
-    handlePrint () {
-
-    },
-    //  打印预览
-    handlePreview () {
-
     }
     }
   },
   },
   mounted () {
   mounted () {
-    this.getDetail()
+    if (!this.$store.state.app.isNewTab || this.outBizSn) { // 页签刷新 或 为弹框时调用
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
+  },
+  activated () {
+    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh(true)
+      this.getDetail()
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.getDetail()
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

+ 13 - 9
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -59,6 +59,7 @@
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
         bordered>
         bordered>
         <!-- 单号 -->
         <!-- 单号 -->
         <template slot="urgentBillNo" slot-scope="text, record">
         <template slot="urgentBillNo" slot-scope="text, record">
@@ -145,16 +146,22 @@ export default {
     custChange (obj) {
     custChange (obj) {
       this.queryParam.buyerSn = obj.key || undefined
       this.queryParam.buyerSn = obj.key || undefined
     },
     },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     setTableH () {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 195
       this.tableHeight = window.innerHeight - tableSearchH - 195
     }
     }
   },
   },
   mounted () {
   mounted () {
-    const _this = this
-    this.$nextTick(() => { // 页面渲染完成后的回调
-      _this.setTableH()
-    })
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
   },
   },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
@@ -167,15 +174,12 @@ export default {
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.pageInit()
       this.resetSearchForm()
       this.resetSearchForm()
     }
     }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (!vm.disabled) {
-        vm.$refs.table.refresh()
-      }
-    })
+    next(vm => {})
   }
   }
 }
 }
 </script>
 </script>

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