初始化

ema-admin/src/main/resources/web/pages/assets/assets_list.html

@@ -33,23 +33,11 @@
             font-weight: 600;
             color: #333;
         }
-        .dict-left .search-box {
+        .dict-left .search-form {
             padding: 10px;
             border-bottom: 1px solid #eee;
             background: #fafafa;
         }
-        .dict-left .search-box .layui-form-item {
-            margin-bottom: 0;
-        }
-        .dict-left .search-box .layui-input-inline {
-            width: calc(100% - 36px);
-            position: relative;
-        }
-        .dict-left .search-box .layui-input {
-            height: 28px;
-            font-size: 12px;
-            padding-right: 24px;
-        }
         .dict-left .search-box .input-clear {
             position: absolute;
             right: 38px;
@@ -202,15 +190,32 @@
                 <span class="title"><i class="layui-icon layui-icon-app"></i> 资产信息</span>
                 <button class="layui-btn layui-btn-xs layui-btn-normal" id="btnAddAsset"><i class="layui-icon layui-icon-add-1"></i></button>
             </div>
-            <div class="search-box">
-                <form class="layui-form" lay-filter="assetSearchForm">
+            <div class="search-form">
+                <form class="layui-form layui-form-pane" lay-filter="assetSearchForm">
                     <div class="layui-form-item" style="margin-bottom: 0;">
-                        <div class="layui-inline" style="width: 100%; display: flex;">
-                            <div class="layui-input-inline" style="position: relative;">
-                                <input type="text" name="assetCode" placeholder="资产编码" class="layui-input" id="assetCodeSearch">
-                                <i class="layui-icon layui-icon-close input-clear" id="inputClear">&#x1006;</i>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <input type="text" name="assetCode" placeholder="资产编码" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <input type="text" name="assetType" placeholder="资产类型" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <input type="text" name="model" placeholder="型号" class="layui-input">
                             </div>
-                            <button type="button" class="layui-btn layui-btn-sm search-btn" id="btnSearchAsset"><i class="layui-icon layui-icon-search"></i></button>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <input type="text" name="deptName" placeholder="管理部门" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <button type="button" class="layui-btn layui-btn-sm" id="btnSearchAsset"><i class="layui-icon layui-icon-search"></i></button>
+                            <button type="reset" class="layui-btn layui-btn-sm layui-btn-primary">重置</button>
                         </div>
                     </div>
                 </form>
@@ -305,10 +310,9 @@
                     <form class="layui-form layui-form-pane" lay-filter="historySearchForm">
                         <div class="layui-form-item" style="margin-bottom: 0;">
                             <div class="layui-inline">
-                                <label class="layui-form-label">使用状态</label>
                                 <div class="layui-input-inline">
                                     <select name="useStatus" class="layui-select">
-                                        <option value="">全部</option>
+                                        <option value="">使用状态</option>
                                         <option value="在库">在库</option>
                                         <option value="正常使用">正常使用</option>
                                         <option value="已转移">已转移</option>
@@ -318,9 +322,8 @@
                                 </div>
                             </div>
                             <div class="layui-inline">
-                                <label class="layui-form-label">使用部门</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="useDept" placeholder="部门" class="layui-input">
+                                    <input type="text" name="useDept" placeholder="使用部门" class="layui-input">
                                 </div>
                             </div>
                             <div class="layui-inline">
@@ -480,9 +483,14 @@
 
             // 搜索资产
             function searchAssetList() {
-                var assetCode = $('#assetCodeSearch').val();
+                var data = form.val('assetSearchForm');
                 table.reload('assetList', {
-                    where: { assetCode: assetCode },
+                    where: {
+                        assetCode: data.assetCode,
+                        assetType: data.assetType,
+                        model: data.model,
+                        deptName: data.deptName
+                    },
                     page: { curr: 1 }
                 });
             }