From 2bfd8733e98b5b3700788fa964ec3e894381052d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 16 十月 2024 10:45:03 +0800
Subject: [PATCH] 染厂报表、白坯报表优化：页面加载速度与查询速度由10-13优化到3-6秒
---
WebTM/views/车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor_third.html | 211 +---------
WebTM/views/车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor.html | 249 +++--------
WebTM/views/车间管理/报表分析/Kf_MaterOutSumReport_Cloth.html | 232 +---------
WebTM/views/车间管理/报表分析/Kf_MaterOutEntryReport_Cloth.html | 292 +++----------
WebTM/views/车间管理/报表分析/Kf_ProdProcessEntryReport_DyeColor.html | 219 +--------
5 files changed, 223 insertions(+), 980 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
index 0d2d403..98615ea 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
@@ -356,222 +356,45 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
-
- //var HBeginDate = $("#HBeginDate").val() + ":00:00" ;//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- //var HEndDate = $("#HEndDate").val()+":00:00";//缁撴潫鏃ユ湡
- var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
- var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
-
- //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
-
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like ''%" + ColContent + "%''";
- break;
- case "8":
- com = "like ''%" + ColContent + "''";
- break;
- case "9":
- com = "like ''" + ColContent + "%''";
- break;
- case "10":
- com = "not like ''%" + ColContent + "%''";
- break;
- default:
- com = "" + Comparator + " ''" + ColContent + "''";
- break;
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 160 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 160 }
+ , { field: '浠诲姟鏁伴噺', title: '浠诲姟鏁伴噺', totalRow: true, width: 160 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 160, totalRow: true }
+ ]]
+ , done: function (res) {
+ //var count = 0;
+ //var OnlyID = -1;
+ //for (var i = 0; i < res.data.length; i++) {
+ // if (res.data[i]["鍞竴ID"] != OnlyID) {
+ // count += res.data[i]["鏁存壒"];
+ // OnlyID = res.data[i]["鍞竴ID"];
+ // }
+ //}
+ //var divArr = $(".layui-table-total div.layui-table-cell");
+ //$.each(divArr, function (index, item) {
+ // var _div = $(item);
+ // var content = _div.html();
+ // if (index == 9) {
+ // content = count;
+ // }
+ // _div.html(content);
+ //});
}
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- // com1 = " and (" + ColName1 + " " + com1 + ")";
- }
-
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator2 + "'" + ColContent2 + "'";
- break;
- }
- // com2 = " and (" + ColName2 + " " + com2 + ")";
- sWhere += " and " + ColName2 + " " + com2;
- }
-
-
-
- sWhere = {
- HBeginDate: HBeginDate
- , HEndDate: HEndDate
- , HMaterNumber: HMaterNumber
- , HBillNo: HBillNo
- , HProductName: HProductName
- , HProductModel: HProductModel
- , RandomSearch: com
- }
- sWhere = JSON.stringify(sWhere);
-
-
- //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
- $.ajax({
- url: GetWEBURL() + "/MaterOutEntryReport/MaterOutEntryReport_Cloth",
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- //async: false,
- success: function (data1) {
-
- if (data1.count == 1) {
- var totalArray = ["浠诲姟鏁伴噺","鐧藉澂鍙戝竷", "娴佽浆鍗℃暟閲�"];
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- var width = data1.list[key].width * 23;
- if (width < 150) {
- width = 150;
- } else if (width > 300) {
- width = 300;
- }
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- }
- else if (data[i].ColName == '鐧藉澂鍙戝竷') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow:true });
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [col]
- , data: data1.data
- };
- ins = table.render(option);
- } else {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 160 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 160 }
- , { field: '浠诲姟鏁伴噺', title: '浠诲姟鏁伴噺', totalRow: true,width: 160 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 160, totalRow: true }
- ]]
- , done: function (res) {
- //var count = 0;
- //var OnlyID = -1;
- //for (var i = 0; i < res.data.length; i++) {
- // if (res.data[i]["鍞竴ID"] != OnlyID) {
- // count += res.data[i]["鏁存壒"];
- // OnlyID = res.data[i]["鍞竴ID"];
- // }
- //}
- //var divArr = $(".layui-table-total div.layui-table-cell");
- //$.each(divArr, function (index, item) {
- // var _div = $(item);
- // var content = _div.html();
- // if (index == 9) {
- // content = count;
- // }
- // _div.html(content);
- //});
- }
- };
- ins = table.render(option);
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- })
+ };
}
//鍒楁槑鏄剧ず涓嬫媺妗�
@@ -603,6 +426,45 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = ["浠诲姟鏁伴噺", "鐧藉澂鍙戝竷", "娴佽浆鍗℃暟閲�"];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ var width = data1.list[key].width * 23;
+ if (width < 150) {
+ width = 150;
+ } else if (width > 300) {
+ width = 300;
+ }
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, "") > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else if (data[i].ColName == '鐧藉澂鍙戝竷') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+
//璋冩暣鏃ユ湡鏍煎紡锛氭樉绀� 骞存湀鏃� 鍜� 鏃� 鍒�
for (var i = 0; i < data1.data.length; i++) {
if (data1.data[i].鏃ユ湡 != null) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
index 7bc6a09..c7a0dc3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
@@ -375,211 +375,35 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
- var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
-
- //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
-
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
- var com = "";
- if (ColName != 0 && Comparator != 0) {
- switch (Comparator) {
- case "7":
- com = "like ''%" + ColContent + "%''";
- break;
- case "8":
- com = "like ''%" + ColContent + "''";
- break;
- case "9":
- com = "like ''" + ColContent + "%''";
- break;
- case "10":
- com = "not like ''%" + ColContent + "%''";
- break;
- default:
- com = "" + Comparator + " ''" + ColContent + "''";
- break;
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '鍏嬮噸', title: '鍏嬮噸', width: 160 }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', width: 160 }
+ , { field: '鐞嗚鍏枻鏁�', title: '鐞嗚鍏枻鏁�', width: 160 }
+ , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160 }
+ , { field: '鍙戝竷绫虫暟', title: '鍙戝竷绫虫暟', width: 160 }
+ , { field: '鐧借儦鍗犳瘮%', title: '鐧借儦鍗犳瘮%', width: 160 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
+ , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
+ , { field: '鏄惁鍙栧簱瀛�', title: '鏄惁鍙栧簱瀛�', width: 160 }
+ ]]
+ , done: function (res) {
}
- com = " and ([" + ColName + "] " + com + ")";
- }
- var com1 = "";
- if (ColName1 != 0 && Comparator1 != 0) {
-
- switch (Comparator1) {
- case "7":
- com1 = "like ''%" + ColContent1 + "%''";
- break;
- case "8":
- com1 = "like ''%" + ColContent1 + "''";
- break;
- case "9":
- com1 = "like ''" + ColContent1 + "%''";
- break;
- case "10":
- com1 = "not like ''%" + ColContent1 + "%''";
- break;
- default:
- com1 = "" + Comparator1 + "''" + ColContent1 + "''";
- break;
- }
- // sWhere += " and " + ColName1 + " " + com1;
- com1 = " and ([" + ColName1 + "] " + com1 + ")";
- }
-
- var com2 = "";
- if (ColName2 != 0 && Comparator2 != 0) {
-
- switch (Comparator2) {
- case "7":
- com2 = "like ''%" + ColContent2 + "%''";
- break;
- case "8":
- com2 = "like ''%" + ColContent2 + "''";
- break;
- case "9":
- com2 = "like ''" + ColContent2 + "%''";
- break;
- case "10":
- com2 = "not like ''%" + ColContent2 + "%''";
- break;
- default:
- com2 = "" + Comparator2 + " ''" + ColContent2 + "''";
- break;
- }
- com2 = " and ([" + ColName2 + "] " + com2 + ")";
- // swhere += " and " + colname2 + " " + com2;
- }
-
- com = com + com1+com2;
-
- //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
- var OtherSearch = getSWhereByHUser();
-
-
- sWhere = {
- HBeginDate: HBeginDate
- , HEndDate: HEndDate
- , HMaterNumber: HMaterNumber
- , HBillNo: HBillNo
- , HProductName: HProductName
- , HProductModel: HProductModel
- , RandomSearch: com
- , OtherSearch: (OtherSearch == null || OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
- }
-
- sWhere = JSON.stringify(sWhere);
-
-
- //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
- $.ajax({
- url: GetWEBURL() + "/MaterOutSumReport/MaterOutSumReport_Cloth",
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- //async: false,
- success: function (data1) {
-
- if (data1.count == 1) {
- var totalArray = ["鐢熶骇浠诲姟鍗曟暟閲�", "鐧借儦鍙戝竷"];
-
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- }
- else if (data[i].ColName == '鐧藉澂鍙戝竷') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true});
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [col]
- , data: data1.data
- };
- ins = table.render(option);
- } else {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '鍏嬮噸', title: '鍏嬮噸', width: 160 }
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', width: 160 }
- , { field: '鐞嗚鍏枻鏁�', title: '鐞嗚鍏枻鏁�', width: 160 }
- , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160 }
- , { field: '鍙戝竷绫虫暟', title: '鍙戝竷绫虫暟', width: 160 }
- , { field: '鐧借儦鍗犳瘮%', title: '鐧借儦鍗犳瘮%', width: 160 }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
- , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
- , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
- , { field: '鏄惁鍙栧簱瀛�', title: '鏄惁鍙栧簱瀛�', width: 160 }
- ]]
- , done: function (res) {
- }
- };
- ins = table.render(option);
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- })
+ };
}
//鍒楁槑鏄剧ず涓嬫媺妗�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
index 940626c..c7a3958 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
@@ -291,7 +291,9 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ var ajaxLoad1 = layer.load();
get_FastQuery();
+ layer.close(ajaxLoad1);
});
//琛岀洃鍚簨浠�-鍗曞嚮
@@ -349,190 +351,29 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//缁撴潫鏃ユ湡
- var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
- var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
-
- //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
- var sProcessNo = $("#sProcessNo").val(); //娴佽浆鍗″彿
-
- //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
- var com = "";
- if (ColName != 0 && Comparator != 0) {
- switch (Comparator) {
- case "7":
- com = "like ''%" + ColContent + "%''";
- break;
- case "8":
- com = "like ''%" + ColContent + "''";
- break;
- case "9":
- com = "like ''" + ColContent + "%''";
- break;
- case "10":
- com = "not like ''%" + ColContent + "%''";
- break;
- default:
- com = "" + Comparator + " ''" + ColContent + "''";
- break;
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
+ , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
+ , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
+ ]]
+ , done: function (res) {
}
- com = " and (" + ColName + " " + com + ")";
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
- com = com + com1 + com2;
- sWhere = {
- HBeginDate: HBeginDate
- , HEndDate: HEndDate
- , HMaterNumber: HMaterNumber
- , HBillNo: HBillNo
- , HProductName: HProductName
- , HProductModel: HProductModel
- , RandomSearch: com
- }
- sWhere = JSON.stringify(sWhere);
-
- //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
- $.ajax({
- url: GetWEBURL() + "/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor",
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "sProcessNo": '', "user": sessionStorage["HUserName"] },
- //async: false,
- success: function (data1) {
-
- if (data1.count == 1) {
- var totalArray = ["鐢熶骇浠诲姟鍗曟暟閲�", "鐧藉澂鍙戝竷"];
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- }
- else if (data[i].ColName == '鐧藉澂鍙戝竷') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [col]
- , data: data1.data
- };
- ins = table.render(option);
- } else {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
- , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true,width: 200 }
- , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
- , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
- ]]
- , done: function (res) {
- }
- };
- ins = table.render(option);
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- })
+ };
}
//鍒楁槑鏄剧ず涓嬫媺妗�
@@ -553,7 +394,7 @@
//鍔犺浇缃戞牸
function get_Display(sWhere,sProcessNo) {
- var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor',
async: false,
@@ -647,15 +488,15 @@
var sumCompare = sumHMaterOutQty - sumDyeColorOut;
$("#SumCompare").val(sumCompare);
- layer.close(wait);
+ layer.close(ajaxLoad);
} else {
$("#SumHMaterOutQty").val("");
- layer.close(wait);
+ layer.close(ajaxLoad);
layer.alert(data1.Message, { icon: 5 });
}
}, error: function () {
$("#SumHMaterOutQty").val("");
- layer.close(wait);
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -900,6 +741,7 @@
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
+ var ajaxLoad = layer.load();
ColFilter();
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -976,8 +818,9 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
+ layer.close(ajaxLoad);
}
-
+
//#endregion
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
index 7845a8f..26fd756 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor.html"
@@ -377,191 +377,29 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
- var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
-
- //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
- //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
- var com = "";
- if (ColName != 0 && Comparator != 0) {
- switch (Comparator) {
- case "7":
- com = "like ''%" + ColContent + "%''";
- break;
- case "8":
- com = "like ''%" + ColContent + "''";
- break;
- case "9":
- com = "like ''" + ColContent + "%''";
- break;
- case "10":
- com = "not like ''%" + ColContent + "%''";
- break;
- default:
- com = "" + Comparator + " ''" + ColContent + "''";
- break;
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
+ , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
+ , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
+ ]]
+ , done: function (res) {
}
- com = " and (" + ColName + " " + com + ")";
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
- //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
- var OtherSearch = getSWhereByHUser();
-
-
- sWhere = {
- HBeginDate: HBeginDate
- , HEndDate: HEndDate
- , HMaterNumber: HMaterNumber
- , HBillNo: HBillNo
- , HProductName: HProductName
- , HProductModel: HProductModel
- , RandomSearch: com
- , OtherSearch: (OtherSearch == null || OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
- }
- sWhere = JSON.stringify(sWhere);
-
- //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
- $.ajax({
- url: GetWEBURL() + "/ProdProcessSumReport/ProdProcessSumReport_DyeColor",
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- //async: false,
- success: function (data1) {
-
- if (data1.count == 1) {
- var totalArray = ["鐢熶骇浠诲姟鍗曟暟閲�", "鐧藉澂鍙戝竷"];
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- }
- else if (data[i].ColName == '鐧藉澂鍙戝竷') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [col]
- , data: data1.data
- };
- ins = table.render(option);
- } else {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
- , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
- , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
- , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
- ]]
- , done: function (res) {
- }
- };
- ins = table.render(option);
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- })
+ };
}
@@ -589,6 +427,41 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = ["鐢熶骇浠诲姟鍗曟暟閲�", "鐧藉澂鍙戝竷"];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else if (data[i].ColName == '鐧藉澂鍙戝竷') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+
+
+
//璋冩暣鏃ユ湡鏍煎紡锛氭樉绀� 骞存湀鏃� 鍜� 鏃�
for (var i = 0; i < data1.data.length; i++) {
if (data1.data[i].鐢熶骇璁㈠崟鏃ユ湡!=null) {
@@ -597,6 +470,7 @@
}
option.data = data1.data;
+ option.cols = [col];
//var num = 0;
//for (let i = 0; i < data1.data.length; i++) {
// for (let j = i + 1; j < data1.data.length; j++) {
@@ -633,11 +507,18 @@
layer.close(wait);
} else {
$("#SumHMaterOutQty").val("");
+
+ option.data = [];
+ ins = table.render(option);
+
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
}
}, error: function () {
$("#SumHMaterOutQty").val("");
+ option.data = [];
+ ins = table.render(option);
+
layer.close(wait);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
index 3058901..9c2a64d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
@@ -331,196 +331,29 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
- var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
- var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
-
- //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
- //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
- var com = "";
- if (ColName != 0 && Comparator != 0) {
- switch (Comparator) {
- case "7":
- com = "like ''%" + ColContent + "%''";
- break;
- case "8":
- com = "like ''%" + ColContent + "''";
- break;
- case "9":
- com = "like ''" + ColContent + "%''";
- break;
- case "10":
- com = "not like ''%" + ColContent + "%''";
- break;
- default:
- com = "" + Comparator + " ''" + ColContent + "''";
- break;
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
+ , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
+ , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
+ ]]
+ , done: function (res) {
}
- com = " and (" + ColName + " " + com + ")";
- }
-
- var com1 = "";
- if (ColName1 != 0 && Comparator1 != 0) {
-
- switch (Comparator1) {
- case "7":
- com1 = "like ''%" + ColContent1 + "%''";
- break;
- case "8":
- com1 = "like ''%" + ColContent1 + "''";
- break;
- case "9":
- com1 = "like ''" + ColContent1 + "%''";
- break;
- case "10":
- com1 = "not like ''%" + ColContent1 + "%''";
- break;
- default:
- com1 = "" + Comparator1 + "''" + ColContent1 + "''";
- break;
- }
- com1 = " and (" + ColName1 + " " + com1 + ")";
- }
-
- var com2 = "";
- if (ColName2 != 0 && Comparator2 != 0) {
-
- switch (Comparator2) {
- case "7":
- com2 = "like ''%" + ColContent2 + "%''";
- break;
- case "8":
- com2 = "like ''%" + ColContent2 + "''";
- break;
- case "9":
- com2 = "like ''" + ColContent2 + "%''";
- break;
- case "10":
- com2 = "not like ''%" + ColContent2 + "%''";
- break;
- default:
- com2 = "" + Comparator2 + "''" + ColContent2 + "''";
- break;
- }
- com2 = " and (" + ColName2 + " " + com2 + ")";
- }
- com = com + com1 + com2;
-
- //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
- var OtherSearch = getSWhereByHUser();
-
- sWhere = {
- HBeginDate: HBeginDate
- , HEndDate: HEndDate
- , HMaterNumber: HMaterNumber
- , HBillNo: HBillNo
- , HProductName: HProductName
- , HProductModel: HProductModel
- , RandomSearch: com
- , OtherSearch: (OtherSearch == null || OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
- }
- sWhere = JSON.stringify(sWhere);
-
- //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
- $.ajax({
- url: GetWEBURL() + "/ProdProcessSumReport/ProdProcessSumReport_DyeColor_third",
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- //async: false,
- success: function (data1) {
-
- if (data1.count == 1) {
- var totalArray = ["鐢熶骇鏁伴噺", "鐧藉澂鍙戝竷"];
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- }
- else if (data[i].ColName == '鐧藉澂鍙戝竷') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [col]
- , data: data1.data
- };
- ins = table.render(option);
- } else {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
- , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
- , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
- , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
- ]]
- , done: function (res) {
- }
- };
- ins = table.render(option);
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- })
+ };
}
//鍒楁槑鏄剧ず涓嬫媺妗�
--
Gitblit v1.9.1