暂存

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -135,11 +135,18 @@ export default {
   computed:{
   },
   watch:{
+    "data":function (val){
+      if(val){
+        this.listData()
+      }
+    }
   },
   created () {
-    if (this.$route.query.id) this.listData()
     this.tablecols = this.tool.tabelCol(this.$route.name).productBillnoTable.tablecols
     this.tablecolsAdd = this.tool.tabelCol(this.$route.name).addProuctProject.tablecols
+  },
+  mounted() {
+
   },
   methods: {
     async listData(){

src/HDrpManagement/contractManage/index.vue

@@ -166,6 +166,7 @@ export default {
       type:'',
       condition:'',
       status:'',
+      listqueryid:sessionStorage.getItem('listqueryid'),
       selectParam: {
         status: "",
         type: "",

src/HDrpManagement/contractManage/modules/detail.vue

@@ -285,10 +285,11 @@ export default {
       console.log(this.$refs.details.param.content,'param')
       // this.$refs.details.param.content.type = this.$route.query.tabIndex
       // this.$refs.details.param.content.where.type = this.$route.query.type
+      let listqueryid = sessionStorage.getItem('listqueryid')
       this.mainData.type == '项目'
         ? this.mainData.typemx == '直销'
-          ? this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'直销项目',tabIndex:this.$route.query.tabIndex}}) : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'经销项目',tabIndex:this.$route.query.tabIndex}})
-          : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:this.mainData.type,tabIndex:this.$route.query.tabIndex}})
+          ? this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'直销项目',tabIndex:this.$route.query.tabIndex,listqueryid:listqueryid,fieldname:'sa_contractid'}}) : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'经销项目',tabIndex:this.$route.query.tabIndex,listqueryid:listqueryid,fieldname:'sa_contractid'}})
+          : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:this.mainData.type,tabIndex:this.$route.query.tabIndex,listqueryid:listqueryid,fieldname:'sa_contractid'}})
 
       this.changeDataStructure()
     },
@@ -1521,9 +1522,9 @@ export default {
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
-      this.flag = false
+      /*this.flag = false
       tabIndex = this.$route.query.tabIndex
-      this.$router.replace({path:'/contractDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
+      this.$router.replace({path:'/contractDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})*/
       this.queryMainData(id)
     },
     onSuccess(){

src/HDrpManagement/orderManage/details/index.vue

@@ -371,7 +371,7 @@ export default {
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
-      this.$router.replace({path:'/orderdetail',query:{id:id,rowindex:rowindex}})
+      /*this.$router.replace({path:'/orderdetail',query:{id:id,rowindex:rowindex}})*/
       this.queryMainData(id)
     },
     // 查询站点是否使用返利金

src/HDrpManagement/projectChange/modules/modules/contract/index.vue

@@ -76,6 +76,8 @@ export default {
       list:[],
       total:0,
       currentPage:0,
+      pageTotal:0,
+      listqueryid:'',
       params:{
         "id": 20221223102102,
         "content": {
@@ -100,7 +102,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} 条`);
@@ -137,8 +141,19 @@ export default {
               this.oldRoute = {path:route.path,query:route.query}
               this.$store.dispatch('setHistoryRouter',this.oldRoute)
             }
+            /*let listqueryid = sessionStorage.getItem('listqueryid')*/
             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,
+                rowindex:data.rowindex,
+                listqueryid:this.listqueryid,
+                type:type,
+                fieldname:'sa_contractid'
+              }})
+            this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
             return
           }
         })

src/HDrpManagement/projectChange/modules/modules/quotation/index.vue

@@ -62,6 +62,8 @@ export default {
       total:0,
       currentPage:0,
       search:'',
+      listqueryid:'',
+      pageTotal:0,
       params:{
         "id": 20221124190702,
         "content": {
@@ -107,13 +109,18 @@ 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:'/quotedPriceDetail',
         query:{
           id:row.sa_quotedpriceid,
-          rowindex:row.rowindex
+          rowindex:row.rowindex,
+          listqueryid:this.listqueryid,
+          fieldname:'sa_quotedpriceid'
         }
       })
+      this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
     },
     async submit (data) {
       let res = await this.$api.requested({
@@ -159,6 +166,8 @@ export default {
         /*this.list[index].begdate = new Date(e.begdate).getFullYear() +*/
       })
       this.total = res.total
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
 
     },
     handleSizeChange(val) {
@@ -172,7 +181,6 @@ export default {
       this.listData()
     },
     clearData(){
-
       this.search = ""
       this.params.content.where.condition = this.search
       this.listData()

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -238,7 +238,12 @@ export default {
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
       this.flag = false
-      this.$router.replace({path:'/quotedPriceDetail',query:{id:id,rowindex:rowindex}})
+     /* this.$router.replace({path:'/quotedPriceDetail',
+        query:{
+          id:id,rowindex:rowindex,
+          listqueryid:this.listqueryid,
+          fieldname:'sa_quotedpriceid'
+        }})*/
       this.queryMainData(id)
     },
     changeDataStructure(){
@@ -255,7 +260,7 @@ export default {
         },
         {
           label:'负责人',
-          value:this.mainData.leader?this.mainData.leader[0].name:'--'
+          value:this.mainData.leader?this.mainData.leader[0]?this.mainData.leader[0].name:'--':'--'
         },
         {
           label:'报价日期',
@@ -346,7 +351,7 @@ export default {
             },
             {
               label:'负责人',
-              value:this.mainData.leader?this.mainData.leader[0].name:'--'
+              value:this.mainData.leader?this.mainData.leader[0]?this.mainData.leader[0].name:'--':'--'
             },
             {
               label:'手机号',

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

@@ -23,8 +23,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>
@@ -108,6 +108,8 @@ export default {
       routerName:'',
       rowindex:0,
       total:0,
+      isPrevious:false,
+      turnTotal:sessionStorage.getItem('total'),
       param:{
         "id": '',
         "content": {
@@ -124,6 +126,7 @@ export default {
       refreshPage:true,
       reportCenterLsit:[],
       systemappid:JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
+      time:''
     }
   },
   computed:{
@@ -210,7 +213,53 @@ 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 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) =>{
@@ -237,7 +286,7 @@ export default {
         fun()
       }
     },
-    async previous () {
+    async previousOld () {
       const res = await this.checkPaginationData()
       if (res == 0 && this.svlistData.param.content.pageNumber == 1) return false
       const fun = (rs)=>{
@@ -265,6 +314,29 @@ export default {
         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('已经是最后一条了!')*/
+      }
+    },
     onSuccess () {
       this.$emit('onEditSuccess')
 

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

@@ -0,0 +1,442 @@
+<template>
+  <div v-if="refreshPage" style="min-width:1200px">
+    <div style="margin:10px 10px 0 10px;border-radius:5px;position:relative" class="container normal-panel sticky" @click="closeTags">
+      <div class="flex-align-start flex-between normal-margin" style="flex-wrap:nowrap">
+        <div>
+          <p class="main_title mt-10">{{titleText?titleText:'##'}}</p>
+          <tagTemp v-if="activeApp.isdatatag" ref="tag" :categories="editData.categories" :modelName="modelName" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess" @sysTag="sysTag"></tagTemp>
+        </div>
+        <div class="flex-align-center" style="flex: 1 0 auto;  justify-content: flex-end;">
+          <div>
+            <slot name="customOperationBef"></slot>
+          </div>
+          <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :oldFormPath="oldFormPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
+          <!-- 打印 -->
+          <reportCenter size="mini" position="detail" class="inline-16" :data="reportCenterLsit.filter(item => item.type == 'printinfo')" v-if="reportCenterLsit.filter(item => item.type == 'printinfo').length > 0 && systemappid != 163">
+            <template v-slot:print="scope2">
+              <el-button @click="printBtn($route.query.id,scope2.data)" type="text" size="mini">打 印</el-button>
+            </template>
+          </reportCenter>
+
+          <div>
+            <slot name="customOperation"></slot>
+          </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>
+          </div>
+        </div>
+      </div>
+      <div>
+        <slot name="d_head"></slot>
+      </div>
+      <div v-show="isTop">
+        <el-descriptions :column="column?column:5" size="mini">
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAData" :key="item.index" :label="item.label">
+            <span v-if="item.label === '关联应用数据'"  :style="item.style?item.style():''">
+              <span v-if="item.value !== ''">
+                <el-button v-if="item.value !== '--'" type="text" @click="onGoto()" style="margin: 0;padding: 0">
+                  {{item.value}}
+                </el-button>
+                <span v-else>--</span>
+              </span>
+              <span v-else>--</span>
+            </span>
+            <span v-else :style="item.style?item.style():''">{{item.value !== ''?item.value:'--'}}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="1" size="mini">
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAData2" :key="item.index" :label="item.label">
+            <span :style="item.style?item.style():''">{{item.value !== ''?item.value:'--'}}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+        <slot name="headerBottom"></slot>
+      </div>
+
+      <span @click="isTop=!isTop" style="color:#3874f6;position:absolute;right:10px;bottom:10px;cursor: pointer;">
+        <i :class="isTop ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
+        {{ isTop ? '收起' : '展开' }}
+      </span>
+    </div>
+    <div style="box-sizing: border-box;padding:10px">
+      <el-row class="flex-align-stretch no-wrap" :gutter="activeApp.isdatateam?10:activeApp.isdatafollowup?10:0">
+        <el-col style="flex:1 0 auto;" :span="activeApp.isdatateam?18:activeApp.isdatafollowup?18:24">
+          <slot name="customBefore"></slot>
+          <tabTemp :status="status" :tabs="tabs" :editData="editData" :idname="idname" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onTabClick="onTabClick">
+            <div :slot="'slot' + index" v-for="(tab,index) in tabs" :key="tab.index">
+              <slot :name="'slot' + index"></slot>
+            </div>
+          </tabTemp>
+          <slot name="custom"></slot>
+        </el-col>
+        <el-col v-if="collapse" style="width:400px;" :span="6">
+          <taskTemp ref="task" v-if="activeApp.istask" :status="status" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" :typeTask="typeTask" :editData="editData" :idname="idname">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
+          </taskTemp>
+          <group v-if="activeApp.isdatateam" :isGroup="isGroup" :status="status" ref="group" style="margin-bottom:10px"  :justsaler="justsaler" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess" @teamList="teamList">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
+          </group>
+          <follow-up v-if="activeApp.isdatafollowup" :status="status" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" :editData="editData" :idname="idname">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
+          </follow-up>
+        </el-col>
+        <div v-else style="text-align-center" class="container normal-panel">
+          <el-button slot="collapse" type="text" icon="el-icon-s-fold" @click="onCollapse"></el-button>
+        </div>
+
+      </el-row>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import cpEdit from '../modules/cpEdit.vue'
+import followUp from './modules/followUp/followUp.vue'
+import tagTemp from './modules/tags/tag.vue'
+import tabTemp from './modules/tabs/tab.vue'
+import group from './modules/group/group.vue'
+import taskTemp from './modules/task/index.vue'
+import reportCenter from '../reportCenter/index'
+import {mapGetters} from 'vuex'
+export default {
+  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status','typeTask','isGroup','isBatch','modelName','isDelete','column'],
+  data () {
+    return {
+      isTop:true,
+      routerName:'',
+      rowindex:0,
+      total:0,
+      param:{
+        "id": '',
+        "content": {
+          "isExport":false,
+          "pageNumber": 1,
+          "pageSize": 1,
+          "nocache": true,
+          "where": {
+            "condition": ""
+          }
+        }
+      },
+      collapse:true,
+      refreshPage:true,
+      reportCenterLsit:[],
+      systemappid:JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
+    }
+  },
+  computed:{
+    mainAData () {
+      try {
+        let data = this.mainAreaData.filter(e=>{
+          if(e.label != '备注' && e.label != '优势信息' && e.label != '劣势信息') {
+            return e
+          }
+        })
+        return data
+      } catch (error) {
+
+      }
+
+    },
+    mainAData2 () {
+      try {
+        let data = this.mainAreaData.filter(e=>{
+          if(e.label == '备注' || e.label == '优势信息' || e.label == '劣势信息') {
+            return e
+          }
+        })
+        return data
+      } catch (error) {
+
+      }
+
+    },
+    ...mapGetters({
+      activeApp:"activeApp",
+      svlistData:'svlistData'
+    })
+  },
+  components:{
+    cpEdit,
+    followUp,
+    group,
+    tagTemp,
+    tabTemp,
+    taskTemp,
+    reportCenter
+  },
+  methods:{
+    // async queryData (pageNumber) {
+    //   this.$emit('updateParam',this.param)
+    //   this.param.id = this.turnPageId
+    //   this.param.content.pageNumber = pageNumber
+    //   const res = await this.$api.requested(this.param)
+    //   this.total = res.total
+    //   this.$refs['tag']?this.$refs['tag'].queryTag():''
+    //   this.refresh()
+    // },
+    async nextData(param,fn) {
+      console.log('执行')
+      this.rowStatus = null
+      const res = await this.$api.requested(param)
+      this.$store.dispatch('saveListData',{listData:res.data,param:param,pageTotal:res.pageTotal})
+      fn?fn():''
+    },
+    /* 获取是否有报表数据 */
+    async getSystemAppid () {
+      let res = await this.$api.requested({
+        "id":20221213094401,
+        "content": {
+          "systemappid":this.systemappid,
+        }
+      })
+
+      this.reportCenterLsit = res.data || []
+      console.log('报表',this.reportCenterLsit);
+    },
+    async printBtn (data,data2) {
+      let res = await this.$api.requested({
+        "id":20221213094501,
+        "content": {
+          sys_reportid:data2.sys_reportid,
+          dataid:data[this.idName]
+        }
+      })
+      this.tool.showMessage(res,() => {
+
+        window.open(this.tool.getBaseUrl() + res.data + `&${this.idname}=${data}`)
+      })
+    },
+    async next () {
+      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 previous () {
+      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()
+      }
+    },
+    onSuccess () {
+      this.$emit('onEditSuccess')
+
+    },
+    deleteData () {
+      this.$confirm('确定删除当前数据吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        let param = {
+          "id": this.delApiId,
+          "content":{}
+        }
+        if (this.isBatch === false){
+          param.content[`${this.idname}`] = this.editData[this.idname]
+        }else {
+          if (this.idname instanceof Array) { //判断传入的类型是多个还是单个idname
+            let obj = {}
+            this.idname.forEach(e=>{
+              obj[e] = ''
+            })
+            param.content[`${this.idname[0]}s`] =  [Object.keys(obj).map((key,item)=>{
+              obj[key] = this.editData[key]
+            })]
+          } else if(this.isDelete){
+            param.content[`${this.idname}`] = this.editData[this.idname]
+          } else {
+            param.content[`${this.idname}s`] = [this.editData[this.idname]]
+          }
+        }
+        const res = await this.$api.requested(param)
+        this.tool.showMessage(res,()=>{
+          this.$store.dispatch('changeDetailDrawer',false)
+        })
+      }).catch((err) => {
+
+        console.log(err)
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+    checkDisabled () {
+      if (this.statusCheck) {
+        let _isSame = this.statusCheck.some(item=>item.value === this.editData[item.key])
+        return _isSame
+      } else {
+        return false
+      }
+    },
+    onTabClick () {
+      this.$emit('onTabClick')
+    },
+    onCollapse () {
+      this.collapse?this.collapse = false:this.collapse = true
+    },
+    refresh () {
+      this.refreshPage = false
+      setTimeout(() => {
+        this.refreshPage = true
+      }, 10);
+    },
+    refreshTag () {
+      this.$refs.tag.queryTag()
+    },
+    closeTags() {
+      this.$refs.tag?this.$refs.tag.closeTag():''
+    },
+
+    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)
+        }
+      })
+    },
+
+    sysTag(val){
+      this.$emit('sysTag',val)
+    },
+
+
+    /*任务页面跳转*/
+    onGoto(){
+      let path = this.mainData.path
+      let route = this.$route
+      if (route.path !== path.slice(1)){
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.push({
+        path:path,
+        query:{
+          id:this.mainData.ownerid,
+          rowindex:this.mainData.rowindex
+        }
+      })
+    },
+    /*任务协助人*/
+    teamList(val){
+      this.$emit('teamList',val)
+    }
+  },
+  mounted () {
+    // this.checkPaginationData()
+    this.idx = this.$route.query.rowindex
+
+  },
+  created () {
+    this.$emit('detailCreate',this.param)
+    this.routerName = this.$route.meta.title
+    this.rowindex = Number(this.$route.query.rowindex)
+    this.getSystemAppid()
+  },
+  watch:{
+    mainAreaData () {
+      // console.log(this.mainAData,'mainAData')
+      // this.checkPaginationData()
+    }
+  }
+}
+
+</script>
+<style>
+.detail__head__label{
+  display: inline-block;
+  width: 70px;
+}
+.my-label-layout{
+  font-size: 14px;
+  color: #999;
+}
+</style>
+<style scoped>
+.appname{
+  display: inline;
+  background: #FA8C19;
+  color:#fff;
+  border-radius: 4px;
+  padding: 2px 10px;
+  font-size: 12px;
+}
+.my-tabs{
+  background:#eeeeee
+}
+.sticky{
+  position: sticky;
+  top:0;
+  box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+}
+.no-wrap{
+  flex-wrap:nowrap !important;
+}
+.main_title{
+  font-size:30px;
+  font-weight:300;
+  margin-right:16px;
+  line-height: 32px;
+}
+</style>

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

@@ -23,7 +23,9 @@ export default {
       } else {
         key = this.idName
       }
-      let query = {id:this.data[key],rowindex:this.data.rowindex - 1}
+      sessionStorage.setItem('isGo','0')
+      let listqueryid = sessionStorage.getItem('listqueryid')
+      let query = {id:this.data[key],rowindex:this.data.rowindex,listqueryid:listqueryid}
       this.$router.push({path:this.detailPath.path,query:Object.assign({},query,this.detailPath.param)})
       this.$store.dispatch('changeDetailDrawer',true)
     }
@@ -43,4 +45,4 @@ export default {
   color:#666;
   height:100vh;
 }
-</style>
+</style>

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

@@ -167,7 +167,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})
+      }
+
     },
     selectChange () {
       this.param.content.pageNumber = 1

src/views/salesData/modules/orderType.vue

@@ -132,7 +132,8 @@ export default {
       chartData:[],
       heightChart:'98%',
       heightTable:'352px',
-      isFull:false
+      isFull:false,
+      listqueryid:''
     }
   },
   methods:{
@@ -150,11 +151,15 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.listqueryid = res.listqueryid
+          sessionStorage.setItem('total',res.total)
         }
       }else {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.listqueryid = res.listqueryid
+        sessionStorage.setItem('total',res.total)
       }
 
       if (this.type === '金额'){
@@ -187,11 +192,15 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.listqueryid = res.listqueryid
+          sessionStorage.setItem('total',res.total)
         }
       }else {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        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)+'万'
@@ -218,6 +227,8 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
     },
     renderPie(val){
       this.chartPie = new Pie('orderTypeChart',{
@@ -327,13 +338,20 @@ 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({
           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.params,pageTotal:this.pageTotal})
       })
     },
     /*全屏*/