From 8fcc4280e07102e8f430e30c5b2332a7372462c5 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Sun, 29 Sep 2024 11:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=AC=A1=E6=A3=80=E6=B5=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=91=A8=E6=9C=9F=E6=94=B9=E4=B8=BA=E6=9C=88=E4=BB=BD?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/basis/ExperimentalMapper.xml     |  4 ++--
 .../static/js/basis/standard/child/testForm.js         | 10 ++++++----
 .../pages/basic/tools/child/addTestStandards.html      |  4 ++--
 .../pages/basic/tools/child/checkTestStandards.html    |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index 4008974..5e7a0c5 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -373,7 +373,7 @@
     <!--查询试验模板数据、基础数据-->
     <select id="getTestBasicInfo" resultType="com.bonus.aqgqj.basis.entity.vo.TestVo">
         SELECT DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
-               DATE_FORMAT(DATE_ADD(now(),INTERVAL a.times YEAR), '%Y-%m-%d') AS nextExperTime,
+               DATE_FORMAT(DATE_ADD(now(),INTERVAL a.times Month), '%Y-%m-%d') AS nextExperTime,
                a.times AS times,
                custom_id AS customId,
                custom_name AS customName,
@@ -424,7 +424,7 @@
                te.dev_module AS devModule,
                te.sample_date AS sampleDate,
                DATE_FORMAT(te.exper_time, '%Y-%m-%d') AS experTime,
-               DATE_FORMAT(DATE_ADD(te.exper_time,INTERVAL tec.times YEAR), '%Y-%m-%d') AS nextExperTime,
+               DATE_FORMAT(DATE_ADD(te.exper_time,INTERVAL tec.times Month), '%Y-%m-%d') AS nextExperTime,
                tec.times AS times,
                te.submit_unit AS customId,
                tc.custom_name AS customName,
diff --git a/src/main/resources/static/js/basis/standard/child/testForm.js b/src/main/resources/static/js/basis/standard/child/testForm.js
index ae5bcb4..0150b46 100644
--- a/src/main/resources/static/js/basis/standard/child/testForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testForm.js
@@ -86,15 +86,17 @@ function setParams(params) {
 
         laydate.render({
             elem: '#experTime',
+            showBottom:false,
             value: today,
             done:  function(value,data){
                 // console.log(data);
                 var dateInput = document.getElementById('experTime').value;
                 if(dateInput){
                     var date = new Date(dateInput);
-                    var yearsToAdd = timeTemp;
-                    date.setFullYear(date.getFullYear() + yearsToAdd);
-
+                    var yearsToAdd = timeTemp
+                    var month = date.getMonth() +1
+                    // date.setFullYear(date.getFullYear() + yearsToAdd);
+                    date.setMonth(date.getMonth() + yearsToAdd)
                     var year = date.getFullYear();
                     var mouth = ('0' + (date.getMonth() +1)).slice(-2);
                     var day = ('0' + date.getDate()).slice(-2);
@@ -869,4 +871,4 @@ function closePage(type) {
     if (type === 1) {
         parent.reloadData()
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
index 5e146e0..feb6b67 100644
--- a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
+++ b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
@@ -142,7 +142,7 @@
                            lay-verify="required" oninput="updateAmountTwo(this)" />
                 </div>
                 <div class="layui-input-inlineTwo" >
-                    <span style="display: flex;margin: 10px 10px;">年</span>
+                    <span style="display: flex;margin: 10px 10px;">月</span>
                 </div>
             </div>
             <div class="layui-inline">
@@ -207,4 +207,4 @@
 </body>
 <script src="../../../../js/basis/tools/child/addTestStandards.js" charset="UTF-8" type="text/javascript"></script>
 <script src="../../../../js/basis/tools/child/select.js" charset="UTF-8" type="text/javascript"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html b/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html
index 7615bd7..951a4b1 100644
--- a/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html
+++ b/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html
@@ -140,7 +140,7 @@
                            lay-verify="required" oninput="updateAmountTwo(this)"/>
                 </div>
                 <div class="layui-input-inlineTwo" >
-                    <span style="display: flex;margin: 10px 10px;">年</span>
+                    <span style="display: flex;margin: 10px 10px;">月</span>
                 </div>
             </div>
 <!--            <div class="btn-box">-->
@@ -203,4 +203,4 @@
 </body>
 <script src="../../../../js/basis/tools/child/checkTestStandards.js" charset="UTF-8" type="text/javascript"></script>
 <script src="../../../../js/basis/tools/child/select.js" charset="UTF-8" type="text/javascript"></script>
-</html>
\ No newline at end of file
+</html>