Browse Source

首页 导航指引带条件 销售列表

chenrui 3 years ago
parent
commit
ce85c6eb20
2 changed files with 27 additions and 7 deletions
  1. 10 5
      src/views/Home.vue
  2. 17 2
      src/views/salesManagement/salesQuery/list.vue

+ 10 - 5
src/views/Home.vue

@@ -90,7 +90,7 @@
                     class="page-nav-badge"
                     class="page-nav-badge"
                     v-for="(unitItem, unitInd) in subItem"
                     v-for="(unitItem, unitInd) in subItem"
                     :key="unitInd"
                     :key="unitInd"
-                    @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem.url) : null"
+                    @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem) : null"
                     :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
                     :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
                     <div :class="['page-nav-item', unitItem.styleC]">
                     <div :class="['page-nav-item', unitItem.styleC]">
                       <div class="page-nav-n">
                       <div class="page-nav-n">
@@ -112,7 +112,7 @@
             <!-- 财务指引  start -->
             <!-- 财务指引  start -->
             <div class="page-nav-con" v-for="(item, index) in navFinancialList" :key="index">
             <div class="page-nav-con" v-for="(item, index) in navFinancialList" :key="index">
               <div class="page-nav-box" v-for="(subItem, subInd) in item" :key="subInd" style="width: 50%;">
               <div class="page-nav-box" v-for="(subItem, subInd) in item" :key="subInd" style="width: 50%;">
-                <div class="page-nav-badge" v-for="(unitItem, unitInd) in subItem" :key="unitInd" @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem.url) : null" :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
+                <div class="page-nav-badge" v-for="(unitItem, unitInd) in subItem" :key="unitInd" @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem) : null" :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
                   <div :class="['page-nav-item', unitItem.styleC]">
                   <div :class="['page-nav-item', unitItem.styleC]">
                     <div class="page-nav-n">
                     <div class="page-nav-n">
                       <img v-show="unitItem.icon" :src="unitItem.icon" width="16" height="16" />
                       <img v-show="unitItem.icon" :src="unitItem.icon" width="16" height="16" />
@@ -130,7 +130,7 @@
             <!-- 其他指引  start -->
             <!-- 其他指引  start -->
             <div class="page-nav-con" v-for="(item, index) in navOtherList" :key="index">
             <div class="page-nav-con" v-for="(item, index) in navOtherList" :key="index">
               <div class="page-nav-box" v-for="(subItem, subInd) in item" :key="subInd" style="width: 50%;">
               <div class="page-nav-box" v-for="(subItem, subInd) in item" :key="subInd" style="width: 50%;">
-                <div class="page-nav-badge" v-for="(unitItem, unitInd) in subItem" :key="unitInd" @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem.url):null" :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
+                <div class="page-nav-badge" v-for="(unitItem, unitInd) in subItem" :key="unitInd" @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem):null" :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
                   <div :class="['page-nav-item', unitItem.styleC]">
                   <div :class="['page-nav-item', unitItem.styleC]">
                     <div class="page-nav-n">
                     <div class="page-nav-n">
                       <img v-show="unitItem.icon" :src="unitItem.icon" width="16" height="16" />
                       <img v-show="unitItem.icon" :src="unitItem.icon" width="16" height="16" />
@@ -227,6 +227,9 @@ export default {
               name: '销售审核',
               name: '销售审核',
               styleC: 'blue-color',
               styleC: 'blue-color',
               url: '/salesManagement/salesQuery/list',
               url: '/salesManagement/salesQuery/list',
+              params: {
+              	financialStatus: 'WAIT'
+              },
               permission: 'M_salesQueryList',
               permission: 'M_salesQueryList',
               orderNum: 'salesWaitAuditCount'
               orderNum: 'salesWaitAuditCount'
             },
             },
@@ -616,8 +619,10 @@ export default {
       })
       })
     },
     },
     // 导航跳转
     // 导航跳转
-    goPage (url) {
-      this.$router.push({ path: url, query: { closeLastOldTab: true } })
+    goPage (data) {
+    	if (data) {
+    		this.$router.push({ path: data.url, query: { closeLastOldTab: true, pageParams: data.params ? data.params : null } })
+    	}
     },
     },
     // 数据看板信息
     // 数据看板信息
     getBizData () {
     getBizData () {

+ 17 - 2
src/views/salesManagement/salesQuery/list.vue

@@ -365,6 +365,11 @@ export default {
     },
     },
     // 重置
     // 重置
     resetSearchForm () {
     resetSearchForm () {
+      this.resetData()
+      this.$refs.table.refresh(true)
+    },
+    // 重置数据
+    resetData () {
       this.$refs.rangeDate.resetDate(this.time)
       this.$refs.rangeDate.resetDate(this.time)
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
@@ -376,7 +381,6 @@ export default {
       this.queryParam.billStatus = undefined
       this.queryParam.billStatus = undefined
       this.queryParam.financialStatus = undefined
       this.queryParam.financialStatus = undefined
       this.$refs.custList.resetForm()
       this.$refs.custList.resetForm()
-      this.$refs.table.refresh(true)
     },
     },
     //  导出
     //  导出
     handleExport () {
     handleExport () {
@@ -442,13 +446,24 @@ export default {
   activated () {
   activated () {
     // 如果是新页签打开,则重置当前页面
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
     if (this.$store.state.app.isNewTab) {
+      this.resetData()
+      if (this.$route.query.pageParams) {
+      	this.queryParam.financialStatus = this.$route.query.pageParams.financialStatus
+      }
       this.pageInit()
       this.pageInit()
-      this.resetSearchForm()
+      this.$refs.table.refresh(true)
     }
     }
     // 仅刷新列表,不重置页面
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {
     if (this.$store.state.app.updateList) {
       this.pageInit()
       this.pageInit()
       this.$refs.table.refresh()
       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) {
   beforeRouteEnter (to, from, next) {