Merge branch 'mergeBranch' into redUrgent

src/HDrpManagement/orderManage/details/tabs/changeHistory.vue

@@ -74,7 +74,7 @@ export default {
         "content": {
           "sa_orderid": '',
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -94,11 +94,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {

src/HDrpManagement/orderManage/details/tabs/dispatch.vue

@@ -62,7 +62,7 @@ export default {
         "content": {
           "sa_orderid": '',
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -81,11 +81,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -104,4 +104,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/orderManage/details/tabs/erpHistory.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column
         prop="type"
-        label="类型"> 
+        label="类型">
       </el-table-column>
     </el-table>
     <div class="container normal-panel" style="text-align:right">
@@ -56,7 +56,7 @@ export default {
         "content": {
           "sa_orderid": '',
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -75,11 +75,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -98,4 +98,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/orderManage/details/tabs/logistics.vue

@@ -71,7 +71,7 @@ export default {
         "content": {
           "sa_orderid": '',
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -90,11 +90,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -113,4 +113,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/orderManage/details/tabs/writeoff.vue

@@ -80,15 +80,14 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      console.log(this.tableData,'核销记录');
-      
+
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -107,4 +106,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/tabs/dispatch.vue

@@ -51,7 +51,7 @@ export default {
         "content": {
           "sa_orderid": '',
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -70,11 +70,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -93,4 +93,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/tabs/erpHistory.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column
         prop="type"
-        label="类型"> 
+        label="类型">
       </el-table-column>
     </el-table>
     <div class="container normal-panel" style="text-align:right">
@@ -56,7 +56,7 @@ export default {
         "content": {
           "sa_orderid": '',
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -75,11 +75,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -98,4 +98,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/tabs/logistics.vue

@@ -51,7 +51,7 @@ export default {
         "content": {
           "sa_orderid": '',
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -70,11 +70,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -93,4 +93,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/agentOrder/details/tabs/dispatch.vue

@@ -76,11 +76,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -99,4 +99,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/agentOrder/details/tabs/logistics.vue

@@ -89,11 +89,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -112,4 +112,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/salerOrder/details/tabs/dispatch.vue

@@ -58,7 +58,7 @@ export default {
         "content": {
           "sa_orderid": 0,
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -77,11 +77,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -100,4 +100,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/salerOrder/details/tabs/logistics.vue

@@ -71,7 +71,7 @@ export default {
         "content": {
           "sa_orderid": 0,
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }
@@ -90,11 +90,11 @@ export default {
       this.currentPage = res.pageNumber
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -113,4 +113,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/salerOrder/details/tabs/writeoff.vue

@@ -81,14 +81,14 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
       console.log(this.tableData,'核销记录');
-      
+
     },
     handleSizeChange(val) {
-      this.param.pageSize = val
+      this.param.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
-      this.param.pageNumber = val
+      this.param.content.pageNumber = val
       this.listData()
     },
     linkDetail (item) {
@@ -107,4 +107,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>