From 854bb992352772d3c69b47549a709ff57b4944bb Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期四, 23 五月 2024 10:31:30 +0800
Subject: [PATCH] 管材管理_1

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html |   67 +++++++++++++--------------------
 1 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
index 8f51043..97f26b9 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
@@ -11,30 +11,16 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <p>鍑哄叆搴撳崟瀛愬彿锛�</p>
-                                <input type="text" name="code"/>
-                            </li>
-                            <li>
-                                <p>椤圭洰鍚嶇О锛�</p>
-                                <input type="text" name="projectName"/>
-                            </li>
-                            <li>
-                                <p>璁惧鍚嶇О锛�</p>
+                                <p>鍚嶇О锛�</p>
                                 <input type="text" name="deviceName"/>
                             </li>
-                            <li>
-                                <p>鍑哄叆搴撶被鍨嬶細</p>
-                                <select name="type" th:with="type=${@dict.getType('device_log_type')}">
-                                    <option value="">鎵�鏈�</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
+
                             <li>
                                 <p>缁忓姙浜猴細</p>
                                 <input type="text" name="optUser"/>
                             </li>
                             <li>
-                                <p>浣跨敤浜猴細</p>
+                                <p>璐熻矗浜猴細</p>
                                 <input type="text" name="applyUser"/>
                             </li>
                             <li>
@@ -95,42 +81,43 @@
                 },
                 {
                     field : 'code',
-                    title : '鍑哄叆搴撳崟瀛愬彿'
+                    title : '宸ュ崟鍙�',
+                    sortable:true
                 },
-                {
-                    field : 'projectName',
-                    title : '椤圭洰鍚嶇О'
-                },
+
                     {
                         field : 'deviceCode',
-                        title : '璁惧缂栫爜'
+                        title : '缂栧彿',
+                        visible: false
+                    },
+                    {
+                        field : 'deviceName',
+                        title : '鍚嶇О'
+                    },
+
+                    {
+                        field : 'inboundDate',
+                        title : '鍏ュ簱鏃堕棿',
+                        sortable:true
                     },
                 {
-                    field : 'deviceName',
-                    title : '璁惧鍚嶇О'
-                },
-                {
-                    field : 'type',
-                    title : '鍑哄叆搴撶被鍨�',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(typeDatas, value);
-                    }
-                },
-                {
-                    field : 'transactionDate',
-                    title : '鍑哄叆搴撴椂闂�'
+                    field : 'outboundDate',
+                    title : '鍑哄簱鏃堕棿',
+                    sortable:true
                 },
                 {
                     field : 'optUser',
-                    title : '缁忓姙浜�'
+                    title : '缁忓姙浜�',
+                    sortable:true
                 },
                 {
                     field : 'applyUser',
-                    title : '浣跨敤浜�'
+                    title : '璐熻矗浜�',
+                    sortable:true
                 },
                 {
                     field : 'number',
-                    title : '鍑哄叆搴撴暟閲�'
+                    title : '鏁伴噺'
                 },
                 {
                     field : 'remark',
@@ -164,7 +151,7 @@
         <div class="col-xs-offset-1">
             <input type="file" id="file" name="file"/>
             <div class="mt10 pt5">
-                <input type="checkbox" id="updateSupport" name="updateSupport" title="瀵煎叆璁惧鍑哄叆搴撲俊鎭俊鎭�"> 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+                <input type="checkbox" id="updateSupport" name="updateSupport" title="瀵煎叆璁惧鍑哄叆搴撲俊鎭�"> 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
                 <a onclick="importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 涓嬭浇妯℃澘</a>
             </div>
             <font color="red" class="pull-left mt10">

--
Gitblit v1.9.1