From dc1d7e10c2032b582fc28a06255eafc11fdcfcdf Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Wed, 24 Jul 2024 21:28:45 +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

---
 .../resources/static/js/basis/standard/child/testForm.js  | 5 +++--
 .../resources/static/js/basis/standard/child/testList.js  | 3 ++-
 .../static/js/basis/standard/testManagementList.js        | 8 ++++----
 .../static/pages/basic/standard/testManagementList.html   | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

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 7358222..012c4aa 100644
--- a/src/main/resources/static/js/basis/standard/child/testForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testForm.js
@@ -332,7 +332,7 @@ function saveData2() {
 }
 
 function saveData(data) {
-    console.log(data)
+    console.log("试验",data)
     //获取试验设备列表
     // var devList = convertToDevList(data.field);
 
@@ -464,6 +464,7 @@ function convertToExperDevList(originalData){
     // 根据设备ID构建设备信息
     deviceIds.forEach(deviceId => {
         // 使用deviceId来构建键名
+        const devIdKey = `devId-${deviceId}`;
         const devCodeKey = `devCode-${deviceId}`;
         const manufacturerKey = `manufacturer-${deviceId}`;
         const manufactureDateKey = `manufactureDate-${deviceId}`;
@@ -478,7 +479,7 @@ function convertToExperDevList(originalData){
 
         // 创建设备信息对象
         const deviceItem = {
-            devId: deviceId,
+            devId: originalData[devIdKey],
             devCode: originalData[devCodeKey],
             manufacturer: originalData[manufacturerKey],
             manufactureDate: originalData[manufactureDateKey],
diff --git a/src/main/resources/static/js/basis/standard/child/testList.js b/src/main/resources/static/js/basis/standard/child/testList.js
index 64026f2..3c05c0a 100644
--- a/src/main/resources/static/js/basis/standard/child/testList.js
+++ b/src/main/resources/static/js/basis/standard/child/testList.js
@@ -71,7 +71,8 @@ function initTable(dataList, limit, page) {
                     }
                 },
                 {field: "devTypeName", title: "样品类型", unresize: true, align: "center"},
-                {field: "devModule", title: "规格型号", unresize: true, align: "center"},
+                // {field: "devModule", title: "规格型号", unresize: true, align: "center"},
+                {field: "sampleNum", title: "送样数量", unresize: true, align: "center"},
                 {field: "", title: "样品数量", unresize: true, align: "center",
                     templet: function (d) {
                         var testResult="";
diff --git a/src/main/resources/static/js/basis/standard/testManagementList.js b/src/main/resources/static/js/basis/standard/testManagementList.js
index d434919..795b0e5 100644
--- a/src/main/resources/static/js/basis/standard/testManagementList.js
+++ b/src/main/resources/static/js/basis/standard/testManagementList.js
@@ -70,7 +70,7 @@ function initTable(dataList, limit, page) {
                 //表头
                 {title: "序号", width: 80, unresize: true, align: "center",
                     templet: function (d) {
-                        return (page - 1) * limit + d.LAY_INDEX;
+                        return (page - 1) * limit + d.LAY_NUM;
                     }
                 },
                 {field: "customName", title: "送样单位", unresize: true, align: "center"},
@@ -222,7 +222,7 @@ function getReqParams(page, limit, type) {
     } else {
         obj = {
             page: '1',
-            limit: '2',
+            limit: '10',
             devTypeCode: '',
             keyWord: '',
             sampleUserName: '',
@@ -310,8 +310,8 @@ function commitCheckTestData(){
         ajaxRequest(url, "POST", params, true, function () {
         }, function (result) {
             if (result.code === 200) {
-                console.log("数据",result.data)
-                // return result.data
+                parent.layer.msg(result.msg, {icon: 1})
+                query()
             } else {
                 layer.alert(result.msg, {icon: 2})
             }
diff --git a/src/main/resources/static/pages/basic/standard/testManagementList.html b/src/main/resources/static/pages/basic/standard/testManagementList.html
index 460a1e5..5127119 100644
--- a/src/main/resources/static/pages/basic/standard/testManagementList.html
+++ b/src/main/resources/static/pages/basic/standard/testManagementList.html
@@ -37,7 +37,7 @@
                     </div>
                     <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input type="text" class="layui-input" id="sampleDate" placeholder="请选择日期">
+                            <input type="text" class="layui-input" readonly id="sampleDate" placeholder="请选择日期">
                         </div>
                     </div>
                 </div>