From 306749fa2e6ea7609468889cb56473770d0a26cc Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期六, 18 五月 2024 14:44:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
index 0dc7b9c..7acdb17 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
@@ -10,23 +10,17 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">鍑哄叆搴撳崟瀛愬彿锛�</label>
                 <div class="col-sm-8">
-                    <input name="code" th:field="*{code}" class="form-control" type="text">
+                    <input name="code" th:field="*{code}" class="form-control" type="text" disabled="disabled">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
-                <div class="col-sm-8">
-                    <input name="projectName" th:field="*{projectName}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">璁惧鍚嶇О锛�</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">鍚嶇О锛�</label>
                 <div class="col-sm-8">
                     <input name="deviceName" th:field="*{deviceName}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">鍑哄叆搴撶被鍨嬶細</label>
+                <label class="col-sm-3 control-label">绫诲瀷锛�</label>
                 <div class="col-sm-8">
                     <select name="type" class="form-control m-b" th:with="type=${@dict.getType('device_log_type')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
@@ -34,9 +28,15 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">鍑哄叆搴撴椂闂达細</label>
+                <label class="col-sm-3 control-label">鍏ュ簱鏃堕棿锛�</label>
                 <div class="col-sm-8">
-                    <input name="transactionDate" th:field="*{transactionDate}" class="form-control" type="text">
+                    <input name="inboundDate" th:field="*{inboundDate}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">鍑哄簱鏃堕棿锛�</label>
+                <div class="col-sm-8">
+                    <input name="outboundDate" th:field="*{outboundDate}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
@@ -46,7 +46,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">浣跨敤浜猴細</label>
+                <label class="col-sm-3 control-label">璐熻矗浜猴細</label>
                 <div class="col-sm-8">
                     <input name="applyUser" th:field="*{applyUser}" class="form-control" type="text">
                 </div>
@@ -57,6 +57,13 @@
                     <input name="number" th:field="*{number}" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">澶囨敞锛�</label>
+                <div class="col-sm-8">
+                    <textarea id="remark" th:field="*{remark}" name="remark" class="form-control"></textarea>
+                </div>
+            </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />

--
Gitblit v1.9.1