Browse Source

首页 导航指引

chenrui 3 years ago
parent
commit
982aa4e1c4
39 changed files with 53 additions and 49 deletions
  1. 5 2
      src/views/Home.vue
  2. 1 1
      src/views/allocationManagement/chainTransferIn/detail.vue
  3. 1 1
      src/views/allocationManagement/chainTransferIn/edit.vue
  4. 1 1
      src/views/allocationManagement/chainTransferOut/detail.vue
  5. 1 1
      src/views/allocationManagement/chainTransferOut/edit.vue
  6. 1 1
      src/views/allocationManagement/storeTransferOut/detail.vue
  7. 1 1
      src/views/allocationManagement/storeTransferOut/edit.vue
  8. 1 1
      src/views/allocationManagement/warehouseAllocation/detail.vue
  9. 1 1
      src/views/allocationManagement/warehouseAllocation/edit.vue
  10. 1 1
      src/views/bulkManagement/bulkReturnGoods/edit.vue
  11. 1 1
      src/views/bulkManagement/bulkReturnGoods/grabEdit.vue
  12. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  13. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  14. 1 1
      src/views/customerManagement/customerInfo/edit.vue
  15. 1 1
      src/views/financialManagement/companyCollectionPayment/detail.vue
  16. 1 1
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  17. 1 1
      src/views/financialManagement/companyReceivablePayable/detail.vue
  18. 1 1
      src/views/financialManagement/expenseManagement/edit.vue
  19. 1 1
      src/views/financialManagement/warehousingAudit/detail.vue
  20. 1 1
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  21. 1 1
      src/views/inventoryManagement/inventoryChecking/overall.vue
  22. 1 1
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  23. 1 1
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  24. 1 1
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  25. 1 1
      src/views/productManagement/newProduct/detail.vue
  26. 2 2
      src/views/productManagement/productInfo/edit.vue
  27. 1 1
      src/views/purchasingManagement/purchaseOrder/detail.vue
  28. 1 1
      src/views/purchasingManagement/purchaseOrder/edit.vue
  29. 1 1
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  30. 1 1
      src/views/purchasingManagement/purchaseReturn/detail.vue
  31. 1 1
      src/views/purchasingManagement/purchaseReturn/edit.vue
  32. 1 1
      src/views/salesManagement/salesQuery/detail.vue
  33. 1 1
      src/views/salesManagement/salesQuery/edit.vue
  34. 0 7
      src/views/salesManagement/salesQuery/list.vue
  35. 1 1
      src/views/salesManagement/salesReturn/detail.vue
  36. 11 3
      src/views/salesManagement/salesReturn/list.vue
  37. 1 1
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  38. 1 1
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  39. 1 1
      src/views/salesManagement/urgentItemsOffset/detail.vue

+ 5 - 2
src/views/Home.vue

@@ -238,6 +238,9 @@ export default {
               name: '退货审核',
               styleC: 'blue-color',
               url: '/salesManagement/salesReturn/list',
+              params: {
+              	state: 'WAIT_AUDIT'
+              },
               permission: 'M_salesReturnList',
               orderNum: 'salesReturnWaitAuditCount'
             }
@@ -594,7 +597,7 @@ export default {
     seeMore () {
       this.openNewProduct = false
       if (this.onlineFalg == '1') { // 上线
-        this.$router.push({ path: '/productManagement/productOnlineInfo/list', query: { closeLastOldTab: true } })
+        this.$router.push({ path: '/productManagement/productOnlineInfo/list' })
       } else { // 下线
         this.$router.push({ name: 'newProductList', params: { onlineFalg: this.onlineFalg } })
       }
@@ -621,7 +624,7 @@ export default {
     // 导航跳转
     goPage (data) {
     	if (data) {
-    		this.$router.push({ path: data.url, query: { closeLastOldTab: true, pageParams: data.params ? data.params : null } })
+    		this.$router.push({ path: data.url, query: { pageParams: data.params ? data.params : null } })
     	}
     },
     // 数据看板信息

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

@@ -114,7 +114,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/chainTransferIn/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/allocationManagement/chainTransferIn/list' })
     },
     // 基本信息
     getDetail () {

+ 1 - 1
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -229,7 +229,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/chainTransferIn/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/allocationManagement/chainTransferIn/list' })
     },
     //  产品分类  change
     changeProductType (val, opt) {

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

@@ -124,7 +124,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/chainTransferOut/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/allocationManagement/chainTransferOut/list' })
     },
     // 基本信息
     getDetail () {

+ 1 - 1
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -424,7 +424,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/chainTransferOut/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/allocationManagement/chainTransferOut/list' })
     },
     filterOption (input, option) {
       return (

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

@@ -119,7 +119,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/storeTransferOut/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/allocationManagement/storeTransferOut/list' })
     },
     // 打印预览/快捷打印
     handlePrint (type, printerType) {

+ 1 - 1
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -426,7 +426,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/storeTransferOut/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/allocationManagement/storeTransferOut/list' })
     },
     // 已选产品 调出数量  blur
     outQtyBlur (val, record) {

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

@@ -122,7 +122,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list' })
     },
     //  新增/编辑
     handleEdit () {

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -476,7 +476,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list' })
     },
     // 已选产品 调出数量  blur
     outQtyBlur (val, record) {

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

@@ -420,7 +420,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list' })
     },
     // 双击快速添加
     handleClickRow (record) {

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -413,7 +413,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list' })
     },
     //  导入明细
     handleImport () {

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

@@ -152,7 +152,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list' })
     },
     // 打印预览/快捷打印
     handlePrint (type, printerType) {

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

@@ -489,7 +489,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list' })
     },
     // 合计
     getDetailCount (params) {

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

@@ -261,7 +261,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/customerManagement/customerInfo/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/customerManagement/customerInfo/list' })
     },
     // 获取城市列表
     getCityList (val) {

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

@@ -107,7 +107,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/companyCollectionPayment/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/financialManagement/companyCollectionPayment/list' })
     },
     // 详情
     getDetail () {

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

@@ -300,7 +300,7 @@ export default {
     },
     // 返回列表
     handleBack () {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/list`, query: { closeLastOldTab: true } })
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/list` })
     },
     // 关闭
     handleClose () {

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

@@ -132,7 +132,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/companyReceivablePayable/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/financialManagement/companyReceivablePayable/list' })
     },
     // 合计
     getTotal (param) {

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

@@ -187,7 +187,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/expenseManagement/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/financialManagement/expenseManagement/list' })
     },
     pageInit () {
       const vm = this

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

@@ -105,7 +105,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/warehousingAudit/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/financialManagement/warehousingAudit/list' })
     },
     // 打印预览/快捷打印
     handlePrint (type, printerType) {

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

@@ -340,7 +340,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
     },
     // 查询基础信息
     getDetail () {

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

@@ -149,7 +149,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
     },
     // 查询基础信息
     getDetail () {

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

@@ -483,7 +483,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
     },
     // 查询基础信息
     getDetail () {

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

@@ -193,7 +193,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryQuery/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/inventoryManagement/inventoryQuery/list' })
     },
     // 仓库下拉数据
     getWarehouseList (type) {

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

@@ -166,7 +166,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/warehouse/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/inventoryManagement/warehouse/list' })
     },
     pageInit () {
       const _this = this

+ 1 - 1
src/views/productManagement/newProduct/detail.vue

@@ -90,7 +90,7 @@ export default {
     },
     // 返回
     goBack () {
-      this.$router.push({ path: this.prevPageInfo && this.prevPageInfo.path, query: { closeLastOldTab: true } })
+      this.$router.push({ path: this.prevPageInfo && this.prevPageInfo.path })
     }
   },
   mounted () {

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

@@ -268,7 +268,7 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               setTimeout(() => {
-                _this.$router.push({ path: '/productManagement/productInfo/list', query: { closeLastOldTab: true } })
+                _this.$router.push({ path: '/productManagement/productInfo/list' })
                 _this.spinning = false
               }, 1000)
             } else {
@@ -313,7 +313,7 @@ export default {
     },
     //  返回
     handleBack () {
-      this.$router.push({ path: '/productManagement/productInfo/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/productManagement/productInfo/list' })
     },
     //  产品品牌  列表
     getProductBrand (val) {

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

@@ -187,7 +187,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
     },
     //  详情
     getDetail () {

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

@@ -541,7 +541,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
     },
     pageInit () {
       this.getOrderDetail()

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

@@ -183,7 +183,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
     },
     filterOption (input, option) {
       return (

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

@@ -132,7 +132,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list' })
     },
     // 基本信息
     getDetail () {

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

@@ -366,7 +366,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list' })
     },
     // 已选产品 退货数量  blur
     qtyBlur (val, record) {

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

@@ -166,7 +166,7 @@ export default {
     },
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/salesQuery/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/salesManagement/salesQuery/list' })
     },
     // 编辑
     handleEdit () {

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -344,7 +344,7 @@ export default {
     },
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/salesQuery/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/salesManagement/salesQuery/list' })
     },
     // 打折
     salesDiscount () {

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

@@ -457,13 +457,6 @@ export default {
     if (this.$store.state.app.updateList) {
       this.pageInit()
       this.$refs.table.refresh()
-    } else {
-      if (this.$route.query.pageParams && !this.$store.state.app.isNewTab) {
-        this.resetData()
-      	this.queryParam.financialStatus = this.$route.query.pageParams.financialStatus
-        this.pageInit()
-        this.$refs.table.refresh(true)
-      }
     }
   },
   beforeRouteEnter (to, from, next) {

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

@@ -126,7 +126,7 @@ export default {
   methods: {
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/salesReturn/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/salesManagement/salesReturn/list' })
     },
     // 明细统计
     getQueryCount (params) {

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

@@ -259,6 +259,11 @@ export default {
       })
     },
     resetSearchForm () {
+      this.resetData()
+      this.$refs.table.refresh(true)
+    },
+    // 重置数据
+    resetData () {
       this.$refs.rangeDate.resetDate(this.time)
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
@@ -267,9 +272,8 @@ export default {
       this.queryParam.auditEndDate = ''
       this.queryParam.buyerSn = undefined
       this.queryParam.salesReturnNo = ''
-      this.queryParam.state = ''
+      this.queryParam.state = undefined
       this.$refs.custList.resetForm()
-      this.$refs.table.refresh(true)
     },
     // 客户 change
     custChange (obj) {
@@ -306,8 +310,12 @@ export default {
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
+      this.resetData()
+      if (this.$route.query.pageParams) {
+        this.queryParam.state = this.$route.query.pageParams.state
+      }
       this.pageInit()
-      this.resetSearchForm()
+      this.$refs.table.refresh(true)
     }
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -269,7 +269,7 @@ export default {
   methods: {
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/salesReturn/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/salesManagement/salesReturn/list' })
     },
     // 选择客户成功
     chooseCustomOk (data) {},

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -259,7 +259,7 @@ export default {
   methods: {
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/salesReturn/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/salesManagement/salesReturn/list' })
     },
     // 选择客户成功
     chooseCustomOk (data) {},

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

@@ -135,7 +135,7 @@ export default {
   methods: {
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/urgentItemsOffset/list', query: { closeLastOldTab: true } })
+      this.$router.push({ path: '/salesManagement/urgentItemsOffset/list' })
     },
     //  详情
     getDetail () {