From f2eb1435b3cecb16658f5a5826e861119e25dd71 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Wed, 4 Sep 2024 13:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=A0=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/basis/tools/child/addTestStandards.js      | 15 +++++++++++++++
 .../js/basis/tools/child/checkTestStandards.js    | 15 +++++++++++++++
 .../static/js/samples/child/samplesAdd.js         |  8 +++++++-
 .../static/js/samples/child/samplesEdit.js        |  9 ++++++++-
 .../pages/basic/tools/child/addTestStandards.html |  3 ++-
 .../basic/tools/child/checkTestStandards.html     |  3 ++-
 .../static/pages/samples/child/samplesEdit.html   |  2 +-
 7 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/static/js/basis/tools/child/addTestStandards.js b/src/main/resources/static/js/basis/tools/child/addTestStandards.js
index ac652cd..5b7b8aa 100644
--- a/src/main/resources/static/js/basis/tools/child/addTestStandards.js
+++ b/src/main/resources/static/js/basis/tools/child/addTestStandards.js
@@ -438,6 +438,21 @@ function saveData(data) {
         }));
 }*/
 
+function updateAmountTwo(input){
+    input.value = input.value.replace(/[^0-9]/g,'')
+    if(parseInt(input.value,10)<=0){
+        console.log(input.value)
+        input.value = '';
+        input.placeholder = '请输入0~99内的数据'
+    }
+    if(input.value <0||input.value>99){
+        input.value = '';
+        input.placeholder = '请输入0~99内的数据'
+    }
+    // const devNumTwo = document.getElementById('times').value || 1
+    // document.getElementById('amountAll').value = (amountTemp * devNumTwo).toFixed(2);
+}
+
 function convertToYjList(obj){
     return Object.entries(obj)
         .filter(([key, value]) => key.startsWith('basisName-'))
diff --git a/src/main/resources/static/js/basis/tools/child/checkTestStandards.js b/src/main/resources/static/js/basis/tools/child/checkTestStandards.js
index 1bd5d70..8d46c8a 100644
--- a/src/main/resources/static/js/basis/tools/child/checkTestStandards.js
+++ b/src/main/resources/static/js/basis/tools/child/checkTestStandards.js
@@ -438,6 +438,21 @@ function saveData(data) {
         }));
 }*/
 
+function updateAmountTwo(input){
+    input.value = input.value.replace(/[^0-9]/g,'')
+    if(parseInt(input.value,10)<=0){
+        console.log(input.value)
+        input.value = '';
+        input.placeholder = '请输入0~99内的数据'
+    }
+    if(input.value <0||input.value>99){
+        input.value = '';
+        input.placeholder = '请输入0~99内的数据'
+    }
+    // const devNumTwo = document.getElementById('times').value || 1
+    // document.getElementById('amountAll').value = (amountTemp * devNumTwo).toFixed(2);
+}
+
 function convertToYjList(obj){
     return Object.entries(obj)
         .filter(([key, value]) => key.startsWith('basisName-'))
diff --git a/src/main/resources/static/js/samples/child/samplesAdd.js b/src/main/resources/static/js/samples/child/samplesAdd.js
index 6ee6687..2b3e585 100644
--- a/src/main/resources/static/js/samples/child/samplesAdd.js
+++ b/src/main/resources/static/js/samples/child/samplesAdd.js
@@ -63,7 +63,13 @@ function setParams(params) {
     })
 }
 
-function updateAmountTwo(){
+function updateAmountTwo(input){
+    input.value = input.value.replace(/[^0-9]/g,'')
+    if(parseInt(input.value,10)<=0){
+        console.log(input.value)
+        input.value = '';
+        input.placeholder = '请输入0~100内的数据'
+    }
     if(input.value <0||input.value>100){
         input.value = '';
         input.placeholder = '请输入0~100内的数据'
diff --git a/src/main/resources/static/js/samples/child/samplesEdit.js b/src/main/resources/static/js/samples/child/samplesEdit.js
index 888efca..1590151 100644
--- a/src/main/resources/static/js/samples/child/samplesEdit.js
+++ b/src/main/resources/static/js/samples/child/samplesEdit.js
@@ -71,6 +71,12 @@ function setParams(params) {
 }
 
 function updateAmountTwo(input){
+    input.value = input.value.replace(/[^0-9]/g,'')
+    if(parseInt(input.value,10)<=0){
+        console.log(input.value)
+        input.value = '';
+        input.placeholder = '请输入0~100内的数据'
+    }
     if(input.value <0||input.value>100){
         input.value = '';
         input.placeholder = '请输入0~100内的数据'
@@ -299,7 +305,8 @@ function handleClick1(index) {
     console.log(index)
     // 根据行索引删除 listData 中对应的数据
     if(listData[index].idSY!=null){
-       alert("已收样的数据不能删除");
+
+        layer.alert("已收样的数据不能删除");
         // throw new Error("已收样的数据不能删除！")
     }else{
         listData.splice(index, 1);
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 3b554bb..50d2518 100644
--- a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
+++ b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
@@ -138,7 +138,8 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><i style="padding: 0 10px;">*</i>实验周期</label>
                 <div class="layui-input-inline" >
-                    <input type="number" id="times" name="times" min="1" lay-verify="required" class="layui-input" placeholder="请输入实验周期" maxlength="3" />
+                    <input type="number" id="times" name="times" min="1" max = "99" lay-verify="required" class="layui-input" placeholder="请输入实验周期" maxlength="2"
+                           lay-verify="required" oninput="updateAmountTwo(this)" />
                 </div>
                 <div class="layui-input-inlineTwo" >
                     <span style="display: flex;margin: 10px 10px;">年</span>
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 cd43e6a..68c5110 100644
--- a/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html
+++ b/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html
@@ -136,7 +136,8 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><i style="padding: 0 10px;">*</i>实验周期</label>
                 <div class="layui-input-inline" >
-                    <input type="number" id="times" name="times" min="1" lay-verify="required" class="layui-input" placeholder="请输入实验周期" maxlength="3" />
+                    <input type="number" id="times" name="times" min="1"  max = "99" lay-verify="required" class="layui-input" placeholder="请输入实验周期" maxlength="2"
+                           lay-verify="required" oninput="updateAmountTwo(this)"/>
                 </div>
                 <div class="layui-input-inlineTwo" >
                     <span style="display: flex;margin: 10px 10px;">年</span>
diff --git a/src/main/resources/static/pages/samples/child/samplesEdit.html b/src/main/resources/static/pages/samples/child/samplesEdit.html
index d7a3740..807881c 100644
--- a/src/main/resources/static/pages/samples/child/samplesEdit.html
+++ b/src/main/resources/static/pages/samples/child/samplesEdit.html
@@ -128,7 +128,7 @@
             <div class="layui-form-item" style="margin-top: 5%;">
                 <label class="layui-form-label"><i style="padding: 0 10px; color: red;">*</i>设备数量</label>
                 <div class="layui-input-inline">
-                    <input class="layui-input" placeholder="请输入设备数量" type="number" id="devNum" name="devNum" min="1" max = "100" value="1" autocomplete="off"
+                    <input class="layui-input" placeholder="请输入设备数量" type="text" id="devNum" name="devNum" min="1" max = "100" value="1" autocomplete="off"
                            lay-verify="required" oninput="updateAmountTwo(this)" maxlength="3" >
                 </div>
             </div>