From fc12061f2a513407d6556a7eca4ad9df22eb8e3e Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期四, 23 五月 2024 12:10:55 +0800
Subject: [PATCH] 管材出入库统计_2

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html       |   22 ++++++++++++++++++++--
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html |    4 ++--
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html      |   15 +++++++++++++--
 3 files changed, 35 insertions(+), 6 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 066ac16..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
@@ -24,7 +24,7 @@
                 <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>
@@ -33,7 +33,7 @@
                 <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>
@@ -81,6 +81,17 @@
         });
 
         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;
@@ -99,6 +110,13 @@
             minView: "month",
             autoclose: true
         });
+
+
+
+
+
+
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
index cabd06a..6100e45 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
@@ -34,7 +34,7 @@
                 <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" th:value="${#dates.format(tubLog.outboundDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input id="outboundDateId" name="outboundDate" th:value="${#dates.format(tubLog.outboundDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     </div>
                 </div>
             </div>
@@ -43,7 +43,7 @@
                 <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" th:value="${#dates.format(tubLog.inboundDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input id="inboundDateId" name="inboundDate" th:value="${#dates.format(tubLog.inboundDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     </div>
                 </div>
             </div>
@@ -90,6 +90,17 @@
         });
 
         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()) {
                 $.operate.save(prefix + "/edit", $('#form-TubLog-edit').serialize());
             }
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
index 5c4fb2d..9a3893d 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -31,7 +31,7 @@
             </div>
             <div class="box-header ">
                 <div class="box-title">
-                    <i class="glyphicon glyphicon-map-marker"></i> <a class="afont" th:href="@{/geo/holeLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">閽诲瓟杩涘害鏃ュ織</a>
+                    <i class="glyphicon glyphicon-list-alt"></i> <a class="afont" th:href="@{/geo/holeLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">閽诲瓟杩涘害鏃ュ織</a>
                 </div>
             </div>
             <div class="box-header ">
@@ -46,7 +46,7 @@
             </div>
             <div class="box-header ">
                 <div class="box-title">
-                    <i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鏉愭枡绠$悊</a>
+                    <i class="glyphicon glyphicon-random"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鏉愭枡绠$悊</a>
                 </div>
             </div>
             <div class="box-header ">

--
Gitblit v1.9.1