From c6f79f5720c5d4a700b8b759a93393559409fd1c Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期一, 20 五月 2024 15:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
index 3e47423..49f4689 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
@@ -9,23 +9,17 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">鍑哄叆搴撳崟瀛愬彿锛�</label>
                 <div class="col-sm-8">
-                    <input name="code" class="form-control" type="text">
+                    <input name="code" th:value="${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" 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" 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}"></option>
@@ -33,9 +27,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" class="form-control" type="text">
+                    <input name="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" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
@@ -45,7 +45,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" class="form-control" type="text">
                 </div>
@@ -56,18 +56,29 @@
                     <input name="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" name="remark" class="form-control"></textarea>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var prefix = ctx + "geo/deviceLog"
+        var projectId = [[${projectId}]];
+        var code = [[${code}]];
+
         $("#form-deviceLog-add").validate({
             focusCleanup: true
         });
 
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-deviceLog-add').serialize());
+                let formData = $('#form-deviceLog-add').serialize();
+                let data = formData + "&projectId=" + projectId + "&code=" + code;
+                $.operate.save(prefix + "/add", data);
             }
         }
     </script>

--
Gitblit v1.9.1