Browse Source

[fix]销售管理

修改销售出货资料前端页面,表头样式采用统一样式处理
修改出货资料后端分页查询接口,出货资料单号、销售单号、出库单号、业务员都改成模糊查询
dev
liuxiaoxu 2 weeks ago
parent
commit
49cc2bd890
  1. 8
      ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml
  2. 2
      ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/salesShippingInformation.html

8
ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml

@ -47,13 +47,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSalesShippingInformationList" parameterType="SalesShippingInformation" resultMap="SalesShippingInformationResult"> <select id="selectSalesShippingInformationList" parameterType="SalesShippingInformation" resultMap="SalesShippingInformationResult">
<include refid="selectSalesShippingInformationVo"/> <include refid="selectSalesShippingInformationVo"/>
<where> <where>
<if test="shippingInformationCode != null and shippingInformationCode != ''"> and shipping_information_code = #{shippingInformationCode}</if> <if test="shippingInformationCode != null and shippingInformationCode != ''"> and shipping_information_code like concat('%', #{shippingInformationCode}, '%') </if>
<if test="salesOrderCode != null and salesOrderCode != ''"> and sales_order_code = #{salesOrderCode}</if> <if test="salesOrderCode != null and salesOrderCode != ''"> and sales_order_code like concat('%', #{salesOrderCode}, '%')</if>
<if test="outOrderCode != null and outOrderCode != ''"> and out_order_code = #{outOrderCode}</if> <if test="outOrderCode != null and outOrderCode != ''"> and out_order_code like concat('%', #{outOrderCode}, '%')</if>
<if test="shippingInformationType != null and shippingInformationType != ''"> and shipping_information_type = #{shippingInformationType}</if> <if test="shippingInformationType != null and shippingInformationType != ''"> and shipping_information_type = #{shippingInformationType}</if>
<if test="warehouseOrderType != null and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if> <if test="warehouseOrderType != null and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if>
<if test="warehouseOutType != null and warehouseOutType != ''"> and warehouse_out_type = #{warehouseOutType}</if> <if test="warehouseOutType != null and warehouseOutType != ''"> and warehouse_out_type = #{warehouseOutType}</if>
<if test="businessMembers != null and businessMembers != ''"> and business_members = #{businessMembers}</if> <if test="businessMembers != null and businessMembers != ''"> and business_members like concat('%', #{businessMembers}, '%')</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>
</select> </select>

2
ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/salesShippingInformation.html

@ -63,7 +63,7 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="sales:salesShippingInformation:export"> <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="sales:salesShippingInformation:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>

Loading…
Cancel
Save