翻页功能调整

src/HDrpManagement/customerData/components/pageTable.vue

@@ -51,6 +51,8 @@ export default {
       list:[],
       list2:[],
       total:0,
+      listqueryid:'',
+      pageTotal:0,
       options:[
       ],
     }
@@ -71,6 +73,9 @@ export default {
       this.list = res.data
       this.list2 = res.data.length && res.data[0].isEmpty ? [] : res.data
       this.total = res.data.length && res.data[0].isEmpty ? 0 : res.total
+      this.listqueryid = res.listqueryid
+      this.pageTotal = res.pageTotal
+      sessionStorage.setItem('total',res.total)
       console.log(this.list)
     },
     handleSizeChange(val) {
@@ -101,4 +106,4 @@ export default {
   min-height: 100% !important;
   max-height: 100% !important;
 }
-</style>
+</style>

src/HDrpManagement/customerData/index.vue

@@ -269,7 +269,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerTypeTable',typeTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -399,7 +399,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerGradTable',gradTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -526,7 +526,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerContactTable',contactTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -653,7 +653,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerProjectTable',projectTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -780,7 +780,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerFllowTable',fllowTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -981,7 +981,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerUnfllowTable',unfllowTableParam,'sa_customersid')">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -1415,13 +1415,19 @@ export default {
     }
   },
   methods:{
-    goDetail (data) {
+    goDetail (data,refData,paramData,fieldname) {
+      sessionStorage.setItem('listqueryid',this.$refs[refData].listqueryid)
+      sessionStorage.setItem('isGo','1')
       this.$router.push({
         path:'/customerDetail',
         query:{
           id:data.sa_customersid,
+          rowindex:data.rowindex,
+          listqueryid:this.$refs[refData].listqueryid,
+          fieldname:fieldname
         }
       })
+      this.$store.dispatch('saveListData',{listData:this.$refs[refData].list2,param:paramData,pageTotal:this.$refs[refData].pageTotal})
       this.$store.dispatch('changeDetailDrawer',true)
     },
     //获取数据总览

src/HDrpManagement/invoicePredictionManage/details/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <newDetails ref="newDetails" :titleText="mainData.title" :mainAreaData="mainAreaData" idname="sa_salesforecastbillid" :editData="mainData" :tabs="['订单','项目','客户']">
+    <newDetails ref="newDetails" :titleText="mainData.title" :mainAreaData="mainAreaData" :pageChange="true" idname="sa_salesforecastbillid" :editData="mainData" :tabs="['订单','项目','客户']" @pageChange="queryMainData">
       <template #bottomLeft>
         <div>
           <div style="display: flex;justify-content: space-between;">

src/HDrpManagement/invoicePredictionManage/modules/detailInfo.vue

@@ -8,9 +8,17 @@
 export default {
   name: "edit",
   props:["data"],
+  data(){
+    return {
+      listqueryid:''
+    }
+  },
   methods:{
     onShow(){
-      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,isDetail:1}
+      this.listqueryid = sessionStorage.getItem('listqueryid')
+      /*sessionStorage.setItem('isGo','1')*/
+      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,isDetail:1,listqueryid:this.listqueryid,
+        fieldname:'sa_salesforecastbillid'}
       this.$router.push({path:'/invoiceManageDetail',query:query})
       this.$store.dispatch('changeDetailDrawer',true)
     },

src/HDrpManagement/projectChange/modules/detail.vue

@@ -334,7 +334,7 @@ export default {
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
       this.flag = 0
-      this.$router.replace({path:'/projectChangeDetail',query:{id:id,rowindex:rowindex,portrait:''}})
+     /* this.$router.replace({path:'/projectChangeDetail',query:{id:id,rowindex:rowindex,portrait:''}})*/
       this.queryMainData(id)
     },
     /*BPM是否开启*/

src/HDrpManagement/projectData/components/pageTable.vue

@@ -25,6 +25,7 @@
             </div>
           </div>
         </template>
+
       </tableLayout>
     </div>
     <div style="margin-top:16px;text-align:right">
@@ -51,6 +52,8 @@ export default {
       list:[],
       list2:[],
       total:0,
+      listqueryid:'',
+      pageTotal:0,
       options:[
       ],
     }
@@ -71,7 +74,9 @@ export default {
       this.list = res.data
       this.list2 = res.data.length && res.data[0].isEmpty ? [] : res.data
       this.total = res.data.length && res.data[0].isEmpty ? 0 : res.total
-      console.log(this.list)
+      this.listqueryid = res.listqueryid
+      this.pageTotal = res.pageTotal
+      sessionStorage.setItem('total',res.total)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -101,4 +106,4 @@ export default {
   min-height: 100% !important;
   max-height: 100% !important;
 }
-</style>
+</style>

src/HDrpManagement/projectData/index.vue

@@ -225,7 +225,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'typeTable',typeTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -363,7 +363,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'gradTable',gradTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -495,7 +495,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'scoreTable',scoreTableParam1,'sa_projectid')">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -877,7 +877,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'projectFllowTable',fllowTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -1015,7 +1015,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'projectContactTable',contactTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -1153,7 +1153,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'projectCustomerTable',customerTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -1291,7 +1291,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'projectScoreTable',scoreTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -1420,7 +1420,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerUnfllowTable',unfllowTableParam,'sa_projectid')">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -2037,13 +2037,19 @@ export default {
     }
   },
   methods:{
-    goDetail (data) {
+    goDetail (data,refData,paramData,fieldname) {
+      sessionStorage.setItem('listqueryid',this.$refs[refData].listqueryid)
+      sessionStorage.setItem('isGo','1')
       this.$router.push({
         path:'/projectChangeDetail',
         query:{
           id:data.sa_projectid,
+          rowindex:data.rowindex,
+          listqueryid:this.$refs[refData].listqueryid,
+          fieldname:fieldname
         }
       })
+      this.$store.dispatch('saveListData',{listData:this.$refs[refData].list2,param:paramData,pageTotal:this.$refs[refData].pageTotal})
       this.$store.dispatch('changeDetailDrawer',true)
     },
     //获取数据总览

src/HDrpManagement/projectPredictionManage/details/index.vue

@@ -1,6 +1,6 @@
 <template>
  <div>
-   <newDetails :titleText="mainData.title" :mainAreaData="mainAreaData" idname="sa_salesforecastbillid" :editData="mainData" :tabs="['项目产品清单']" >
+   <newDetails :titleText="mainData.title" :mainAreaData="mainAreaData" :pageChange="true" idname="sa_salesforecastbillid" :editData="mainData" :tabs="['项目产品清单']" @pageChange="queryMainData">
      <template #bottomLeft>
        <div style="height:  calc(100vh - 180px)">
          <div style="display: flex;justify-content: space-between;">

src/HDrpManagement/projectPredictionManage/modules/detailInfo.vue

@@ -12,13 +12,16 @@ export default {
     return {
       drawer:false,
       mainAreaData:'',
-      mainData:""
+      mainData:"",
+      listqueryid:''
     }
   },
   methods:{
     onShow(){
       this.drawer = true
-      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,isDetail:1}
+      this.listqueryid = sessionStorage.getItem('listqueryid')
+      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,isDetail:1,listqueryid:this.listqueryid,
+        fieldname:'sa_salesforecastbillid'}
       this.$router.push({path:'/projectManageDetail',query:query})
       this.$store.dispatch('changeDetailDrawer',true)
       /*this.queryMainData()*/

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -348,9 +348,10 @@ export default {
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
+      console.log('翻页')
       this.flag = false
-      tabIndex = this.$route.query.tabIndex
-      this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex,portrait:''}})
+   /*   tabIndex = this.$route.query.tabIndex*/
+     /* this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex,portrait:''}})*/
       this.queryMainData(id)
     },
     onSuccess(){

src/SDrpManagement/salerPrivatecustomer/detail/modules/contract/index.vue

@@ -62,6 +62,8 @@ export default {
       list:[],
       total:0,
       currentPage:0,
+      pageTotal:0,
+      listqueryid:'',
       params:{
         "content": {
           "sys_enterpriseid": '',
@@ -101,6 +103,9 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -127,7 +132,17 @@ export default {
               this.$store.dispatch('setHistoryRouter',this.oldRoute)
             }
             sessionStorage.setItem('active_modules',JSON.stringify(item2))
-            this.$router.push({path:'/contractDetail',query:{id:data.sa_contractid,type:type}})
+            sessionStorage.setItem('listqueryid',this.listqueryid)
+            sessionStorage.setItem('isGo','1')
+            this.$router.push({path:'/contractDetail',
+              query:{
+                id:data.sa_contractid,
+                type:type,
+                rowindex:data.rowindex,
+                listqueryid:this.listqueryid,
+                fieldname:'sa_contractid'
+              }})
+            this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
             return
           }
         })
@@ -148,4 +163,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/modules/followLeads/index.vue

@@ -64,6 +64,8 @@ export default {
       total: 0,
       currentPage: 0,
       search:'',
+      pageTotal:0,
+      listqueryid:'',
       param: {
         "id": 20221208163302,
         "content": {
@@ -84,6 +86,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)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -108,13 +113,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.replace({
         path:'/orderclue_detail',
         query:{
           id:row.sat_orderclueid,
-          rowindex:row.rowindex
+          rowindex:row.rowindex,
+          listqueryid:this.listqueryid,
+          fieldname:'sat_orderclueid'
         }
       })
+      this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:this.pageTotal})
+
     }
 
   },

src/components/newDetailTemp/index.vue

@@ -9,6 +9,10 @@
           <div>
             <slot name="customOperation"></slot>
           </div>
+          <div v-if="pageChange === true">
+            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()" :disabled="$route.query.rowindex == 1"></el-button>
+            <el-button size="mini" @click="next()" :disabled="$route.query.rowindex  == turnTotal"><i class="el-icon-arrow-right" ></i></el-button>
+          </div>
         </div>
       </div>
       <div>
@@ -47,12 +51,15 @@ import {mapGetters} from "vuex";
 import tabTemp from '@/components/normal-basic-layout/details/modules/tabs/tab'
 export default {
   name: "index",
-  props:["titleText","mainAreaData",'tabs','editData','idname','ownertable'],
+  props:["titleText","mainAreaData",'tabs','editData','idname','ownertable','pageChange'],
   components:{tabTemp},
   data(){
     return {
       screenWidth: 0, // 存储当前屏幕的宽度
       multipleSize: 0, // 根据屏幕宽度计算得出的值
+      turnTotal:sessionStorage.getItem('total'),
+      refreshPage:true,
+      time:null
     }
   },
   methods:{
@@ -62,7 +69,158 @@ export default {
     handleResize() {
       // 更新屏幕宽度
       this.screenWidth = window.innerWidth;
-    }
+    },
+    async next () {
+      console.log('1111111111111')
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.nextOld()
+      }else {
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (this.time !== null) {
+          clearTimeout(this.time)
+        }
+        this.time = setTimeout(() => {
+          this.upPageData(1,listqueryid)
+        }, 0);
+      }
+
+    },
+    async previous () {
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.previousOld()
+      }else {
+        let rowindex = this.$route.query.rowindex
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (rowindex >= 1) {
+          if (rowindex = 1){
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = true
+          }else {
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = false
+          }
+        } else {
+          /*message.warn('已经是第一条了!')*/
+          this.isPrevious = true
+        }
+      }
+
+    },
+    async nextOld () {
+      const rs = await this.checkPaginationData()
+
+      if (rs == 0 && this.svlistData.listData.length == 1) return false
+      if (rs == 1 && this.svlistData.param.content.pageNumber == this.svlistData.pageTotal) return false
+      let fun = (rs) =>{
+        let nowId = this.$route.query.id
+        let changeId = ''
+        if (rs == 1) {
+          changeId = this.svlistData.listData[0][this.idname]
+        } else {
+          this.svlistData.listData.forEach((e,index)=>{
+            if (e[this.idname] == nowId) {
+              changeId = this.svlistData.listData[index + 1][this.idname]
+            }
+          })
+        }
+        this.$emit('pageChange',changeId,this.idx)
+        this.refresh()
+      }
+      if (rs == 1) {
+        this.svlistData.param.content.pageNumber ++
+        this.nextData(this.svlistData.param,(rs)=>{
+          fun(1)
+        })
+      } else {
+        fun()
+      }
+    },
+    async previousOld () {
+      const res = await this.checkPaginationData()
+      if (res == 0 && this.svlistData.param.content.pageNumber == 1) return false
+      const fun = (rs)=>{
+        let nowId = this.$route.query.id
+        let changeId = ''
+
+        if (rs == 0) {
+          changeId = this.svlistData.listData[this.svlistData.listData.length - 1][this.idname]
+        } else {
+          this.svlistData.listData.forEach((e,index)=>{
+            if (e[this.idname] == nowId) {
+              changeId = this.svlistData.listData[index - 1][this.idname]
+            }
+          })
+        }
+        this.$emit('pageChange',changeId,this.idx)
+        this.refresh()
+      }
+      if (res == 0) {
+        this.svlistData.param.content.pageNumber --
+        this.nextData(this.svlistData.param,()=>{
+          fun(0)
+        })
+      } else {
+        fun()
+      }
+    },
+    async upPageData (forward,listqueryid){
+      /*const hide = message.loading({content:'正在查询数据,请稍等..',duration:0,key:1});*/
+      const res = await this.$api.requested({
+        "classname": "system.tools",
+        "method":"querylistdatabyrowindex",
+        "content": {
+          "uniqueid":this.$route.query.id,
+          "rowindex": this.$route.query.rowindex,
+          "forward":forward,
+          "listqueryid": listqueryid,
+          "fieldname":this.$route.query.fieldname
+        }
+      })
+      console.log('执行了嘛')
+      if (res.data.data) {
+        console.log('data执行')
+        this.$router.replace({path:this.$route.path,query:{id:res.data.data,rowindex:res.data.rowindex,listqueryid:listqueryid,fieldname:this.$route.query.fieldname}})
+        this.$emit('pageChange',res.data.data,this.$route.query.rowindex)
+      } else {
+        console.log("没有执行")
+        /* message.warn('已经是最后一条了!')*/
+      }
+    },
+    checkPaginationData () {
+      return new Promise((reslove,reject)=>{
+        let id = this.$route.query.id
+        let n = 0
+        this.svlistData.listData.filter((e,index)=>{
+          if (e[this.idname] == id){
+
+            n = index
+          }
+        })
+        if (n == 0) {
+          reslove(0)
+        } else if (n == this.svlistData.listData.length - 1) {
+          reslove(1)
+        } else {
+          reslove(-1)
+        }
+      })
+    },
+    refresh () {
+      this.refreshPage = false
+      setTimeout(() => {
+        this.refreshPage = true
+      }, 10);
+    },
   },
   mounted() {
     // 监听窗口大小变化
@@ -104,6 +262,7 @@ export default {
       }
 
     },
+
     ...mapGetters({
       activeApp:"activeApp",
       svlistData:'svlistData'

src/components/normal-basic-layout-new/details/index.vue

@@ -20,8 +20,8 @@
           </div>
           <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
          <div v-if="!pageChange">
-            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>
-            <el-button size="mini" @click="next()"><i class="el-icon-arrow-right"></i></el-button>
+            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()" :disabled="$route.query.rowindex == 1"></el-button>
+            <el-button size="mini" @click="next()" :disabled="$route.query.rowindex  == turnTotal"><i class="el-icon-arrow-right"></i></el-button>
           </div>
         </div>
       </div>
@@ -121,6 +121,7 @@ export default {
       refreshPage:true,
       reportCenterLsit:[],
       systemappid:JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
+      turnTotal:sessionStorage.getItem('total'),
     }
   },
   computed:{
@@ -207,6 +208,20 @@ export default {
       })
     },
     async next () {
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.nextOld()
+      }else {
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (this.time !== null) {
+          clearTimeout(this.time)
+        }
+        this.time = setTimeout(() => {
+          this.upPageData(1,listqueryid)
+        }, 0);
+      }
+
+    },
+    async nextOld () {
       const rs = await this.checkPaginationData()
       if (rs == 0 && this.svlistData.listData.length == 1) return false
       if (rs == 1 && this.svlistData.param.content.pageNumber == this.svlistData.pageTotal) return false
@@ -235,6 +250,37 @@ export default {
       }
     },
     async previous () {
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.previousOld()
+      }else {
+        let rowindex = this.$route.query.rowindex
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (rowindex >= 1) {
+          if (rowindex = 1){
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = true
+          }else {
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = false
+          }
+        } else {
+          /*message.warn('已经是第一条了!')*/
+          this.isPrevious = true
+        }
+      }
+
+    },
+    async previousOld () {
       const res = await this.checkPaginationData()
       if (res == 0 && this.svlistData.param.content.pageNumber == 1) return false
       const fun = (rs)=>{

src/components/normal-basic-layout-new/index.vue

@@ -166,7 +166,14 @@ export default {
       this.$emit('listData',this.list)
 
       // 保存一下列表数据用于翻页
-      this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:res.pageTotal})
+      let isGo = sessionStorage.getItem('isGo')
+      sessionStorage.setItem('total',res.total)
+      if (isGo == 1){
+      }else {
+        sessionStorage.setItem('listqueryid',res.listqueryid)
+        this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:res.pageTotal})
+      }
+    /*  this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:res.pageTotal})*/
     },
     selectChange () {
       this.param.content.pageNumber = 1

src/components/normal-basic-layout/details/index.vue

@@ -126,7 +126,7 @@ export default {
       refreshPage:true,
       reportCenterLsit:[],
       systemappid:JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
-      time:''
+      time:null
     }
   },
   computed:{
@@ -213,9 +213,12 @@ export default {
       })
     },
     async next () {
+      console.log('翻页了')
       if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        console.log('执行1')
         this.nextOld()
       }else {
+        console.log('执行22')
         let listqueryid = sessionStorage.getItem('listqueryid')
         if (this.time !== null) {
           clearTimeout(this.time)
@@ -327,13 +330,11 @@ export default {
           "fieldname":this.$route.query.fieldname
         }
       })
-      console.log('执行了嘛')
       if (res.data.data) {
-        console.log('data执行')
+        console.log(listqueryid,'listqueryid数据获取了嘛')
         this.$router.replace({path:this.$route.path,query:{id:res.data.data,rowindex:res.data.rowindex,listqueryid:listqueryid,fieldname:this.$route.query.fieldname}})
         this.$emit('pageChange',res.data.data,this.$route.query.rowindex)
       } else {
-        console.log("没有执行")
        /* message.warn('已经是最后一条了!')*/
       }
     },

src/components/normal-basic-layout/index.vue

@@ -169,6 +169,7 @@ export default {
       // 保存一下列表数据用于翻页
       let isGo = sessionStorage.getItem('isGo')
       sessionStorage.setItem('total',res.total)
+      console.log('执行了嘛数据1111')
       if (isGo == 1){
       }else {
         sessionStorage.setItem('listqueryid',res.listqueryid)

src/views/salesData/modules/orderType.vue

@@ -338,7 +338,6 @@ export default {
           this.oldRoute = {path:route.path,query:route.query}
           this.$store.dispatch('setHistoryRouter',this.oldRoute)
         }
-        console.log(this.listqueryid,'list1111')
         sessionStorage.setItem('listqueryid',this.listqueryid)
         sessionStorage.setItem('isGo','1')
         this.$router.push({