出运明细列表筛选条件修改，取消分页

src/views/shipment-details/referOrderDataModal.vue

@@ -108,7 +108,7 @@
         :columns="referOerderColumns"
         :data-source="orderListData"
         :loading="loading"
-        :pagination="pagination"
+        :pagination="false"
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="handleTableChange"
         :scroll="{ x: 1500, y:450 }"

src/views/shipment-details/shipmentList.vue

@@ -546,19 +546,19 @@ export default {
 
       // 查询条件
       queryParam: {
-        orderNumber: '', // 订单号
-        startTime: '',
-        supplier:'',//供应商
-        endTime: '',
-        preDeliveryDateB:'',//预发货日期开始时间
-        preDeliveryDateE:'',//预发货日期结束时间
-        // timeRange: [], // 查询条件  时间范围
-        // preDeliveryDate: '',
-        isElement:'',//申报要素是否维护
-        salesman: '',
-        itemNumber: '', // 款号
-        refer: '',
-        flourOrGarment: '', //类型
+        // orderNumber: '', // 订单号
+        // startTime: '',
+        // supplier:'',//供应商
+        // endTime: '',
+        // preDeliveryDateB:'',//预发货日期开始时间
+        // preDeliveryDateE:'',//预发货日期结束时间
+        // // timeRange: [], // 查询条件  时间范围
+        // // preDeliveryDate: '',
+        // isElement:'',//申报要素是否维护
+        // salesman: '',
+        // itemNumber: '', // 款号
+        // refer: '',
+        // flourOrGarment: '', //类型
         // pageSize:20,//每页条数
         // pageNo: '' // 点击的页数
       },
@@ -859,7 +859,7 @@ export default {
     },
 
     searchQuery() {
-      if(this.queryParam.flourOrGarment === ''){
+      if(this.queryParam.flourOrGarment === '' || !this.queryParam.hasOwnProperty('flourOrGarment')){
        this.$message.error('请选择查询类型！');
       }else if(this.preDeliveryDate.length !==2){
        this.$message.error('请选择预发货时间区间！');
@@ -881,23 +881,25 @@ export default {
     },
 
     searchReset() {
-      this.queryParam.isElement = ''
-      this.queryParam.orderNumber = ''
-      this.queryParam.supplier = ''
+      // this.queryParam.isElement = ''
+      // this.queryParam.orderNumber = ''
+      // this.queryParam.supplier = ''
+      this.queryParam = {}
       this.timeRange = []
       this.preDeliveryDate = []
-      this.queryParam.startTime = ''
-      this.queryParam.endTime = ''
-      this.queryParam.preDeliveryDateB = ''
-      this.queryParam.preDeliveryDateE = ''
-      this.queryParam.salesman = ''
-      this.queryParam.itemNumber = ''
-      this.queryParam.refer = ''
-      this.queryParam.isTc = ''
+      this.defalutDate()
+      // this.queryParam.startTime = ''
+      // this.queryParam.endTime = ''
+      // this.queryParam.preDeliveryDateB = ''
+      // this.queryParam.preDeliveryDateE = ''
+      // this.queryParam.salesman = ''
+      // this.queryParam.itemNumber = ''
+      // this.queryParam.refer = ''
+      // this.queryParam.isTc = ''
       // this.queryParam.pageSize = 20
       this.selectedRows = []
       this.selectedRowKeys = []
-      this.queryParam.flourOrGarment = '', //类型
+      // this.queryParam.flourOrGarment = '', //类型
       this.shipmentListData = [] // 渲染 发运明细列表
     },
 
@@ -948,7 +950,7 @@ export default {
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }
-/deep/ .ant-form-item {
-  // margin-bottom: 0 !important;
-}
+// /deep/ .ant-form-item {
+//   // margin-bottom: 0 !important;
+// }
 </style>