Browse Source

[fix]

客户资料添加页面的国内税率新增 ”%“作为结尾
客户资料列表页面 table开启排序,录入时间作为排序字段
dev
liuxiaoxu 3 weeks ago
parent
commit
d5a9cb911a
  1. 2
      ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
  2. 5
      ruoyi-admin/src/main/resources/templates/system/customer/add.html
  3. 2
      ruoyi-admin/src/main/resources/templates/system/customer/customer.html

2
ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml

@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="enterpriseCode != null and enterpriseCode != ''"> and s.enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and s.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="customerPurser != null and customerPurser != ''"> and s.customer_purser like concat('%', #{customerPurser}, '%')</if>
<if test="customerAbbreviation != null and customerAbbreviation != ''"> and s.customer_abbreviation like concat('%', #{customer_abbreviation}, '%')</if>
<if test="customerAbbreviation != null and customerAbbreviation != ''"> and s.customer_abbreviation like concat('%', #{customerAbbreviation}, '%')</if>
<if test="deliveryAddress != null and deliveryAddress != ''"> and s.delivery_address like concat('%', #{deliveryAddress}, '%')</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and s.first_add_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
<if test="customerSign != null and customerSign != ''"> and s.customer_sign = #{customerSign}</if>

5
ruoyi-admin/src/main/resources/templates/system/customer/add.html

@ -155,7 +155,10 @@
<div class="form-group">
<label class="col-sm-6 control-label is-required" id="taxLable">国内税率:</label>
<div class="col-sm-6">
<input name="taxRate" class="form-control" placeholder="%" type="text" required/>
<div class="input-group">
<input name="taxRate" class="form-control" type="text" required/>
<span class="input-group-addon">%<i class="fa fa-percentage"></i></span>
</div>
</div>
</div>
<div class="form-group">

2
ruoyi-admin/src/main/resources/templates/system/customer/customer.html

@ -418,6 +418,7 @@
restoreUrl: prefix + "/restore/{id}",
modalName: "客户基本信息",
fixedColumns:true,
sortable: true,//开启排序
fixedRightNumber:1,
columns: [
{checkbox: true},
@ -504,6 +505,7 @@
{title: '第一收货人传真',field: 'deliveryCustomerFax',visible: false},
{title: '客户标识',field:'customerSign'},
{title: '录入时间',field: 'createTime',
sortable: true,
formatter: function (value, row, index) {
if (value == null) {return " ";} else { return value;}
}

Loading…
Cancel
Save