feat(asset): 添加资产处置订单中资产状态筛选功能

- 在 AmsDisposalOrderMapper.xml 中增加 asset_status 查询条件
- 在 selectAsset.html 页面添加资产状态下拉选择框
- 添加资产状态数据字典初始化到页面 JavaScript
- 在表格列配置中增加资产状态显示及格式化功能
main
yangk 3 weeks ago
parent 74f59462b7
commit 23d0f55489

@ -261,6 +261,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="asset.categoryName != null and asset.categoryName != ''"> <if test="asset.categoryName != null and asset.categoryName != ''">
and asset.category_name like concat('%', #{asset.categoryName}, '%') and asset.category_name like concat('%', #{asset.categoryName}, '%')
</if> </if>
<if test="asset.assetStatus != null and asset.assetStatus != ''">
and asset.asset_status = #{asset.assetStatus}
</if>
order by asset.asset_id order by asset.asset_id
</select> </select>

@ -13,6 +13,13 @@
<li><label>资产编码:</label><input type="text" name="assetCode"></li> <li><label>资产编码:</label><input type="text" name="assetCode"></li>
<li><label>资产名称:</label><input type="text" name="assetName"></li> <li><label>资产名称:</label><input type="text" name="assetName"></li>
<li><label>资产类别:</label><input type="text" name="categoryName"></li> <li><label>资产类别:</label><input type="text" name="categoryName"></li>
<li>
<label>资产状态:</label>
<select name="assetStatus" th:with="type=${@dict.getType('ams_asset_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()">
<i class="fa fa-search"></i>&nbsp;搜索 <i class="fa fa-search"></i>&nbsp;搜索
@ -34,6 +41,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "asset/disposal"; var prefix = ctx + "asset/disposal";
var orderId = [[${orderId}]]; var orderId = [[${orderId}]];
var assetStatusDatas = [[${@dict.getType('ams_asset_status')}]];
$(function() { $(function() {
var url = prefix + "/availableAssetList"; var url = prefix + "/availableAssetList";
@ -55,7 +63,14 @@
{ field: "specModel", title: "规格型号" }, { field: "specModel", title: "规格型号" },
{ field: "brand", title: "品牌" }, { field: "brand", title: "品牌" },
{ field: "warehouseName", title: "当前仓库" }, { field: "warehouseName", title: "当前仓库" },
{ field: "locationName", title: "当前位置" } { field: "locationName", title: "当前位置" },
{
field: "assetStatus",
title: "资产状态",
formatter: function(value, row, index) {
return $.table.selectDictLabel(assetStatusDatas, value);
}
}
] ]
}); });
}); });

Loading…
Cancel
Save