From dafae99aa0f2b672b8a931f6b0123c87ca76b92e Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Wed, 4 Sep 2024 16:23:33 +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 --- .../static/js/samples/child/samplesEdit.js | 115 ++++++++++++------ 1 file changed, 76 insertions(+), 39 deletions(-) diff --git a/src/main/resources/static/js/samples/child/samplesEdit.js b/src/main/resources/static/js/samples/child/samplesEdit.js index 1590151..4089ed0 100644 --- a/src/main/resources/static/js/samples/child/samplesEdit.js +++ b/src/main/resources/static/js/samples/child/samplesEdit.js @@ -10,6 +10,8 @@ let listLengthTwo = 0; let listData=[]; let sampleName=0.00; let idSample; +let flag = 0; +let flagTemp = 0; function setParams(params) { idParam = JSON.parse(params).id; @@ -21,6 +23,7 @@ function setParams(params) { layui.form.render(); getCustomNameSelected(); getToolsSelected(); + getFlagTwo(); initTable(listData) laydate.render({ elem: '#sampleTime', @@ -110,6 +113,33 @@ function getFlag(data){ }); } +function getFlagTwo(){ + let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); + let url = dataUrl + "/samples/getFlag?token=" + tokens; + let params = { + id: idParam + } + params={ + encryptedData:encryptCBC(JSON.stringify(params)) + } + + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + layer.close(loadingMsg); // 关闭提示层 + if (result.code === 200) { + // setFormData(result.data); + flag = 1; + flagTemp = flag; + } else { + flag = 0; + flagTemp = flag; + } + }, function (xhr) { + layer.close(loadingMsg); // 关闭提示层 + error(xhr) + }); +} + /** * 数据处理 * @param data @@ -367,53 +397,60 @@ function cancel() { /** * 上传数据 */ -function uploadData() { + function uploadData() { // if (listData.length == 0) { // return layer.msg('请先添加数据', { // icon: 2, // time: 2000 //2秒关闭(如果不配置,默认是3秒) // }); // } - let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); - let url = dataUrl + '/samples/addSamplesAll'; - if(listData.length == 0){ - listData.push({ - id: idSample, - collectSamplesTime:null, - customId: null, - customName: null, - sampleUser: null, - sampleTime: null, - idSY:null, - departmentId: null, - sampleDepartment: null, - sampleToolsId: null, - sampleTools: null, - devModule: null, - devCode: null, - }); + if(flagTemp==1){ + if(listLengthTwo == 0){ + layer.alert("无法上传,请至少添加一条数据", {icon: 2}) + }else{ + listData.push({ + id: idSample, + collectSamplesTime:null, + customId: null, + customName: null, + sampleUser: null, + sampleTime: null, + idSY:null, + departmentId: null, + sampleDepartment: null, + sampleToolsId: null, + sampleTools: null, + devModule: null, + devCode: null, + }); + let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); + let url = dataUrl + '/samples/addSamplesAll'; + let params = { + "paramsList": listData + } - } - let params = { - "paramsList": listData - } + params={ + encryptedData:encryptCBC(JSON.stringify(params)) + } + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + layer.close(loadingMsg); // 关闭提示层 + if (result.code === 200) { + closePage(1); + parent.layer.msg("收样信息添加成功", {icon: 1}); + }else { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + layer.close(loadingMsg); // 关闭提示层 + error(xhr) + }); + } + + }else{ + layer.alert("无法上传,只能在审核前上传", {icon: 2}) + } - params={ - encryptedData:encryptCBC(JSON.stringify(params)) - } - ajaxRequest(url, "POST", params, true, function () { - }, function (result) { - layer.close(loadingMsg); // 关闭提示层 - if (result.code === 200) { - closePage(1); - parent.layer.msg("收样信息添加成功", {icon: 1}); - }else { - layer.alert(result.msg, {icon: 2}) - } - }, function (xhr) { - layer.close(loadingMsg); // 关闭提示层 - error(xhr) - }); }