列表页查询条件和页码小bug

src/views/advance-packingList/adPaList-clothes.vue

@@ -396,7 +396,7 @@ export default {
             console.log('预装箱单-成衣列表', this.adPaListClothesData)
             this.pagination = {
               total: res.result.total,
-              current: 1,
+              current: res.result.current,
               pageSize: res.result.size
             }
           }
@@ -463,6 +463,7 @@ export default {
 
     // 第二行 查询按钮
     searchQuery() {
+      this.queryParam.pageNo = '' //页码恢复
       this.getadPaListClothes()
     },
     // 重置

src/views/order/orderDetailDrawer.vue

@@ -247,7 +247,7 @@ export default {
             this.childData = res.result.records
             this.pagination = {
               total: res.result.total,
-              current: 1,
+               current: res.result.current,
               pageSize: res.result.size
             }
           }
@@ -267,8 +267,6 @@ export default {
       this.getOrderChild()
     }
   },
-  computed: {},
-  mounted() {}
 }
 </script>
 <style lang="less" scoped>

src/views/order/orderList.vue

@@ -216,7 +216,7 @@ export default {
             // console.log('订单数据列表', this.orderListData)
             this.pagination = {
               total: res.result.total,
-              current: 1,
+              current: res.result.current,
               pageSize: res.result.size
             }
           }
@@ -230,7 +230,7 @@ export default {
         on: {
           click: event => {
             this.$refs.orderDetailDrawer.visible = true
-            this.$refs.orderDetailDrawer.record = record//接口参数
+            this.$refs.orderDetailDrawer.record = record //接口参数
             this.$refs.orderDetailDrawer.getOrderChild()
             this.$refs.orderDetailDrawer.orderDetail = record //详情页主表赋值
           }
@@ -239,12 +239,12 @@ export default {
     },
     // 查询按钮
     searchQuery() {
+      this.queryParam.pageNo = ''
       this.getOrderList()
-      console.log('发货状态', this.queryParam.dilivery)
+      // console.log('发货状态', this.queryParam.dilivery)
     },
 
     searchReset() {
-      // console.log('>>>>重置')
       this.queryParam = {}
       this.getOrderList()
     },

src/views/reportForms/dye-loss-table.vue

@@ -108,9 +108,6 @@ import someoneLossChart from '@views/reportForms/dye-loss-table/someoneLossChart
 
 import { dyeLossList } from '@api/reportForms/dye-loss-table.js'
 
-// import FileSaver from 'file-saver'
-// import XLSX from 'xlsx'
-
 export default {
   name: 'DyeLossRateTable', // 染损报表
   mixins: [JeecgListMixin],
@@ -201,7 +198,7 @@ export default {
             this.dyeLossRateData = res.result.records
             this.pagination = {
               total: res.result.total,
-              current: 1,
+              current: res.result.current,
               pageSize: res.result.size
             }
             // console.log('染损列表', this.dyeLossRateData)
@@ -209,7 +206,6 @@ export default {
         })
       })
     },
-    // this.queryParam.pageNo = pagination.current
     // 查询按钮
     searchQuery() {
       if (this.queryParam.venName) {

src/views/reportForms/order-statistics/external-statistics.vue

@@ -193,7 +193,7 @@ export default {
             console.log('订单外部列表', this.ExternalData)
             this.pagination = {
               total: res.result.total,
-              current: 1,
+              current: res.result.current,
               pageSize: res.result.size
             }
           }
@@ -220,6 +220,7 @@ export default {
       console.log('what------monthChange')
     },
     searchQuery() {
+      this.queryParam.pageNo = ''
       this.getExternalData()
     },
     searchReset() {

src/views/reportForms/pro-progress-report.vue

@@ -249,7 +249,7 @@ export default {
             console.log('生产进度列表页', this.proProgressData)
             this.pagination = {
               total: res.result.total,
-              current: 1,
+              current: res.result.current,
               pageSize: res.result.size
             }
           }
@@ -291,6 +291,7 @@ export default {
     },
     // 查询
     searchQuery() {
+      this.queryParam.pageNo = ''
       this.getproProgressList()
     },
     searchReset() {

src/views/reportForms/supply-capacity-table.vue

@@ -189,7 +189,7 @@ export default {
             console.log('【供应商产能报表数据】:', this.supplyCapacityData)
             this.pagination = {
               total: res.result.total,
-              current: 1,
+              current: res.result.current,
               pageSize: res.result.size
             }
           }
@@ -276,6 +276,7 @@ export default {
 
     // 查询按钮
     searchQuery() {
+      this.queryParam.pageNo = ''
       this.getSupplyCapList()
     },
     searchReset() {

src/views/shipment-details/referOrderDataModal.vue

@@ -348,7 +348,7 @@ export default {
       // 查询条件
       queryParam: {
         orderNumber: '', // 订单号
-        account: '',
+        account: ''
         // pageNo: '', // 初始页
         // pageSize: '-1' // 每页显示条数
       },
@@ -378,7 +378,7 @@ export default {
             // console.log('新增参照订单数据', this.orderListData)
             this.pagination = {
               total: res.result.total,
-              current: 1,
+              current: res.result.current,
               pageSize: res.result.size
             }
           }
@@ -396,8 +396,8 @@ export default {
       this.getOrderList()
     },
 
-    // 弹框查询按钮
     searchQuery() {
+      this.queryParam.pageNo = ''
       this.getOrderList()
     },
 

src/views/shipment-details/shipmentList.vue

@@ -482,7 +482,7 @@ export default {
             console.log('发运明细列表', this.shipmentListData)
             this.pagination = {
               total: res.result.total,
-              current: 1,
+              current: res.result.current,
               pageSize: res.result.size
             }
             // console.log('分页器赋值:', this.pagination.total, this.pagination.current, this.pagination.pageSize)
@@ -498,6 +498,7 @@ export default {
     },
     // 查询按钮
     searchQuery() {
+      this.queryParam.pageNo = ''
       this.getShipmentList()
     },
     // 重置