Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-master-html

# Conflicts:
#	src/views/modules/order/buyorder.vue

src/views/modules/order/buyorder.vue

@@ -58,9 +58,6 @@
       <el-form-item>
         <el-input style="width:200px" v-model="dataForm.key" placeholder="订单编号/收件人姓名/手机号" clearable></el-input>
       </el-form-item>
-      <!-- <el-form-item>
-        <el-input style="width:100px" v-model="dataForm.productName" placeholder="商品名称" clearable></el-input>
-      </el-form-item> -->
       <!-- 按时间筛选 -->
       <el-form-item>
         <div class="block">
@@ -125,8 +122,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
+      <el-pagination @size-change="sheetSizeChangeHandle" @current-change="currentSheetChangeHandle" :current-page="sheetPageIndex"
-      :page-sizes="[40, 60, 100, 150]" :page-size="pageSize" :total="MDtotal"
+      :page-sizes="[40, 60, 100, 150]" :page-size="sheetPageSize" :total="MDtotal"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     </div>
@@ -560,8 +557,7 @@ export default {
       orderInfo: {},
       dataForm: {
         key: '',
-        time: '',
+        time: ''
-        productName:''
       },
       PrintSheetList: [],//打印列表
       sheetListLoading:false,
@@ -592,7 +588,9 @@ export default {
         orderId: ''
       },
       pageIndex: 1,
+      sheetPageIndex:1,
       pageSize: 40,
+      sheetPageSize:40,
       totalPage: 0,
       dataListLoading: false,
       dataListSelections: [],
@@ -835,8 +833,8 @@ export default {
         url: this.$http.adornUrl('/express/getExpressPrints'),
         method: 'post',
         data: this.$http.adornData({
-          "limit": this.pageSize,
+          "limit": this.sheetPageSize,
-          "page": this.pageIndex,
+          "page": this.sheetPageIndex,
           "type": this.tabChange.sheetCode,  //类型，0不限1已打印2未打印
           "date": this.MdDataForm.date,//string类型,非必传字段2023-10-30
           "expressOrderSn":"" //string类型，非必传字段
@@ -918,7 +916,6 @@ export default {
         // }),
         data:this.$http.adornData({
           "searchKeyWord": this.dataForm.key,
-          "productName": this.dataForm.productName,
           "startTime": this.dataForm.time[0],
           "endTime": this.dataForm.time[1],
           "orderStatus": this.tabChange.tabActiveName,
@@ -950,11 +947,21 @@ export default {
       this.pageIndex = 1
       this.getDataList()
     },
+    sheetSizeChangeHandle(val) {
+      this.sheetPageSize = val
+      this.sheetPageIndex = 1
+      this.getPrintSheetList()
+    },
     // 当前页
     currentChangeHandle(val) {
       this.pageIndex = val
       this.getDataList()
     },
+    // 当前页
+    currentSheetChangeHandle(val){
+      this.sheetPageIndex = val
+      this.getPrintSheetList()
+    },
     // 多选
     selectionChangeHandle(val) {
       this.dataListSelections = val