From c6f0d63715e11b51a4d25d5b24b5f5dc16e69737 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 9 Sep 2024 13:05:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/basis/ExperimentalMapper.xml      |  4 +--
 .../js/basis/standard/child/testForm.js       | 23 ++++++---------
 .../js/basis/standard/child/testUpdateForm.js |  5 ++--
 .../pages/basic/standard/child/testCheck.html | 29 -------------------
 4 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index dc03ea9..c398cbc 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -373,8 +373,8 @@
     <!--查询试验模板数据、基础数据-->
     <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(ts.sample_date,INTERVAL a.times YEAR), '%Y-%m-%d') AS nextExperTime,
-               tec.times AS times,
+               DATE_FORMAT(DATE_ADD(now(),INTERVAL a.times YEAR), '%Y-%m-%d') AS nextExperTime,
+               a.times AS times,
                custom_id AS customId,
                custom_name AS customName,
                a.id AS configId,
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 b7715ad..ae5bcb4 100644
--- a/src/main/resources/static/js/basis/standard/child/testForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testForm.js
@@ -5,10 +5,9 @@ let data = [], appResList = [];
 // 角色下拉选
 let roleList;
 let orgData;
-
+let timeTemp = 0;
 var cols = []; // 初始化为空，因为我们将动态构建表头
 function setParams(params) {
-    console.log(params)
     experIdParam = JSON.parse(params).experId;
     sampleIdParam = JSON.parse(params).sampleId;
     devTypeCodeParam = JSON.parse(params).devTypeCode;
@@ -34,11 +33,6 @@ function setParams(params) {
             elem: '#sampleDate'
         });
 
-
-        laydate.render({
-            elem: '#nextExperTime'
-        });
-
         laydate.render({
             elem: '#devContractDate'
         });
@@ -93,17 +87,12 @@ function setParams(params) {
         laydate.render({
             elem: '#experTime',
             value: today,
-            done: function(value,data){
-
+            done:  function(value,data){
                 // console.log(data);
                 var dateInput = document.getElementById('experTime').value;
-                var nextInput = document.getElementById('nextExperTime').value;
-                var dateYear = dateInput.split('-')[0];
-                var nextYear = nextInput.split('-')[0];
-                var yearTemp = nextYear-dateYear;
                 if(dateInput){
                     var date = new Date(dateInput);
-                    var yearsToAdd = yearTemp;
+                    var yearsToAdd = timeTemp;
                     date.setFullYear(date.getFullYear() + yearsToAdd);
 
                     var year = date.getFullYear();
@@ -116,6 +105,10 @@ function setParams(params) {
             }
         });
 
+        laydate.render({
+            elem: '#nextExperTime',
+        });
+
         form.on('submit(formData)', function (data) {
             saveData(data);
         });
@@ -319,6 +312,7 @@ function itemNameDel(num) {
         layer.msg('至少保留一个试验设备信息');
     }
 }*/
+
 //新增试验依据
 function basisAdd() {
     // 获取当前已有的类元素
@@ -713,6 +707,7 @@ function setFormData(data) {
         //试验日期
         // $('#experTime').val(data.experTime);
 
+        timeTemp = data.times;
         //下次试验日期
         $('#nextExperTime').val(data.nextExperTime);
 
diff --git a/src/main/resources/static/js/basis/standard/child/testUpdateForm.js b/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
index 8623693..3658755 100644
--- a/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
@@ -1,4 +1,3 @@
-
 //修改前的传参
 function getTestViewById(){
     let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
@@ -47,6 +46,8 @@ function setFormUpadteData(data) {
         //试验日期
         $('#experTime').val(data.experTime);
 
+        timeTemp = data.times;
+
         //下次试验日期
         $('#nextExperTime').val(data.nextExperTime);
 
@@ -185,4 +186,4 @@ function setTableData(data){
             }
         }
     });
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/static/pages/basic/standard/child/testCheck.html b/src/main/resources/static/pages/basic/standard/child/testCheck.html
index 8215e81..f1082bd 100644
--- a/src/main/resources/static/pages/basic/standard/child/testCheck.html
+++ b/src/main/resources/static/pages/basic/standard/child/testCheck.html
@@ -134,35 +134,6 @@
                     <input type="text" id="nextExperTime" name="nextExperTime" lay-verify="required" style="background-color: #f0f0f0;" class="layui-input" placeholder="请选择下次试验日期" disabled/>
                 </div>
             </div>
-
-            <script>
-                layui.use(['form'],function() {
-                    var form = layui.form;
-                    // laydate.render({
-                    //     elem: '#experTime',
-                    //     type: 'date',
-                    // });
-                    document.addEventListener('DOMContentLoaded',function(){
-                        document.getElementById('experTime').addEventListener('change', function () {
-                            console.log(11111111)
-                            var dateInput = document.getElementById('experTime').value;
-                            console.log(dateInput);
-                            if (dateInput) {
-                                var date = new Date(dateInput);
-                                var yearsToAdd = document.getElementById('times').value;
-                                date.setFullYear(date.getFullYear() + yearsToAdd);
-
-                                var year = date.getFullYear();
-                                var mouth = ('0' + (date.getMonth() + 1)).slice(-2);
-                                var day = ('0' + date.getDate()).slice(-2);
-                                var newDate = '${year}-${mouth}-${day}';
-                                console.log(newDate);
-                                document.getElementById('nextExperTime').value = newDate;
-                            }
-                        })
-                    })
-                })
-            </script>
         </div>