Merge branch 'mergeBranch' into orangeUrgent

src/SDrpManagement/salerPrivatecustomer/detail/modules/quotedPrice/list.vue

@@ -57,6 +57,8 @@ export default {
       total:0,
       currentPage:0,
       search:"",
+      pageTotal:0,
+      listqueryid:'',
       param:{
         "id": "20221018102103",
         "content": {
@@ -79,24 +81,31 @@ 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:'/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})
         this.$store.dispatch('changeDetailDrawer',true)
       },500)
 
     },
     async listData(){
-      console.log(this.data)
       this.param.content.sys_enterpriseid = this.data.sys_enterpriseid
       const res = await this.$api.requested(this.param)
       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} 条`);
@@ -134,4 +143,4 @@ export default {
   display: flex;
   align-items: center;
 }
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <basicLayout
+    <basicLayout
       ref="list"
       formPath="salerPrivatecustomer"
       tableName="salerPrivatecustomerTable"