Browse Source

[fix] 销售管理

修复销售估价的客户ID支持模糊查询
修改销售估价的前端页面table自适应文本内容的大小,冻结最左侧和最右侧第一列
dev
liuxiaoxu 3 months ago
parent
commit
6110a3eb57
  1. 2
      ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateMapper.xml
  2. 7
      ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html

2
ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateMapper.xml

@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="salesEstimateCode != null and salesEstimateCode != ''"> and sales_estimate_code like concat('%', #{salesEstimateCode}, '%')</if> <if test="salesEstimateCode != null and salesEstimateCode != ''"> and sales_estimate_code like concat('%', #{salesEstimateCode}, '%')</if>
<if test="businessMembers != null and businessMembers != ''"> and business_members = #{businessMembers}</if> <if test="businessMembers != null and businessMembers != ''"> and business_members = #{businessMembers}</if>
<if test="estimateStatus != null and estimateStatus != ''"> and estimate_status = #{estimateStatus}</if> <if test="estimateStatus != null and estimateStatus != ''"> and estimate_status = #{estimateStatus}</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and enterprise_code = #{enterpriseCode}</if> <if test="enterpriseCode != null and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%') </if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if> <if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if> <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where> </where>

7
ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html

@ -57,7 +57,7 @@
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table" style="white-space:nowrap"></table>
</div> </div>
</div> </div>
</div> </div>
@ -86,6 +86,10 @@
cancelUrl: prefix + "/cancel/{id}", cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}", restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
sortStable: true, // 设置为 true 将获得稳定的排序
fixedColumns: true, // 启用冻结列
rightFixedColumns:1,
fixedRightNumber: 1, // 冻结右列个数
modalName: "销售估价", modalName: "销售估价",
columns: [{ columns: [{
checkbox: true checkbox: true
@ -160,6 +164,7 @@
{ {
title: '录入时间', title: '录入时间',
field: 'createTime', field: 'createTime',
sortable: true
}, },
{ {
title: '更新人', title: '更新人',

Loading…
Cancel
Save