diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java
index dbf77414..f2328b2d 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java
@@ -46,6 +46,10 @@ public class CrmContract extends BaseEntity {
* 签订时间
*/
private Date signTime;
+ /**
+ * 交货日期
+ */
+ private Date deliveryDate;
/**
* 签订地点
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java
index 8fe63959..9983d945 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java
@@ -1,5 +1,6 @@
package com.klp.crm.domain.bo;
+import org.springframework.format.annotation.DateTimeFormat;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -49,6 +50,13 @@ public class CrmContractBo extends BaseEntity {
*/
private Date signTime;
+ /**
+ * 交货日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date deliveryDate;
+
/**
* 签订地点
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java
index dbb36b1e..2f3dae2c 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java
@@ -57,6 +57,11 @@ public class CrmContractVo {
@ExcelProperty(value = "签订时间")
private Date signTime;
+ /**
+ * 交货日期
+ */
+ @ExcelProperty(value = "交货日期")
+ private Date deliveryDate;
/**
* 签订地点
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java
index 0c3a790c..81b8827d 100644
--- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java
+++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java
@@ -66,6 +66,7 @@ public class CrmContractServiceImpl implements ICrmContractService {
lqw.eq(StringUtils.isNotBlank(bo.getSupplier()), CrmContract::getSupplier, bo.getSupplier());
lqw.eq(StringUtils.isNotBlank(bo.getCustomer()), CrmContract::getCustomer, bo.getCustomer());
lqw.eq(bo.getSignTime() != null, CrmContract::getSignTime, bo.getSignTime());
+ lqw.eq(bo.getDeliveryDate() != null, CrmContract::getDeliveryDate, bo.getDeliveryDate());
lqw.eq(StringUtils.isNotBlank(bo.getSignLocation()), CrmContract::getSignLocation, bo.getSignLocation());
lqw.eq(StringUtils.isNotBlank(bo.getProductContent()), CrmContract::getProductContent, bo.getProductContent());
lqw.eq(StringUtils.isNotBlank(bo.getContractContent()), CrmContract::getContractContent, bo.getContractContent());
diff --git a/klp-crm/src/main/resources/mapper/CrmContractMapper.xml b/klp-crm/src/main/resources/mapper/CrmContractMapper.xml
index e198280e..b44d91b2 100644
--- a/klp-crm/src/main/resources/mapper/CrmContractMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmContractMapper.xml
@@ -10,6 +10,7 @@
+
diff --git a/klp-ui/src/components/Pagination/index.vue b/klp-ui/src/components/Pagination/index.vue
index 64c8f8d1..51d35be3 100644
--- a/klp-ui/src/components/Pagination/index.vue
+++ b/klp-ui/src/components/Pagination/index.vue
@@ -1,5 +1,5 @@
-