Browse Source

[feat]采购管理

采购计划分页查询新增根据创建时间倒叙排序
采购计划前端列表页面新增前端排序按钮
去掉申请人字段和其筛选条件
dev
liuxiaoxu 3 days ago
parent
commit
96bad4b7c6
  1. 1
      ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml
  2. 10
      ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html

1
ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml

@ -42,6 +42,7 @@
<if test="purchasePlanType != null and purchasePlanType != ''"> and purchase_plan_type = #{purchasePlanType}</if> <if test="purchasePlanType != null and purchasePlanType != ''"> and purchase_plan_type = #{purchasePlanType}</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>
order by create_time desc
</select> </select>
<select id="selectPurchasePlanById" parameterType="Long" resultMap="PurchasePlanResult"> <select id="selectPurchasePlanById" parameterType="Long" resultMap="PurchasePlanResult">

10
ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html

@ -25,10 +25,6 @@
<label>关联单号:</label> <label>关联单号:</label>
<input type="text" name="correlationCode"/> <input type="text" name="correlationCode"/>
</li> </li>
<li>
<label>申请人:</label>
<input type="text" name="applyUser"/>
</li>
<li class="select-time"> <li class="select-time">
<label>录入时间:</label> <label>录入时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
@ -86,6 +82,7 @@
detailView: true, detailView: true,
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数 fixedRightNumber: 1, // 冻结右列个数
sortable: true,
onExpandRow : function(index,row,$detail){ onExpandRow : function(index,row,$detail){
$detail.html('<table class="table-container" id="purchase_plan_'+row.id+'"></table>').find('table'); $detail.html('<table class="table-container" id="purchase_plan_'+row.id+'"></table>').find('table');
// 一阶 // 一阶
@ -108,8 +105,9 @@
{title: '作废总数',field: 'cancelSum',}, {title: '作废总数',field: 'cancelSum',},
{title: '不含税总价(RMB)',field: 'noRmbSum',}, {title: '不含税总价(RMB)',field: 'noRmbSum',},
{title: '含税总价(RMB)',field: 'rmbSum',}, {title: '含税总价(RMB)',field: 'rmbSum',},
{title: '申请人',field: 'applyUser',}, {title: '录入时间',field: 'createTime',
{title: '录入时间',field: 'createTime',}, sortable: true,
},
{title: '更新人',field: 'updateBy',}, {title: '更新人',field: 'updateBy',},
{title: '上次更新时间',field: 'updateTime',}, {title: '上次更新时间',field: 'updateTime',},
{title: '操作',align: 'center', {title: '操作',align: 'center',

Loading…
Cancel
Save