收样管理

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
@@ -374,9 +404,10 @@ function uploadData() {
     //         time: 2000 //2秒关闭（如果不配置，默认是3秒）
     //     });
     // }
-    let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
+     if(flagTemp==1){
-    let url = dataUrl + '/samples/addSamplesAll';
+         if(listLengthTwo == 0){
-    if(listData.length == 0){
+             layer.alert("无法上传，请至少添加一条数据", {icon: 2})
+         }else{
              listData.push({
                  id: idSample,
                  collectSamplesTime:null,
@@ -392,8 +423,8 @@ function uploadData() {
                  devModule: null,
                  devCode: null,
              });
-
+             let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
-    }
+             let url = dataUrl + '/samples/addSamplesAll';
              let params = {
                  "paramsList": listData
              }
@@ -416,6 +447,12 @@ function uploadData() {
              });
          }
 
+     }else{
+         layer.alert("无法上传，只能在审核前上传", {icon: 2})
+     }
+
+}
+
 
 /*下拉选表单赋值*/
 function setSelectValue(list, selectName) {