mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(sip): 优化产品列表展示 

- 在 DeliveryList 模型中添加 productName 和 description 字段
- 更新 DeliveryListMapper.xml以包含新字段的查询
- 修改前端模板以显示产品名称和描述信息
- 优化页面样式，调整部分元素宽度
master
chenhao 2025-05-23 15:54:19 +08:00
parent 38f2930d61
commit fd05069b40
6 changed files with 22 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
View File

@ -152,6 +152,7 @@
maxmin: false, maxmin: false,
full: false, full: false,
index:1000, index:1000,
width: 1050,
callBack: doClose callBack: doClose
}; };
$.modal.openOptions(options) $.modal.openOptions(options)

8
ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
View File

@ -68,6 +68,14 @@ url: prefix + "/list",
field: 'model', field: 'model',
title: '产品型号' title: '产品型号'
}, },
{
field: 'productName',
title: '产品名称'
},
{
field: 'description',
title: '产品描述'
},
{ {
field: 'serialNumber', field: 'serialNumber',
title: '产品序列号' title: '产品序列号'

5
ruoyi-admin/src/main/resources/templates/system/agent/agent.html
View File

@ -3,6 +3,11 @@
<head> <head>
<th:block th:include="include :: header('办事处信息列表')" /> <th:block th:include="include :: header('办事处信息列表')" />
</head> </head>
<style>
.select-list li p, .select-list li label:not(.radio-box){
width: 80px;
}
</style>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">

3
ruoyi-admin/src/main/resources/templates/system/partner/partner.html
View File

@ -10,6 +10,9 @@
justify-content: flex-start; justify-content: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
} }
.select-list li p, .select-list li label:not(.radio-box){
width: 80px;
}
</style> </style>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">

113
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
View File

@ -4,6 +4,7 @@ import java.util.Date;
import java.util.StringJoiner; import java.util.StringJoiner;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
@ -15,6 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2025-04-11 * @date 2025-04-11
*/ */
@Data
public class DeliveryList extends BaseEntity public class DeliveryList extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -54,115 +56,8 @@ public class DeliveryList extends BaseEntity
// @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd") // @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deletedAt; private Date deletedAt;
private String productName;
private String description;
public String getOrderCode() {
return orderCode;
}
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setDeliveryId(Long deliveryId)
{
this.deliveryId = deliveryId;
}
public Long getDeliveryId()
{
return deliveryId;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public void setSerialNumber(String serialNumber)
{
this.serialNumber = serialNumber;
}
public String getSerialNumber()
{
return serialNumber;
}
public void setCreatedAt(Date createdAt)
{
this.createdAt = createdAt;
}
public Date getCreatedAt()
{
return createdAt;
}
public void setUpdatedAt(Date updatedAt)
{
this.updatedAt = updatedAt;
}
public Date getUpdatedAt()
{
return updatedAt;
}
public void setDeletedAt(Date deletedAt)
{
this.deletedAt = deletedAt;
}
public Date getDeletedAt()
{
return deletedAt;
}
public String getModel() {
return model;
}
public void setModel(String model) {
this.model = model;
}
@Override
public String toString() {
return new StringJoiner(", ", DeliveryList.class.getSimpleName() + "[", "]")
.add("id=" + id)
.add("deliveryId=" + deliveryId)
.add("model=" + model)
.add("orderCode='" + orderCode + "'")
.add("productCode='" + productCode + "'")
.add("serialNumber='" + serialNumber + "'")
.add("remark='" + remark + "'")
.add("createdAt=" + createdAt)
.add("updatedAt=" + updatedAt)
.add("deletedAt=" + deletedAt)
.toString();
}
} }

2
ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
View File

@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select t1.id, t1.delivery_id,t1.product_code, t1.serial_number, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at, select t1.id, t1.delivery_id,t1.product_code, t1.serial_number, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at,
t2.delivery_code, t2.delivery_code,
t3.product_code, t3.product_name,t3.model, t3.product_code, t3.product_name,t3.model,t3.description,
t4.order_code t4.order_code
from delivery_list t1 from delivery_list t1
left join order_delivery t2 on t1.delivery_id = t2.id left join order_delivery t2 on t1.delivery_id = t2.id