From a8879ef5fbbe93c4278839f94e56c01531fc1143 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 14 九月 2023 09:31:40 +0800
Subject: [PATCH] 工艺路线 工序流转卡 工序进出站 增加权限 子数据 报表 十张
---
WebTM/views/车间管理/报表分析/Kf_FinalizeOutReport.html | 570 +++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSubList.html | 10
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeArrangement.aspx | 2
WebTM/views/车间管理/报表分析/Kf_ShrinkBrushTeReport.html | 570 +++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement.html | 18
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 14
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 18
WebTM/views/车间管理/报表分析/Kf_DigitalSprayPaintingReport.html | 570 +++++
WebTM/views/index_QiaoYi.html | 15
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillSubList.html | 14
WebTM/views/车间管理/报表分析/sc_ICOMReport.html | 4
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 10
WebTM/views/车间管理/报表分析/Kf_LustringReport.html | 570 +++++
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 111
WebTM/views/车间管理/报表分析/Kf_ShrinkBrushOutReport.html | 570 +++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html | 9
WebTM/views/计划管理/工艺路线/Gy_RoutingBillSubList.html | 10
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 15
WebTM/views/车间管理/报表分析/Kf_ShrinkBrushReport.html | 570 +++++
WebTM/views/车间管理/报表分析/Kf_FinalizeTheDesignOutReport.html | 570 +++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillSubList.html | 20
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 43
WebTM/views/车间管理/报表分析/Kf_HairtipReport.html | 570 +++++
WebTM/views/车间管理/工序流转卡/MES_SampleRecordBillList.html | 2
WebTM/views/车间管理/报表分析/Kf_LustringOutReport.html | 570 +++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 3
WebTM/views/车间管理/报表分析/Kf_PressurizedWaterOutReport.html | 570 +++++
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 10
WebTM/WebTM.csproj | 10
29 files changed, 5,910 insertions(+), 128 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b6c3000..7718270 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -292,10 +292,20 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗WW_EntrustWorkOrderBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillSubList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ColorBlankLustringOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_FinalizeOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_FinalizeTheDesignOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_LustringOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_LustringReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_DigitalSprayPaintingReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_DryFinalizeOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_HairtipReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessEntryReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor_third.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushTeReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_SizingFinalizeOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\SC_DayRkReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ICOMProBarCodeReport.html" />
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index 4f5d878..848bae0 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -507,11 +507,17 @@
<dd>
<a>鍚庢暣涓�鍙�</a>
<dl class="layui-nav-child append" id="append" style="margin: 0 0 0 13px;">
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_ShrinkBrushOutReport.html">缂╁埛鍑虹珯</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_FinalizeOutReport.html">瀹氬瀷鍑虹珯</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_LustringReport.html">鐑厜鍑虹珯</a></dd>
</dl>
</dd>
<dd>
<a>鍚庢暣浜屽彿</a>
<dl class="layui-nav-child append" id="append" style="margin: 0 0 0 13px;">
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_ShrinkBrushReport.html">缂╁埛鍑虹珯</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_FinalizeTheDesignOutReport.html">瀹氬瀷鍑虹珯</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_LustringOutReport.html">鐑厜鍑虹珯</a></dd>
</dl>
</dd>
<dd>
@@ -526,6 +532,15 @@
<dd>
<a>鐗规暣</a>
<dl class="layui-nav-child append" id="append" style="margin: 0 0 0 13px;">
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_ShrinkBrushTeReport.html">缂╁埛鍑虹珯</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>姣涘皷</a>
+ <dl class="layui-nav-child append" id="append" style="margin: 0 0 0 13px;">
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_PressurizedWaterOutReport.html">鍘嬫按鍑虹珯</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_HairtipReport.html">姣涘皷鍑虹珯</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_DigitalSprayPaintingReport.html">鏁扮爜鍠疯姳鍑虹珯</a></dd>
</dl>
</dd>
</dl>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeArrangement.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeArrangement.aspx"
index bd939f9..43ec90a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeArrangement.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeArrangement.aspx"
@@ -12,7 +12,7 @@
//鈽呯壒鍒彁绀衡槄锛�
//涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
- SqlXMLReportData.GenOneRecordset(this, @"select a.HICMOBillNo 鐢熶骇璁㈠崟鍙�,a.HBillNo 鎸囧紩鍗�,m.HNumber 棰滆壊,m.HName 鑹插彿,m.HModel 瑙勬牸,cu.HName 瀹㈡埛,b.sumCount 鍙暟 ,isnull(HmaterOutqty,0) 閲嶉噺
+ SqlXMLReportData.GenOneRecordset(this, @"select a.HICMOBillNo 鐢熶骇璁㈠崟鍙�,a.HBillNo 鎸囧紩鍗�,a.HMainSourceBillNo 娴佽浆鍗″彿,a.HMakeDate 鏃ユ湡,m.HNumber 棰滆壊,m.HName 鑹插彿,m.HModel 瑙勬牸,cu.HName 瀹㈡埛,b.sumCount 鍙暟 ,isnull(HmaterOutqty,0) 閲嶉噺
from Sc_ProcessExchangeBillMain a
left join
( select HICMOBillNo,count(*) sumCount
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 8718dc8..63c469a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -282,23 +282,51 @@
//鐐瑰嚮琛岄�変腑鏁版嵁
table.on('row(mainTable)', function (obj) {
- if (objData != "" && objData.tr.find(':checkbox:first').prop('checked') != obj.tr.find(':checkbox:first').prop('checked')) {
- objData.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- objData.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- layui.each(table.cache.mainTable, function (i, l) {
- if (objData.tr.index() == l.LAY_TABLE_INDEX) {
- l.LAY_CHECKED = false;
- }
- });
- }
+ //if (objData != "" && objData.tr.find(':checkbox:first').prop('checked') != obj.tr.find(':checkbox:first').prop('checked')) {
+ // objData.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ // objData.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ // layui.each(table.cache.mainTable, function (i, l) {
+ // if (objData.tr.index() == l.LAY_TABLE_INDEX) {
+ // l.LAY_CHECKED = false;
+ // }
+ // });
+ //}
+ //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'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ //} else {
+ // obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ // obj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ //}
+ ////mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ //layui.each(table.cache.mainTable, function (i, l) {
+ // if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ // l.LAY_CHECKED = flag;
+ // }
+ //});
+
+ //for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ // if (table.cache["mainTable"][i]["鐢熶骇璁㈠崟鍙�"] != obj.data["鐢熶骇璁㈠崟鍙�"]) {
+ // table.cache["mainTable"][i].LAY_CHECKED = false;
+ // }
+ //}
+ //option.data = table.cache["mainTable"];
+ //table.render(option);
+
+
+ //objData = 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.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
}
//mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
layui.each(table.cache.mainTable, function (i, l) {
@@ -306,17 +334,6 @@
l.LAY_CHECKED = flag;
}
});
-
- for (var i = 0; i < table.cache["mainTable"].length; i++) {
- if (table.cache["mainTable"][i]["鐢熶骇璁㈠崟鍙�"] != obj.data["鐢熶骇璁㈠崟鍙�"]) {
- table.cache["mainTable"][i].LAY_CHECKED = false;
- }
- }
- option.data = table.cache["mainTable"];
- table.render(option);
-
-
- objData = obj;
})
//澶村伐鍏锋爮浜嬩欢
@@ -774,6 +791,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
+ async: false,
data: { "sWhere": HinterID_S.toString(),"num":1 },
success: function (data1) {
if (data1.count == 1) {
@@ -838,6 +856,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
+ async: false,
data: { "sWhere": HinterID_S.toString(), "num": 2 },
success: function (data1) {
if (data1.count == 1) {
@@ -1909,7 +1928,11 @@
//鍒犻櫎琛�
function set_DeleteBill() {
var CheckStatus = table.checkStatus("mainTable");
-
+ var scrollTop = 0;
+ var layuiTable = $('.layui-table-main');
+ if (layuiTable != null && layuiTable.length > 0) {
+ scrollTop = layuiTable[0].scrollTop;
+ }
if (CheckStatus.data.length == 0) {
return layer.msg("璇烽�夋嫨鏁版嵁!")
} else {
@@ -1936,6 +1959,12 @@
get_FastQuery(2);
////閲嶈浇tree
//tree.reload('treeDepartment', {});
+
+ setTimeout(function () {
+ if (layuiTable != null && layuiTable.length > 0) {
+ $('.layui-table-main').scrollTop(scrollTop)
+ }
+ }, 100)
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -1951,12 +1980,17 @@
function set_MoverUp(data) {
if (data.length != 1) {
layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
- } else if (option.data[0]["鐢熶骇璁㈠崟鍙�"] == data[0]["鐢熶骇璁㈠崟鍙�"]) {
+ } else if (option.data[0]["hmainid"] == data[0]["hmainid"]) {
layer.msg("棣栬鏁版嵁鏃犳硶绉诲姩锛�");
} else {
+ var scrollTop = 0;
+ var layuiTable = $('.layui-table-main');
+ if (layuiTable != null && layuiTable.length > 0) {
+ scrollTop = layuiTable[0].scrollTop;
+ }
var tables = [];
for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["鐢熶骇璁㈠崟鍙�"] == data[0]["鐢熶骇璁㈠崟鍙�"]) {
+ if (option.data[i]["hmainid"] == data[0]["hmainid"]) {
tables.push(option.data[i - 1]);
data[0].LAY_CHECKED = true;
option.data[i - 1] = data[0];
@@ -1965,6 +1999,11 @@
break;
}
}
+ setTimeout(function () {
+ if (layuiTable != null && layuiTable.length > 0) {
+ $('.layui-table-main').scrollTop(scrollTop)
+ }
+ }, 100)
}
}
@@ -1972,20 +2011,34 @@
function set_MoverDown(data) {
if (data.length != 1) {
layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
- } else if (option.data[option.data.length - 1]["鐢熶骇璁㈠崟鍙�"] == data[0]["鐢熶骇璁㈠崟鍙�"]) {
+ } else
+ if (option.data[option.data.length - 1]["hmainid"] == data[0]["hmainid"]) {
layer.msg("鏈鏁版嵁鏃犳硶绉诲姩锛�");
} else {
+ var scrollTop = 0;
+ var layuiTable = $('.layui-table-main');
+ if (layuiTable != null && layuiTable.length > 0) {
+ scrollTop = layuiTable[0].scrollTop;
+ }
var tables = [];
for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["鐢熶骇璁㈠崟鍙�"] == data[0]["鐢熶骇璁㈠崟鍙�"]) {
- tables.push(option.data[i + 1]);
- data[0].LAY_CHECKED = true;
- option.data[i + 1] = data[0];
+ if (option.data[i]["hmainid"] == data[0]["hmainid"]) {
+ var len = data.length;
+ tables.push(option.data[i + len]);
+ for (var j = 0; j < len; j++) {
+ data[j].LAY_CHECKED = true;
+ option.data[i + 1 + j] = data[j];
+ }
option.data[i] = tables[0];
table.render(option);
break;
}
}
+ setTimeout(function () {
+ if (layuiTable != null && layuiTable.length > 0) {
+ $('.layui-table-main').scrollTop(scrollTop)
+ }
+ }, 100)
}
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 4a9c8ea..9ffa1dc 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -534,15 +534,15 @@
//, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
, { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
- , { field: 'HQCSchemeID_Fst', title: '棣栦欢妫�楠屾柟妗圛D', hide: true }//f7
- , { field: 'HQCSchemeNumber_Fst', title: '棣栦欢妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
- , { field: 'HQCSchemeName_Fst', title: '棣栦欢妫�楠屾柟妗堝悕绉�', width: 125 }//f7
- , { field: 'HQCSchemeID_Proc', title: '杞簭妫�楠屾柟妗圛D', hide: true }//f7
- , { field: 'HQCSchemeNumber_Proc', title: '杞簭妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
- , { field: 'HQCSchemeName_Proc', title: '杞簭妫�楠屾柟妗堝悕绉�', width: 125}//f7
- , { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
- , { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
- , { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125}//f7
+ //, { field: 'HQCSchemeID_Fst', title: '棣栦欢妫�楠屾柟妗圛D', hide: true }//f7
+ //, { field: 'HQCSchemeNumber_Fst', title: '棣栦欢妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
+ //, { field: 'HQCSchemeName_Fst', title: '棣栦欢妫�楠屾柟妗堝悕绉�', width: 125 }//f7
+ //, { field: 'HQCSchemeID_Proc', title: '杞簭妫�楠屾柟妗圛D', hide: true }//f7
+ //, { field: 'HQCSchemeNumber_Proc', title: '杞簭妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
+ //, { field: 'HQCSchemeName_Proc', title: '杞簭妫�楠屾柟妗堝悕绉�', width: 125}//f7
+ //, { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
+ //, { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
+ //, { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125}//f7
//, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
//, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
@@ -622,19 +622,19 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var HBillSubType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
//var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+ if (HBillSubType == "SUB") {
+ //鏄剧ず宸ュ簭
+ $("#HIDDEN").show();
+ }
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
//$("#HIDDEN").hide();
- if (OperationType == null) {
- OperationType = 1;
- } else if (OperationType == 4) {
- //鏄剧ず宸ュ簭
- $("#HIDDEN").show();
- }
-
+ OperationType = 1;
+
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
@@ -664,11 +664,6 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-
- if (lSourceBillType == "SUB") {
- //鏄剧ず宸ュ簭
- $("#HIDDEN").show();
- }
//绂佺敤缁勭粐閫夐」
$("#HOrgID").attr("disabled", true);
@@ -1747,7 +1742,7 @@
url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": HBillSubType },
success: function (d) {
//alert(JSON.stringify(d.data[0]))
@@ -1871,7 +1866,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
//var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + lSourceBillType;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + HBillSubType;
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 562b2d2..9143c66 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -390,7 +390,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType":"3301" },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -474,7 +474,7 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
- sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType=''"
+ sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType<>'SUB'"
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -488,7 +488,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=3301&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -505,7 +505,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=4&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=SUB&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -527,7 +527,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -551,7 +551,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
type: "GET",
- data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -594,7 +594,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -623,7 +623,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
success: function (result) {
if (result.count == 1) {
get_FastQuery();
@@ -657,7 +657,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": ""},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
index 3b20e4a..5207dfb 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
@@ -512,6 +512,7 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
+ sWhere += " and HBillSubType<>'SUB' ";
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -525,7 +526,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=3301&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -548,7 +549,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -572,7 +573,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
type: "GET",
- data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -615,7 +616,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillSubList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillSubList.html"
index abdd1d1..36d5e6e 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillSubList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillSubList.html"
@@ -390,7 +390,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -505,7 +505,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=4&linterid=&HSouceBillType=SUB&linteridSub=-1'
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=SUB&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -551,7 +551,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
type: "GET",
- data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -623,7 +623,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (result) {
if (result.count == 1) {
get_FastQuery();
@@ -657,7 +657,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index c1d6f0d..80720d7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -512,7 +512,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType":"3791"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -546,7 +546,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -578,7 +578,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/CloseCj_StationOutBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3791"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -810,7 +810,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
//success: function (data1) {
// if (data1.count == 0) {
// option.data = [];
@@ -905,7 +905,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
type: "GET",
- data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"] },
+ data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
success: function (result) {
if (result.count == 1) {
get_FastQuery();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSubList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSubList.html"
index cdb086f..314bb68 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSubList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSubList.html"
@@ -512,7 +512,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "SUB"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -546,7 +546,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "SUB"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -578,7 +578,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/CloseCj_StationOutBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "SUB"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -810,7 +810,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],"HBillSubType":"SUB" },
//success: function (data1) {
// if (data1.count == 0) {
// option.data = [];
@@ -905,7 +905,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
type: "GET",
- data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"] },
+ data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (result) {
if (result.count == 1) {
get_FastQuery();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_SampleRecordBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_SampleRecordBillList.html"
index d550f14..5136f89 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_SampleRecordBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_SampleRecordBillList.html"
@@ -484,7 +484,7 @@
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
- ColFilter();
+
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
index 4a7fa6f..5b617d8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
@@ -35,9 +35,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <label class="layui-form-label">娴佽浆鍗″彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -47,9 +47,9 @@
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrgName" id="HOrgName">
+ <input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
<div class="layui-inline">
@@ -272,7 +272,7 @@
$("#HNumber").val("");
$("#HName").val("");
$("#HModel").val("");
- $("#HOrgName").val("");
+ $("#HProcExchBillNo").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -443,7 +443,7 @@
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var HModel = $("#HModel").val();
- var HOrgName = $("#HOrgName").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -477,8 +477,8 @@
if (HModel) {
sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
}
- if (HOrgName) {
- sWhere += " and 缁勭粐鍚嶇О like '%" + HOrgName + "%'";
+ if (HProcExchBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HProcExchBillNo + "%'";
}
get_Display2(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -580,7 +580,7 @@
// 鏍戠姸鍥炬煡璇�
function get_Display_Tree() {
- var sql =" where 1=1 and HName like'%鍒嗘嫞绾�%'"
+ var sql =" where 1=1 and HName like'%绾�%'"
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Gy_Source/Gy_SourceTreeList',
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index cb905c2..1100c88 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -923,6 +923,7 @@
var linterid = params[params[1]];//婧愬崟id
var HEntryID = params[params[2]];//婧愬崟瀛恑d
var HSouceBillType = params[params[3]];//婧愬崟绫诲瀷 鍦ㄧ被鍨� 5 宸ュ簭id
+ var HproID = params[params[4]];//婧愬崟绫诲瀷 鍦ㄧ被鍨� 5 宸ュ簭id
}
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -1047,7 +1048,7 @@
set_EditForm(linterid);
- var sWhere = "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=" + HSouceBillType +" and 榛樿宸ヨ壓='1'";
+ var sWhere = "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=" + HproID +" and 榛樿宸ヨ壓='1'";
getRoutingBillList(sWhere);
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -1725,7 +1726,7 @@
form.on('submit(btnRoutingBill)', function () {
var HProID = 0;
if (OperationType == 5) {
- HProID = HSouceBillType;
+ HProID = HproID;
}
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1750,11 +1751,17 @@
});
function getRoutingBill(HBillNo) {
+ var HRoutType = "";
+ if (HSouceBillType == "3772") {
+ HRoutType = "3301";
+ } else {
+ HRoutType = "SUB";
+ }
$.ajax({
type: "get",
url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
async: true,
- data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'" + " and 宸ュ簭浠ｇ爜 !='" + 9999 + "'", "user": sessionStorage["HUserName"] },
+ data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'" + " and 宸ュ簭浠ｇ爜 !='" + 9999 + "'", "user": sessionStorage["HUserName"], "HBillSubType": HRoutType },
success: function (result) {
var data = result.data;
var Tablerow = [];
@@ -1933,7 +1940,7 @@
if (OperationType == 3) {
flag = "xg";
}
- var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + OperationType;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + HSouceBillType;
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 58a4740..13c13fc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -1013,7 +1013,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3772" },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -1228,7 +1228,7 @@
, area: ['100%', '100%']
, title: '宸ュ簭瀛愭祦杞崱-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=5&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HproID=' + HProcID
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=5&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=SUB&HproID=' + HProcID
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -1692,7 +1692,7 @@
, area: ['100%', '100%']
, title: '宸ュ簭娴佽浆鍗�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType=3772'
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -1740,7 +1740,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID.toString(), "HPRDORGID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID.toString(), "HPRDORGID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"], "HSouceBillType":"3772" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1778,7 +1778,7 @@
, area: ['100%', '100%']
, title: '宸ュ簭娴佽浆鍗�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=4&linterid=' + linterid + '&HEntryID=&HSouceBillType='
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=4&linterid=' + linterid + '&HEntryID=&HSouceBillType=3772'
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -2061,7 +2061,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ProcessExchangeBill/CheckSc_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3772"},
success: function (result) {
if (result.count == 1) {
get_FastQuery();
@@ -2095,7 +2095,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ProcessExchangeBill/CloseSc_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3772" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillSubList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillSubList.html"
index 27e6cb6..a64c56c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillSubList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillSubList.html"
@@ -180,8 +180,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_FormChange"><i class="layui-icon layui-icon-file-b"></i>鍗曟嵁鍙樻洿</button>
</div>
@@ -1013,7 +1013,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "SUB"},
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -1228,7 +1228,7 @@
, area: ['100%', '100%']
, title: '宸ュ簭瀛愭祦杞崱-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=5&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HproID=' + HProcID
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=5&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=SUB&HproID=' + HProcID
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -1272,7 +1272,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.data.length != 0) {
@@ -1692,7 +1692,7 @@
, area: ['100%', '100%']
, title: '宸ュ簭娴佽浆鍗�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType=SUB'
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -1740,7 +1740,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID.toString(), "HPRDORGID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID.toString(), "HPRDORGID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"], "HSouceBillType": "SUB" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1778,7 +1778,7 @@
, area: ['100%', '100%']
, title: '宸ュ簭娴佽浆鍗�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=4&linterid=' + linterid + '&HEntryID=&HSouceBillType='
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=4&linterid=' + linterid + '&HEntryID=&HSouceBillType=SUB'
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -2058,7 +2058,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ProcessExchangeBill/CheckSc_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"],"HBillSubType":"SUB"},
success: function (result) {
if (result.count == 1) {
get_FastQuery();
@@ -2092,7 +2092,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ProcessExchangeBill/CloseSc_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "SUB"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_Mul.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_Mul.html"
index ddc7207..a0cc714 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_Mul.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_Mul.html"
@@ -763,6 +763,7 @@
data: {
"sWhere": " and hicmointerid=" + linterid + " and HICMOEntryID=" + HEntryID + " and HPRDORGID=" + sessionStorage["OrganizationID"]
, "user": sessionStorage["HUserName"]
+ , "HBillSubType":"3772"
},
success: function (data1) {
if (data1.count == 1) {
@@ -785,7 +786,7 @@
type: "get",
url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
async: true,
- data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "' and 宸ュ簭浠ｇ爜 !='" + 9999 + "'", "user": sessionStorage["HUserName"] },
+ data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "' and 宸ュ簭浠ｇ爜 !='" + 9999 + "'", "user": sessionStorage["HUserName"], "HBillSubType":"3301"},
success: function (result) {
var data = result.data;
var Tablerow = [];
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 792fb4b..e71b0ac 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -423,7 +423,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/get_Display',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType":"3790"},
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -610,7 +610,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/del_StationInBill',
type: "GET",
- data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"] },
+ data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3790"},
success: function (result) {
if (result.count == 1) {
get_FastQuery();
@@ -702,7 +702,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3790"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -733,7 +733,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3790"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -765,7 +765,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/CloseCj_StationInBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3790"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillSubList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillSubList.html"
index f2e9b32..c42571e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillSubList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillSubList.html"
@@ -129,8 +129,8 @@
<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="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -423,7 +423,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/get_Display',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -610,7 +610,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/del_StationInBill',
type: "GET",
- data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"] },
+ data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (result) {
if (result.count == 1) {
get_FastQuery();
@@ -702,7 +702,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillSubType": "SUB"},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -733,7 +733,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -765,7 +765,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/CloseCj_StationInBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "SUB" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
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_DigitalSprayPaintingReport.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_DigitalSprayPaintingReport.html"
new file mode 100644
index 0000000..1285664
--- /dev/null
+++ "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_DigitalSprayPaintingReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_DigitalSprayPaintingReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_DigitalSprayPaintingReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_FinalizeOutReport.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_FinalizeOutReport.html"
new file mode 100644
index 0000000..ebf6298
--- /dev/null
+++ "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_FinalizeOutReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_FinalizeOutReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_FinalizeOutReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_FinalizeTheDesignOutReport.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_FinalizeTheDesignOutReport.html"
new file mode 100644
index 0000000..b2d6673
--- /dev/null
+++ "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_FinalizeTheDesignOutReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_FinalizeTheDesignOutReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_FinalizeTheDesignOutReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_HairtipReport.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_HairtipReport.html"
new file mode 100644
index 0000000..dd7f8ed
--- /dev/null
+++ "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_HairtipReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_HairtipReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_HairtipReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_LustringOutReport.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_LustringOutReport.html"
new file mode 100644
index 0000000..94cfc6d
--- /dev/null
+++ "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_LustringOutReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_LustringOutReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_LustringOutReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_LustringReport.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_LustringReport.html"
new file mode 100644
index 0000000..d400211
--- /dev/null
+++ "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_LustringReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_LustringReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_LustringReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_PressurizedWaterOutReport.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_PressurizedWaterOutReport.html"
new file mode 100644
index 0000000..6bbdb11
--- /dev/null
+++ "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_PressurizedWaterOutReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_PressurizedWaterOutReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_PressurizedWaterOutReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_ShrinkBrushOutReport.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_ShrinkBrushOutReport.html"
new file mode 100644
index 0000000..cbac062
--- /dev/null
+++ "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_ShrinkBrushOutReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_ShrinkBrushOutReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_ShrinkBrushOutReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_ShrinkBrushReport.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_ShrinkBrushReport.html"
new file mode 100644
index 0000000..56402b3
--- /dev/null
+++ "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_ShrinkBrushReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_ShrinkBrushReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_ShrinkBrushReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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_ShrinkBrushTeReport.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_ShrinkBrushTeReport.html"
new file mode 100644
index 0000000..6cba278
--- /dev/null
+++ "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_ShrinkBrushTeReport.html"
@@ -0,0 +1,570 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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-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="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-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>
+ </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </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="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>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Kf_ShrinkBrushTeReport";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ 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 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ 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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/ProdProcessSumReport/Kf_PressurizedWaterOutReport',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "HBillType":"Kf_ShrinkBrushTeReport" },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ 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 (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
+ };
+ table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鍑虹珯鍚堟牸鏁伴噺"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
+ layer.close(wait);
+ }
+ else {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ $("#SumHMaterOutQty").val("");
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ 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 hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ 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 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 浜у搧浠ｇ爜 = '" + HMaterNumber + "' and 浜у搧鍚嶇О='" + HProductName + "' and 瑙勬牸鍨嬪彿='" + HProductModel+"'";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 = '" + HBillNo + "'";
+ }
+ if (com != "") {
+ sWhere += com;
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ 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("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ //form.render()
+ ColFilter();
+ sWhere = "";
+ }
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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/sc_ICOMReport.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/sc_ICOMReport.html"
index 3715bcf..631e4e0 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/sc_ICOMReport.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/sc_ICOMReport.html"
@@ -219,7 +219,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));
//鍔犺浇鏁版嵁鍒扮綉鏍�
@@ -368,7 +368,7 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
//鍒濆鍖栨椂闂�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));
$("#HMaterNumber").val("");
$("#HBillNo").val("");
--
Gitblit v1.9.1