From 23d0f55489fd50902f7089ed9a1d3dad877a0fda Mon Sep 17 00:00:00 2001
From: yangk <yangk@mesnac.com>
Date: Thu, 18 Jun 2026 14:40:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(asset):=20=E6=B7=BB=E5=8A=A0=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=A4=84=E7=BD=AE=E8=AE=A2=E5=8D=95=E4=B8=AD=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 AmsDisposalOrderMapper.xml 中增加 asset_status 查询条件
- 在 selectAsset.html 页面添加资产状态下拉选择框
- 添加资产状态数据字典初始化到页面 JavaScript
- 在表格列配置中增加资产状态显示及格式化功能
---
 .../mapper/asset/AmsDisposalOrderMapper.xml     |  3 +++
 .../templates/asset/disposal/selectAsset.html   | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ruoyi-asset/src/main/resources/mapper/asset/AmsDisposalOrderMapper.xml b/ruoyi-asset/src/main/resources/mapper/asset/AmsDisposalOrderMapper.xml
index 4a7e15c..d0de6be 100644
--- a/ruoyi-asset/src/main/resources/mapper/asset/AmsDisposalOrderMapper.xml
+++ b/ruoyi-asset/src/main/resources/mapper/asset/AmsDisposalOrderMapper.xml
@@ -261,6 +261,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           <if test="asset.categoryName != null and asset.categoryName != ''">
               and asset.category_name like concat('%', #{asset.categoryName}, '%')
           </if>
+          <if test="asset.assetStatus != null and asset.assetStatus != ''">
+              and asset.asset_status = #{asset.assetStatus}
+          </if>
         order by asset.asset_id
     </select>
 
diff --git a/ruoyi-asset/src/main/resources/templates/asset/disposal/selectAsset.html b/ruoyi-asset/src/main/resources/templates/asset/disposal/selectAsset.html
index a84023d..36124e5 100644
--- a/ruoyi-asset/src/main/resources/templates/asset/disposal/selectAsset.html
+++ b/ruoyi-asset/src/main/resources/templates/asset/disposal/selectAsset.html
@@ -13,6 +13,13 @@
                             <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="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>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()">
                                     <i class="fa fa-search"></i>&nbsp;搜索
@@ -34,6 +41,7 @@
     <script th:inline="javascript">
         var prefix = ctx + "asset/disposal";
         var orderId = [[${orderId}]];
+        var assetStatusDatas = [[${@dict.getType('ams_asset_status')}]];
 
         $(function() {
             var url = prefix + "/availableAssetList";
@@ -55,7 +63,14 @@
                     { field: "specModel", title: "规格型号" },
                     { field: "brand", title: "品牌" },
                     { field: "warehouseName", title: "当前仓库" },
-                    { field: "locationName", title: "当前位置" }
+                    { field: "locationName", title: "当前位置" },
+                    {
+                        field: "assetStatus",
+                        title: "资产状态",
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(assetStatusDatas, value);
+                        }
+                    }
                 ]
             });
         });