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_ProdProcessEntryReport_DyeColor.html | 555 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 386 insertions(+), 169 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_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 dfe3ac6..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"
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃</title>
+ <title>鏌撳巶鏄庣粏鎶ヨ〃</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -34,42 +34,72 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
- <select name="HState" lay-verify="HState" id="HState">
- <option value="0" selected="selected">鍏ㄩ儴</option>
- <option value="1">鏈紑宸�</option>
- <option value="3">宸插叆搴�</option>
- </select>
- </div>
- </div>-->
- <div class="layui-inline">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+ <select name="HState" lay-verify="HState" id="HState">
+ <option value="0" selected="selected">鍏ㄩ儴</option>
+ <option value="1">鏈紑宸�</option>
+ <option value="3">宸插叆搴�</option>
+ </select>
+ </div>
+ </div>-->
+ <div class="layui-form layui-inline" style="position:relative;top:10px;">
<label class="layui-form-label">鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ <div class="layui-form-item layui-inline">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="HBeginDate" placeholder="yyyy-MM-dd HH:mm:ss">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">-</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="HEndDate" placeholder="yyyy-MM-dd HH:mm:ss">
+ </div>
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">-</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
- </div>
- </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">-</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-inline">
- <label class="layui-form-label">鍚堣鍏枻鏁�</label>
+ <div class="layui-inline" style="display:none;">
+ <label class="layui-form-label">鐧藉澂鍙戝竷鍚堣鍏枻鏁�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="SumHMaterOutQty" id="SumHMaterOutQty" disabled="disabled">
</div>
</div>
- <!--<div class="layui-inline">
- <div style="padding-left: 10px;">
- <input type="checkbox" name="checkWRuku" id="checkWRuku" lay-skin="primary" lay-filter="checkWRuku" title="鏈笅鎺ㄥ強宸插叆搴�">
+ <div class="layui-inline" style="display:none;">
+ <label class="layui-form-label">鏌撳巶鍑虹珯鍚堣鍏枻鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="SumDyeColorOut" id="SumDyeColorOut" disabled="disabled">
</div>
- </div>-->
+ </div>
+ <div class="layui-inline" style="display:none;">
+ <label class="layui-form-label">宸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="SumCompare" id="SumCompare" disabled="disabled">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <div style="padding-left: 10px;">
+ <input type="checkbox" name="checkWRuku" id="checkWRuku" lay-skin="primary" lay-filter="checkWRuku" title="鏈笅鎺ㄥ強宸插叆搴�">
+ </div>
+ </div>-->
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
@@ -131,12 +161,69 @@
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -167,9 +254,11 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var HModName = "MaterOutSumReport_Cloth";
+ var HModName = "ProdProcessEntryReport_DyeColor";
var detailBar = 0; //鐢ㄤ簬姹囨�绘姤琛ㄦ煡鐪嬫槑缁嗘姤琛紝褰撲负0鏃舵樉绀烘槑缁嗘眹鎬绘姤琛ㄥ搴旀槑缁嗘姤琛ㄣ��
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -183,6 +272,10 @@
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
//閫�鍑�
case 'btn-exit': Pub_Close(2);
break;
@@ -198,9 +291,29 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ var ajaxLoad1 = layer.load();
get_FastQuery();
+ layer.close(ajaxLoad1);
});
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -208,8 +321,26 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd");
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd");
+ laydate.render({
+ elem: '#HBeginDate',
+ type: 'date',
+ fullPanel: true
+ , format: 'yyyy-MM-dd'
+ , value: HBeginDate
+ });
+ laydate.render({
+ elem: '#HEndDate',
+ type: 'date',
+ fullPanel: true
+ , format: 'yyyy-MM-dd'
+ , value: HEndDate
+ });
+
+ ////鍒濆鍖栨椂闂�
+ //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
@@ -220,76 +351,88 @@
//鍒濆鍖栬〃鏍�
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 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 + ")";
- }
+ };
+ }
- sWhere = {
- HBeginDate: HBeginDate
- , HEndDate: HEndDate
- , HMaterNumber: HMaterNumber
- , HBillNo: HBillNo
- , HProductName: HProductName
- , HProductModel: HProductModel
- , RandomSearch: com
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
}
- sWhere = JSON.stringify(sWhere);
+ $("#ColName").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
- //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere,sProcessNo) {
+ var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor",
- type: "GET",
+ url: GetWEBURL() + '/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor',
async: false,
- data: { "sWhere": sWhere,"sProcessNo":''},
- //async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "sProcessNo": sProcessNo, "user": sessionStorage["HUserName"] },
success: function (data1) {
-
if (data1.count == 1) {
+ //璋冩暣鏃ユ湡鏍煎紡锛氭樉绀� 骞存湀鏃� 鍜� 鏃�
+ for (var i = 0; i < data1.data.length; i++) {
+ if (data1.data[i].鏌撳巶鍑虹珯鏃ユ湡 != null) {
+ data1.data[i].鏌撳巶鍑虹珯鏃ユ湡 = data1.data[i]["鏌撳巶鍑虹珯鏃ユ湡"].split(":")[0] + ':' + data1.data[i]["鏌撳巶鍑虹珯鏃ユ湡"].split(":")[1];
+ data1.data[i].鏌撳巶鍑虹珯鏃ユ湡 = data1.data[i]["鏌撳巶鍑虹珯鏃ユ湡"].replace("T", " ");
+ }
+ if (data1.data[i].鐧藉澂鍙戝竷鏃ユ湡 != null) {
+ data1.data[i].鐧藉澂鍙戝竷鏃ユ湡 = data1.data[i]["鐧藉澂鍙戝竷鏃ユ湡"].split(":")[0] + ':' + data1.data[i]["鐧藉澂鍙戝竷鏃ユ湡"].split(":")[1];
+ data1.data[i].鐧藉澂鍙戝竷鏃ユ湡 = data1.data[i]["鐧藉澂鍙戝竷鏃ユ湡"].replace("T", " ");
+ }
+ if (data1.data[i].鐢熶骇璁㈠崟鏃ユ湡 != null) {
+ data1.data[i].鐢熶骇璁㈠崟鏃ユ湡 = data1.data[i]["鐢熶骇璁㈠崟鏃ユ湡"].split("T")[0];
+ }
+ }
+
+
+
+ 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});
+ 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鍒�
+ 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 });
@@ -305,85 +448,14 @@
}
}
}
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [col]
- , data: data1.data
- };
- 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: 200 }
- , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
- , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
- ]]
- , done: function (res) {
- }
- };
- table.render(option);
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- })
- }
-
- //鍒楁槑鏄剧ず涓嬫媺妗�
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 0; i < option.cols[0].length; i++) {
- if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
- }
- }
- $("#ColName").empty();
- $("#ColName").append(Organization);
- form.render('select');
- }
- //鍔犺浇缃戞牸
- function get_Display(sWhere,sProcessNo) {
- var wait = layer.load();//閬僵
- $.ajax({
- url: GetWEBURL() + '/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor',
- type: "GET",
- data: { "sWhere": sWhere, "sProcessNo": sProcessNo },
- success: function (data1) {
- if (data1.count == 1) {
- //璋冩暣鏃ユ湡鏍煎紡锛氭樉绀� 骞存湀鏃� 鍜� 鏃�
- for (var i = 0; i < data1.data.length; i++) {
- data1.data[i].宸ヨ壓鍗曟棩鏈� = data1.data[i]["宸ヨ壓鍗曟棩鏈�"].split(":")[0] + ':' + data1.data[i]["宸ヨ壓鍗曟棩鏈�"].split(":")[1];
- data1.data[i].宸ヨ壓鍗曟棩鏈� = data1.data[i]["宸ヨ壓鍗曟棩鏈�"].replace("T", " ");
- }
-
+ option.cols = [col];
option.data = data1.data;
+
+
+
+ ins = table.render(option);
//var num = 0;
//for (let i = 0; i < data1.data.length; i++) {
// for (let j = i + 1; j < data1.data.length; j++) {
@@ -396,7 +468,7 @@
// }
// }
//}
- table.render(option);
+ ins = table.render(option);
//璁＄畻鍚堣鍏枻鏁�
var sumHMaterOutQty = 0;
@@ -405,15 +477,26 @@
}
$("#SumHMaterOutQty").val(sumHMaterOutQty);
- layer.close(wait);
+ //璁＄畻鏌撳巶鍑虹珯鍚堣鍏枻鏁�
+ var sumDyeColorOut = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumDyeColorOut += data1.data[i]["鏌撳巶鍑虹珯"];
+ }
+ $("#SumDyeColorOut").val(sumDyeColorOut);
+
+ //璁＄畻宸
+ var sumCompare = sumHMaterOutQty - sumDyeColorOut;
+ $("#SumCompare").val(sumCompare);
+
+ 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 });
}
});
@@ -423,6 +506,18 @@
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
+ if (HBeginDate == '') {
+ HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//缁撴潫鏃ユ湡
+ } else {
+ HEndDate = $("#HEndDate").val() + " 00:00:00";//缁撴潫鏃ユ湡
+ }
+
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
@@ -435,6 +530,12 @@
var sProcessNo = $("#sProcessNo").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) {
@@ -457,10 +558,60 @@
}
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 params = get_UrlVars();
- if (params[params[0]] != null && detailBar==0) {
+ if (params[params[0]] != null && detailBar == 0) {
+ //姹囨�绘姤琛ㄧ殑鐢熶骇璁㈠崟鍙�
HBillNo = params[params[0]];
+ //璁剧疆鐢熶骇璁㈠崟鍙锋爣绛�
+ $("#HBillNo").val(HBillNo);
+
+ //璁剧疆鏃堕棿涓轰竴涓緢澶х殑鍊硷紝榛樿鎼滅储鎵�鏈夋椂闂寸殑鏄庣粏
+ HBeginDate = "1900-01-01 00:00:00";
+ HEndDate = "2200-01-01 00:00:00";
+
+
detailBar = 1;
} else {
HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -483,8 +634,43 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍒濆鍖栨椂闂�
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd");
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd");
+ laydate.render({
+ elem: '#HBeginDate',
+ type: 'date',
+ fullPanel: true
+ , format: 'yyyy-MM-dd'
+ , value: HBeginDate
+ });
+ laydate.render({
+ elem: '#HEndDate',
+ type: 'date',
+ fullPanel: true
+ , format: 'yyyy-MM-dd'
+ , value: HEndDate
+ });
+ ////鍒濆鍖栨椂闂�
+ //var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ //var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ //laydate.render({
+ // elem: '#HBeginDate',
+ // type: 'datetime',
+ // fullPanel: true
+ // , format: 'yyyy-MM-dd HH'
+ // , value: HBeginDate
+ //});
+ //laydate.render({
+ // elem: '#HEndDate',
+ // type: 'datetime',
+ // fullPanel: true
+ // , format: 'yyyy-MM-dd HH'
+ // , value: HEndDate
+ //});
+
+ //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
$("#HMaterNumber").val("");
$("#HBillNo").val("");
$("#HProductName").val("");
@@ -492,16 +678,44 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render('select');
//form.render()
ColFilter();
sWhere = "";
}
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Kf_ProdProcessEntryReport_DyeColor_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -527,9 +741,11 @@
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
+ var ajaxLoad = layer.load();
ColFilter();
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -540,7 +756,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
@@ -602,8 +818,9 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
+ layer.close(ajaxLoad);
}
-
+
//#endregion
});
--
Gitblit v1.9.1