feat(contract): 新增合同预览和列表组件

refactor(QRCode): 优化二维码组件并修复空值检查
将QRCode组件从print目录移动到components目录,并添加空值检查防止错误

feat(crm): 在合同模型中添加交货日期字段
在CrmContract、CrmContractVo、CrmContractBo及相关Mapper中添加deliveryDate字段

refactor(wms): 统一使用全局QRCode组件路径
将多个文件中的QRCode引用路径从相对路径改为@/components/QRCode

style(order): 调整订单页面标签顺序
调整操作记录和发货配卷标签的顺序

chore: 删除废弃的打印相关文件
移除print目录下不再使用的QRCode、CodeRenderer等组件和页面
This commit is contained in:
砂糖
2026-04-01 10:44:51 +08:00
parent 800cf0c8d1
commit f959f97099
26 changed files with 655 additions and 3244 deletions

View File

@@ -46,6 +46,10 @@ public class CrmContract extends BaseEntity {
* 签订时间
*/
private Date signTime;
/**
* 交货日期
*/
private Date deliveryDate;
/**
* 签订地点
*/

View File

@@ -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;
/**
* 签订地点
*/

View File

@@ -57,6 +57,11 @@ public class CrmContractVo {
@ExcelProperty(value = "签订时间")
private Date signTime;
/**
* 交货日期
*/
@ExcelProperty(value = "交货日期")
private Date deliveryDate;
/**
* 签订地点
*/

View File

@@ -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());

View File

@@ -10,6 +10,7 @@
<result property="contractNo" column="contract_no"/>
<result property="supplier" column="supplier"/>
<result property="customer" column="customer"/>
<result property="deliveryDate" column="delivery_date"/>
<result property="signTime" column="sign_time"/>
<result property="signLocation" column="sign_location"/>
<result property="productContent" column="product_content"/>