翻页合并调整

src/views/salesData/modules/orderProductCategory.vue

@@ -172,7 +172,9 @@ export default {
       isFull:false,
       ordertypeList:[],
       tradefieldList:[],
-      brandList:[]
+      brandList:[],
+      listqueryid:'',
+      pageTotal:0
     }
   },
   methods:{
@@ -190,11 +192,17 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.pageTotal = res.pageTotal
+          this.listqueryid = res.listqueryid
+          sessionStorage.setItem('total',res.total)
         }
       }else {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.pageTotal = res.pageTotal
+        this.listqueryid = res.listqueryid
+        sessionStorage.setItem('total',res.total)
       }
       if (this.type === '金额'){
         this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+'万'
@@ -226,11 +234,17 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.pageTotal = res.pageTotal
+          this.listqueryid = res.listqueryid
+          sessionStorage.setItem('total',res.total)
         }
       }else {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.pageTotal = res.pageTotal
+        this.listqueryid = res.listqueryid
+        sessionStorage.setItem('total',res.total)
       }
       if (this.type === '金额'){
         this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+'万'
@@ -257,6 +271,9 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
     },
     renderPie(val){
       console.log(val,'33333')
@@ -367,13 +384,19 @@ export default {
           this.oldRoute = {path:route.path,query:route.query}
           this.$store.dispatch('setHistoryRouter',this.oldRoute)
         }
+        sessionStorage.setItem('listqueryid',this.listqueryid)
+        sessionStorage.setItem('isGo','1')
         this.$router.push({
           path:'/orderdetail',
           query:{
             id:data.sa_orderid,
+            rowindex:data.rowindex,
+            listqueryid:this.listqueryid,
+            fieldname:'sa_orderid',
             portrait:''
           }
         })
+        this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:this.pageTotal})
       })
     },
     /*全屏*/

src/views/salesData/modules/orderType.vue

@@ -133,7 +133,8 @@ export default {
       heightChart:'98%',
       heightTable:'352px',
       isFull:false,
-      listqueryid:''
+      listqueryid:'',
+      pageTotal:0
     }
   },
   methods:{
@@ -151,6 +152,7 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.pageTotal = res.pageTotal
           this.listqueryid = res.listqueryid
           sessionStorage.setItem('total',res.total)
         }
@@ -158,6 +160,7 @@ export default {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.pageTotal = res.pageTotal
         this.listqueryid = res.listqueryid
         sessionStorage.setItem('total',res.total)
       }
@@ -192,6 +195,7 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.pageTotal = res.pageTotal
           this.listqueryid = res.listqueryid
           sessionStorage.setItem('total',res.total)
         }
@@ -199,6 +203,7 @@ export default {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.pageTotal = res.pageTotal
         this.listqueryid = res.listqueryid
         sessionStorage.setItem('total',res.total)
       }
@@ -227,6 +232,7 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.pageTotal = res.pageTotal
       this.listqueryid = res.listqueryid
       sessionStorage.setItem('total',res.total)
     },
@@ -350,7 +356,7 @@ export default {
             portrait:''
           }
         })
-        this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
+        this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:this.pageTotal})
       })
     },
     /*全屏*/