change - 记录完善

ruoyi-admin/src/main/resources/templates/system/recordtask/recordtask.html

@@ -18,6 +18,20 @@
                                 <label>箱体编码：</label>
                                 <input type="text" name="boxCode"/>
                             </li>
+                            <li>
+                                <label>所属仓库：</label>
+                                <select name="storeCode" th:with="type=${@dict.getType('store_code')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>库位区域：</label>
+                                <select name="locationArea" th:with="type=${@dict.getType('location_info')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <label>任务状态：</label>
                                 <select name="taskStatus" th:with="type=${@dict.getType('task_status')}">
@@ -85,6 +99,9 @@
 
         var locationStatus = [[${@dict.getType('location_status')}]];
 
+        var storeCodeDatas = [[${@dict.getType('store_code')}]];
+        var locationAreaDatas = [[${@dict.getType('location_info')}]];
+
         var prefix = ctx + "system/recordtask";
 
         $(function() {
@@ -119,18 +136,24 @@
                     field: 'materialType',
                     title: '物料类型'
                 },
-                {
-                    field: 'storeCode',
-                    title: '仓库编码'
-                },
-                {
-                    field: 'locationCode',
-                    title: '库位编码'
-                },
-                {
-                    field: 'locationArea',
-                    title: '库位区域'
-                },
+                    {
+                        field: 'storeCode',
+                        title: '所属仓库',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(storeCodeDatas, value);
+                        }
+                    },
+                    {
+                        field: 'locationCode',
+                        title: '库位编码'
+                    },
+                    {
+                        field: 'locationArea',
+                        title: '库位区域',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(locationAreaDatas, value);
+                        }
+                    },
                     {
                         field: 'operationType',
                         title: '操作类型',