From 8722d2bb39c6c0697647e77a879d14b28d3ef0f5 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 19:16:36 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 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..ce46554 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
@@ -15,15 +15,11 @@
<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>
+ <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>
@@ -34,7 +30,7 @@
<input type="text" name="optUser"/>
</li>
<li>
- <p>浣跨敤浜猴細</p>
+ <p>璐熻矗浜猴細</p>
<input type="text" name="applyUser"/>
</li>
<li>
@@ -99,26 +95,32 @@
},
{
field : 'projectName',
- title : '椤圭洰鍚嶇О'
+ title : '鍦哄湴鍚嶇О',
+ visible: false
},
{
field : 'deviceCode',
- title : '璁惧缂栫爜'
+ title : '缂栧彿',
+ visible: false
+ },
+ {
+ field : 'deviceName',
+ title : '鍚嶇О'
},
{
- field : 'deviceName',
- title : '璁惧鍚嶇О'
- },
- {
field : 'type',
- title : '鍑哄叆搴撶被鍨�',
+ title : '璁惧/鏉愭枡绫诲瀷',
formatter: function(value, row, index) {
return $.table.selectDictLabel(typeDatas, value);
}
},
+ {
+ field : 'inboundDate',
+ title : '鍏ュ簱鏃堕棿'
+ },
{
- field : 'transactionDate',
- title : '鍑哄叆搴撴椂闂�'
+ field : 'outboundDate',
+ title : '鍑哄簱鏃堕棿'
},
{
field : 'optUser',
@@ -126,11 +128,11 @@
},
{
field : 'applyUser',
- title : '浣跨敤浜�'
+ title : '璐熻矗浜�'
},
{
field : 'number',
- title : '鍑哄叆搴撴暟閲�'
+ title : '鏁伴噺'
},
{
field : 'remark',
@@ -164,7 +166,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