Sfoglia il codice sorgente

限制汇总表,选择标段数量

MaiXinRong 2 anni fa
parent
commit
e050c81b37
2 ha cambiato i file con 8 aggiunte e 3 eliminazioni
  1. 4 3
      app/public/js/global.js
  2. 4 0
      app/public/report/js/rpt_custom.js

+ 4 - 3
app/public/js/global.js

@@ -1,5 +1,6 @@
 /*全局自适应高度*/
 /*全局自适应高度*/
+const postDefaultTime = 60 * 1000 * 2;
 function autoFlashHeight(){
     const select = $(".scrollbar-auto .active");
     if (select.length > 0) $(".scrollbar-auto")[0].scrollTop = select[0].offsetTop - 72;
@@ -246,7 +247,7 @@ const postData = function (url, data, successCallback, errorCallBack, showWaitin
         data: {'data': JSON.stringify(data)},
         dataType: 'json',
         cache: false,
-        timeout: 60000,
+        timeout: postDefaultTime,
         beforeSend: function(xhr) {
             let csrfToken = Cookies.get('csrfToken_j');
             xhr.setRequestHeader('x-csrf-token', csrfToken);
@@ -310,7 +311,7 @@ const postDataCompress = function (url, data, successCallback, errorCallBack, ht
         data: {'data': LZString.compressToUTF16(JSON.stringify(data))},
         dataType: 'json',
         cache: false,
-        timeout: 80000, // 导入清单Excel(10w行)预计需要时间
+        timeout: postDefaultTime,
         beforeSend: function(xhr) {
             let csrfToken = Cookies.get('csrfToken_j');
             xhr.setRequestHeader('x-csrf-token', csrfToken);
@@ -370,7 +371,7 @@ const postDataWithFile = function (url, formData, successCallback, errorCallBack
         contentType: false,
         // 告诉jQuery不要去处理发送的数据
         processData: false,
-        timeout: 60000,
+        timeout: postDefaultTime,
         beforeSend: function(xhr) {
             let csrfToken = Cookies.get('csrfToken_j');
             xhr.setRequestHeader('x-csrf-token', csrfToken);

+ 4 - 0
app/public/report/js/rpt_custom.js

@@ -628,6 +628,10 @@ const rptCustomObj = (function () {
                 return;
             }
         }
+        if (data.tenders.length > 20) {
+            hintObj.html('您选择的标段过多,请移除部分').show();
+            return;
+        }
         hintObj.hide();
         if (resolve) {
             resolve(data);