Browse Source

[feat]

工程管理 物料信息
新增物料mapper查询列表方法按审核状态和创建时间排序语句;
新增物料列表页面表格排序属性;
dev
王晓迪 3 months ago
parent
commit
3f0f1bd5f8
  1. 2
      ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
  2. 4
      ruoyi-admin/src/main/resources/templates/erp/material/material.html

2
ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml

@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="supplierId != null and supplierId != ''"> and erp.supplier_id = #{supplierId}</if> <if test="supplierId != null and supplierId != ''"> and erp.supplier_id = #{supplierId}</if>
<if test="businessMembers != null and businessMembers != ''"> and erp.business_members = #{businessMembers}</if> <if test="businessMembers != null and businessMembers != ''"> and erp.business_members = #{businessMembers}</if>
</where> </where>
order by erp.create_time desc order by erp.audit_status asc, erp.create_time desc
</select> </select>
<select id="selectErpMaterialById" parameterType="Long" resultMap="ErpMaterialResult"> <select id="selectErpMaterialById" parameterType="Long" resultMap="ErpMaterialResult">

4
ruoyi-admin/src/main/resources/templates/erp/material/material.html

@ -126,6 +126,8 @@
pageList: [10, 25, 50], pageList: [10, 25, 50],
pageSize: 10, pageSize: 10,
showColumns: true, showColumns: true,
sortable: true, // 是否启用排序
sortStable: true,
modalName: "物料信息", modalName: "物料信息",
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数 fixedRightNumber: 1, // 冻结右列个数
@ -151,7 +153,7 @@
{title: '<span style="color: red;">申请人</span>',field: 'applyUserName', {title: '<span style="color: red;">申请人</span>',field: 'applyUserName',
formatter: function(value, row, index) {return '<span style="color: red;">' + (value ? value : "-") + '</span>';} formatter: function(value, row, index) {return '<span style="color: red;">' + (value ? value : "-") + '</span>';}
}, },
{title: '申请时间',field: 'applyTime',}, {title: '申请时间',field: 'applyTime',sortable: true,},
{title: '上次更新时间',field: 'updateTime',}, {title: '上次更新时间',field: 'updateTime',},
{title: '当前状态',field: 'taskName',align: 'center', {title: '当前状态',field: 'taskName',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {

Loading…
Cancel
Save