From fe37c2b14b5d772621d4fab29586c0df9506df07 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 9 Sep 2024 12:04:42 +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

---
 .../bonus/aqgqj/basis/entity/vo/TestVo.java   |  6 ++++
 .../mappers/basis/ExperimentalMapper.xml      |  2 ++
 .../js/basis/standard/child/testForm.js       | 32 ++++++++++++++---
 .../js/basis/standard/child/testUpdateForm.js |  3 +-
 .../pages/basic/standard/child/testCheck.html | 35 +++++++++++++++++--
 .../basic/tools/child/addTestStandards.html   |  5 ++-
 .../basic/tools/child/checkTestStandards.html |  5 ++-
 7 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java
index 7900b72..b461f60 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java
@@ -181,6 +181,12 @@ public class TestVo {
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String paramsData;
 
+    /**
+     * 试验周期
+     */
+    private Integer times;
+
+
     /**
      * 记录编号
      * */
diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index f2ddea8..dc03ea9 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -374,6 +374,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(ts.sample_date,INTERVAL a.times YEAR), '%Y-%m-%d') AS nextExperTime,
+               tec.times AS times,
                custom_id AS customId,
                custom_name AS customName,
                a.id AS configId,
@@ -424,6 +425,7 @@
                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,
+               tec.times AS times,
                te.submit_unit AS customId,
                tc.custom_name AS customName,
                te.submit_location AS experLocal,
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 4a8a5e5..b7715ad 100644
--- a/src/main/resources/static/js/basis/standard/child/testForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testForm.js
@@ -8,6 +8,7 @@ let orgData;
 
 var cols = []; // 初始化为空，因为我们将动态构建表头
 function setParams(params) {
+    console.log(params)
     experIdParam = JSON.parse(params).experId;
     sampleIdParam = JSON.parse(params).sampleId;
     devTypeCodeParam = JSON.parse(params).devTypeCode;
@@ -33,10 +34,6 @@ function setParams(params) {
             elem: '#sampleDate'
         });
 
-        laydate.render({
-            elem: '#experTime',
-            value: today
-        });
 
         laydate.render({
             elem: '#nextExperTime'
@@ -93,6 +90,32 @@ function setParams(params) {
             getTestViewById();
         }
 
+        laydate.render({
+            elem: '#experTime',
+            value: today,
+            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;
+                    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;
+                }
+            }
+        });
+
         form.on('submit(formData)', function (data) {
             saveData(data);
         });
@@ -296,7 +319,6 @@ function itemNameDel(num) {
         layer.msg('至少保留一个试验设备信息');
     }
 }*/
-
 //新增试验依据
 function basisAdd() {
     // 获取当前已有的类元素
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 b437693..8623693 100644
--- a/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
@@ -1,3 +1,4 @@
+
 //修改前的传参
 function getTestViewById(){
     let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
@@ -184,4 +185,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 f44c83d..8215e81 100644
--- a/src/main/resources/static/pages/basic/standard/child/testCheck.html
+++ b/src/main/resources/static/pages/basic/standard/child/testCheck.html
@@ -124,18 +124,48 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验日期</label>
                 <div class="layui-input-inline" >
-                    <input type="text" id="experTime" name="experTime" lay-verify="required"  class="layui-input" placeholder="请选择试验日期" readonly  />
+                    <input class="layui-input" type="text" id="experTime" name="experTime"  lay-verify="required"   placeholder="请选择试验日期" readonly >
                 </div>
             </div>
 
             <div class="layui-inline">
                 <label class="layui-form-label"><i style="padding: 0 10px;">*</i>下次试验日期</label>
                 <div class="layui-input-inline" >
-                    <input type="text" id="nextExperTime" name="nextExperTime" lay-verify="required" style="background-color: #f0f0f0;" class="layui-input" placeholder="请选择下次试验日期" disabled  />
+                    <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>
 
+
         <div class="layui-form-item" >
             <div class="layui-inline">
                 <label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验地点</label>
@@ -270,4 +300,5 @@
 <script src="../../../../js/basis/standard/child/testForm.js" charset="UTF-8" type="text/javascript"></script>
 <script src="../../../../js/basis/standard/child/testUpdateForm.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
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 50d2518..49d1a49 100644
--- a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
+++ b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
@@ -146,10 +146,13 @@
                 </div>
             </div>
             <div class="layui-inline">
-                <label class="layui-form-label"><i style="padding: 0 10px;">*</i>总金额</label>
+                <label class="layui-form-label"><i style="padding: 0 10px;">*</i>设备检测定价</label>
                 <div class="layui-input-inline" >
                     <input type="text" id="amountAll" name="amountAll" lay-verify="required" class="layui-input" placeholder="总金额" maxlength="7" style="background-color: #f0f0f0;" readonly />
                 </div>
+                <div class="layui-input-inlineTwo" >
+                    <span style="display: flex;margin: 10px 10px;">元</span>
+                </div>
             </div>
             <div class="layui-inline basis">
                 <label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验依据</label>
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 68c5110..09cee0a 100644
--- a/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html
+++ b/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html
@@ -148,10 +148,13 @@
 <!--                <button class="layui-btn layui-btn-primary cancel" onclick="basisDel()" title="删除试验依据">-</button>-->
 <!--            </div>-->
             <div class="layui-inline">
-                <label class="layui-form-label"><i style="padding: 0 10px;">*</i>总金额</label>
+                <label class="layui-form-label"><i style="padding: 0 10px;">*</i>设备检测定价</label>
                 <div class="layui-input-inline" >
                     <input type="text" id="amountAll" name="amountAll" lay-verify="required" class="layui-input" placeholder="总金额" maxlength="7" style="background-color: #f0f0f0;" readonly />
                 </div>
+                <div class="layui-input-inlineTwo" >
+                    <span style="display: flex;margin: 10px 10px;">元</span>
+                </div>
             </div>
             <div class="layui-inline basis">
                 <label class="layui-form-label"><i style="padding: 0 10px;">*</i>试验依据</label>