From e27f9d475c8732b64dbc863640e25d5253d707f1 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期五, 24 五月 2024 10:45:07 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html
index 3d70b97..8ce903c 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html
@@ -14,26 +14,17 @@
                 </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="tubName" class="form-control" type="text">
+                    <input name="tubName" class="form-control" type="text"  placeholder="璇峰~鍐欐潗鏂欏悕绉�" required>
                 </div>
             </div>
-<!--            <div class="form-group">    -->
-<!--                <label class="col-sm-3 control-label">绫诲瀷锛�</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="type" class="form-control m-b">-->
-<!--                        <option value="">鎵�鏈�</option>-->
-<!--                    </select>-->
-<!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 浠g爜鐢熸垚璇烽�夋嫨瀛楀吀灞炴��</span>-->
-<!--                </div>-->
-<!--            </div>-->
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">鍑哄簱鏃堕棿锛�</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="outboundDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input id="outboundDateId" name="outboundDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     </div>
                 </div>
             </div>
@@ -42,14 +33,14 @@
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="inboundDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input id="inboundDateId" name="inboundDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     </div>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">缁忓姙浜猴細</label>
                 <div class="col-sm-8">
-                    <input name="optUser" class="form-control" type="text">
+                    <input name="optUser" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
@@ -61,13 +52,13 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">鍑哄叆搴撴暟閲忥細</label>
                 <div class="col-sm-8">
-                    <input name="number" class="form-control" type="text">
+                    <input name="number" class="form-control" type="text" placeholder="璇疯緭鍏ュ嚭鍏ュ簱鏁伴噺锛屾暟瀛楃被鍨�" required>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">鏁版嵁鍗曚綅锛�</label>
                 <div class="col-sm-8">
-                    <input name="unit" class="form-control" type="text">
+                    <input name="unit" class="form-control" type="text"  placeholder="渚嬪锛氬惃銆佷欢銆佷釜绛�">
                 </div>
             </div>
             <div class="form-group">
@@ -85,12 +76,22 @@
         var projectId = [[${projectId}]];
         var code = [[${code}]];
 
-
         $("#form-TubLog-add").validate({
             focusCleanup: true
         });
 
         function submitHandler() {
+            let inboundDateValue = $("#inboundDateId").val();
+            let outboundDateValue = $("#outboundDateId").val();
+            if ($.common.isEmpty(inboundDateValue) && $.common.isEmpty(outboundDateValue)) {
+                $.modal.alertWarning("鍑哄叆搴撴椂闂达紝璇烽�夋嫨涓�鏉¤褰�");
+                return;
+            }
+            if (!$.common.isEmpty(inboundDateValue) && !$.common.isEmpty(outboundDateValue)) {
+                $.modal.alertWarning("鍑哄叆搴撴椂闂达紝璇烽�夋嫨涓�鏉¤褰�");
+                return;
+            }
+
             if ($.validate.form()) {
                 let formData = $('#form-TubLog-add').serialize();
                 let data = formData + "&projectId=" + projectId + "&code=" + code;
@@ -109,6 +110,13 @@
             minView: "month",
             autoclose: true
         });
+
+
+
+
+
+
+
     </script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1