收款周期

src/main/java/com/izouma/zhumj/web/sale/SaleBaseController.java

@@ -147,9 +147,7 @@ public class SaleBaseController {
                         if ("6".equals(String.valueOf(value).trim())) {
 
                             and.add(criteriaBuilder.between(root.<LocalDateTime>get("contractEndTime"), LocalDateTime.of(LocalDate.now(), LocalTime.MIN), LocalDateTime.of(LocalDate.now(), LocalTime.MAX)));
-
                         }
-
                     } else {
                         and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
                     }

src/main/vue/src/mixins/pageableTable.js

@@ -37,6 +37,10 @@ export default {
     },
     methods: {
         getData() {
+            console.log(
+                'getData'
+            )
+            console.log(this.$route.query)
             let urlQuery = { ...this.$route.query };
             delete urlQuery.sort;
             delete urlQuery.page;

src/main/vue/src/views/sale/ContractList.vue

@@ -1074,8 +1074,11 @@ export default {
       return valueStr;
     },
     beforeGetData() {
-      if (this.$route.query.customerId != this.customerId) {
-        return;
+
+      if (this.$route.query.customerId) {
+          if (this.$route.query.customerId != this.customerId) {
+              return;
+          }
       }
       let data = {
         query: {

src/main/vue/src/views/sale/CustomerList.vue

@@ -6,7 +6,7 @@
             </el-button>
             <el-input
                 class="filter-item"
-                @change="getData()"
+                @change="onCurrentChange(1)"
                 placeholder="客户名称"
                 v-model="coFullName"
                 clearable>
@@ -297,7 +297,6 @@
             }
         },
         methods: {
-
             cycleLook(row) {
                 this.$router.push({
                     path: '/contractCycleList',