From 518d86b9bd8b219d658541470b2234aed4d84cbc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 22 九月 2023 17:30:07 +0800
Subject: [PATCH] (关于下推 批量下推选到子工艺路线 添加三张报表 乔一) 乔一 生产入库报表，目前性能很低，需要优化速度； 工序流转卡列表，生产订单列表，物料列表，点击 刷新按钮时，不要 清空过滤条件，按原来的过滤条件来 过滤。 生产订单列表里， 下推流转卡时，可以多选， 点击 下推后，根据选择的行数， 工序出站汇报单批量汇报模块里，增加工序过滤功能； 增加 合格数量，报废品数量 排缸条码回车
---
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 1
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 4
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 5
WebTM/views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul_RYQ.html | 90 +
WebTM/views/车间管理/报表分析/sc_ICOMRKBanReport.html | 544 +++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillSubList.html | 5
WebTM/views/index_QiaoYi.html | 3
WebTM/views/车间管理/报表分析/Kf_StereoscopicFlowerOutReport.html | 570 +++++++++++++
WebTM/views/车间管理/报表分析/SemiFinishedProductsReport.html | 541 +++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 2
WebTM/views/车间管理/报表分析/sc_ICOMReport.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 95 +-
WebTM/WebTM.csproj | 4
WebTM/views/车间管理/报表分析/Kf_EmbossingOutReport.html | 570 +++++++++++++
15 files changed, 2,352 insertions(+), 86 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e06c81c..d2a3d5d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -296,6 +296,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗WW_EntrustWorkOrderBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillSubList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ColorBlankLustringOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_EmbossingOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_FinalizeOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_FinalizeTheDesignOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_LustringOutReport.html" />
@@ -311,9 +312,11 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor_third.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushTeReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_SizingFinalizeOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_StereoscopicFlowerOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\SC_DayRkReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ICOMProBarCodeReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMRKBanReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMRKReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPSumReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPReport.html" />
@@ -1329,6 +1332,7 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\ProductionPlanReportList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_StationOutSumReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\SemiFinishedProductsReport.html" />
<Content Include="views\杞﹂棿绠＄悊\杞﹂棿鏀舵枡\JIT_SendGoodsBillList.html" />
<Content Include="views\閲囪喘绠＄悊\鎶ヤ环鍗昞Sup_QuotePriceBillEdit.html" />
<Content Include="views\閲囪喘绠＄悊\鎶ヤ环鍗昞Sup_QuotePriceBillList.html" />
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index 848bae0..28edf4d 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -487,6 +487,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/sc_ICOMReport.html">(鎸夌敓浜ц鍗�)瀹㈡埛璁㈠崟鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/sc_ICOMRKReport.html">鐢熶骇鍏ュ簱鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/SC_DayRkReport.html">鐢熶骇鏃ヨ</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/SemiFinishedProductsReport.html">鍗婃垚鍝佹姤琛�</a></dd>
</dl>
</dd>
<dd>
@@ -533,6 +534,8 @@
<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>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_EmbossingOutReport.html">鍘嬭姳鍑虹珯</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_StereoscopicFlowerOutReport.html">绔嬩綋鑺卞瀷鏈哄嚭绔�</a></dd>
</dl>
</dd>
<dd>
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/Gy_Material.html" "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/Gy_Material.html"
index b7b3539..c392a6f 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/Gy_Material.html"
+++ "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/Gy_Material.html"
@@ -677,8 +677,9 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
+ //set_ClearQuery();
+ //get_Display(sWhere);
+ get_FastQuery();
}
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index 6823a51..bea5e64 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -254,6 +254,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#Organization").append(Organization);
+ $("#Organization").val(sessionStorage["OrganizationID"]);
form.render('select');
}
layer.closeAll("loading");
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 98ac8eb..53b7399 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -34,7 +34,7 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HModel" id="HModel">
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鐘舵��</label>
<div class="layui-input-block">
@@ -59,7 +59,7 @@
<!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
<option value="鍏ㄩ儴" selected="selected">鍏ㄩ儴</option>
<option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
- <option value="鏈笅鎺�" >鏈笅鎺�</option>
+ <option value="鏈笅鎺�">鏈笅鎺�</option>
</select>
</div>
</div>
@@ -99,14 +99,14 @@
<input type="text" class="layui-input" name="HBillType" id="HBillType">
</div>
</div>
-
+
<div class="layui-inline">
<label class="layui-form-label">鍞竴ID</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HERPID" id="HERPID">
</div>
</div>
- </div>
+ </div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -178,9 +178,9 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Xc"><i class="layui-icon layui-icon-form"></i>涓嬫煡</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
<div class="layui-btn-container" id="HideButtonList">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -244,11 +244,11 @@
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
//鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
-
+
//鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
-
+
//鑾峰彇杞﹂棿鍒�
var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
$.ajax({
@@ -295,7 +295,7 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//涓嬫帹
- case 'set_ShowBill': set_ShowBill();
+ case 'set_ShowBill': set_ShowBill();
break;
//鎵归噺涓嬫帹
case 'set_ShowBill_pl': set_ShowBill_pl(); //set_ShowBill_pl
@@ -334,7 +334,7 @@
case 'set_CancelCloseBill': set_CancelCloseBill();
break;
//鍒犻櫎
- case 'set_DeleteBill': set_DeleteBill();
+ case 'set_DeleteBill': set_DeleteBill();
break;
//涓嬫煡
case 'set_Xc': set_Xc();
@@ -418,7 +418,7 @@
set_InitGrid();
//鏌ヨ
get_FastQuery();
-
+
}
//#endregion
@@ -523,7 +523,7 @@
, { field: '鏃ユ湡', title: '鏃ユ湡' }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О'}
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '瀹㈡埛', title: '瀹㈡埛' }
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
, { field: 'HWidth', title: '闂ㄥ箙' }
@@ -549,10 +549,10 @@
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
, { field: '鍞竴ID', title: '鍞竴ID', sort: true, }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜' }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜' }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', }
, { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜' }
- , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', }
+ , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', }
, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
, { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
@@ -561,7 +561,7 @@
//, { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true }
//, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
//, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
- , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true }
+ , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true }
, { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', sort: true }
, { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true }
, { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true }
@@ -574,18 +574,18 @@
//, { field: 'hunitid', title: 'hunitid', hide: true }
//, { field: 'hempid', title: 'hempid' , hide: true}
//, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
-
+
//, { field: 'hcusid', title: 'hcusid', hide: true }
//, { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', hide: true }
-
+
//, { field: 'HCenterID', title: 'HCenterID' , hide: true}
//, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', hide: true}
//, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', hide: true}
//, { field: 'hbomid', title: 'hbomid' , hide: true}
//, { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�', hide: true }
//, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
- , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜'}
- , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎'}
+ , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜' }
+ , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎' }
//, { field: 'hsubid', title: 'hsubid' , hide: true}
//, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true}
//, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', hide: true}
@@ -636,7 +636,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
+ var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
@@ -674,7 +674,7 @@
}
//浼犻�掔殑鍙傛暟涓嶄负NAN
- if (!isNaN(HDeptID) && HDeptName==0) {
+ if (!isNaN(HDeptID) && HDeptName == 0) {
HDeptName = HDeptID;
}
if (!isNaN(HDeptID)) {
@@ -707,8 +707,8 @@
if (HMaterName) {
sWhere += " and 浜у搧浠ｇ爜 like '%" + HMaterName + "%'";
}
- if (HDeptName && HDeptName!=0) {
- sWhere += " and HDeptID = " + HDeptName ;
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = " + HDeptName;
}
if (HStatus && HStatus != 0) {
sWhere += " and 鐘舵�� like '%" + HStatus + "%'";
@@ -718,7 +718,7 @@
}
if (HErpID) {
sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
- }
+ }
if (HModel) {
sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
}
@@ -774,18 +774,21 @@
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (data.length === 1) {
- var linterid = data[0].hmainid.toString();
- var HEntryID = data[0].HEntryID.toString();
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType=3772'
- })
+ if (data.length != 0) {
+
+ for (var i = 0; i < data.length; i++) {
+ var linterid = data[i].hmainid.toString();
+ var HEntryID = data[i].HEntryID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3772'
+ })
+ }
} else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
}
}
@@ -821,11 +824,11 @@
var HEntryID = data[i].HEntryID.toString();
hmainid.push(linterid + "|" + HEntryID);
}
-
+
$.ajax({
url: GetWEBURL() + '/Sc_ICMOBill/Sc_ICMOReportBill_dh',
type: "GET",
- data: { "HInterID": hmainid.toString(), "user": sessionStorage["HUserName"], "OrganizationID": sessionStorage["OrganizationID"] },
+ data: { "HInterID": hmainid.toString(), "user": sessionStorage["HUserName"], "OrganizationID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
layer.alert(result.Message);
@@ -873,7 +876,7 @@
, area: ['100%', '100%']
, title: '鐢熶骇璁㈠崟缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit.html?OperationType=3&linterid=' + linterid +''
+ , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit.html?OperationType=3&linterid=' + linterid + ''
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -1011,7 +1014,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
type: "GET",
- data: { "HInterID": hmainid, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 }, function () {
@@ -1065,7 +1068,7 @@
}
}
-
+
//瀵煎叆
function set_Excel() {
@@ -1111,10 +1114,10 @@
});
}
//#endregion
-
+
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
+ //set_ClearQuery();
get_FastQuery();
}
//#endregion
@@ -1127,7 +1130,7 @@
var PrintIds = "";
if (checkStatus.data.length >= 1) {
for (var i = 0; i < data.length; i++) {
- PrintIds += data[i].hmainid+"0"+data[i].HEntryID + ","
+ PrintIds += data[i].hmainid + "0" + data[i].HEntryID + ","
}
PrintIds = PrintIds.substring(0, PrintIds.length - 1);
layer.open({
@@ -1470,7 +1473,7 @@
//浠ヤ笂鏄痩ayui妯″潡
-
+
});
</script>
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/Sc_StationOutBill_Mul_RYQ.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/Sc_StationOutBill_Mul_RYQ.html"
index b6d126d..68c9c3b 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/Sc_StationOutBill_Mul_RYQ.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/Sc_StationOutBill_Mul_RYQ.html"
@@ -38,8 +38,19 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <h2></h2>
+ <div class="layui-col-xs1 layui-inline">
+ <h2></h2>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcNumber" id="HProcNumber">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkHProc" id="get_checkHProc" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>鐗╂枡</label>
@@ -238,6 +249,8 @@
, { field: '浠ｇ爜', title: '浠ｇ爜' }
, { field: '鎵瑰彿', title: '鎵瑰彿' }
, { field: '缁撳瓨鏁伴噺', title: '缁撳瓨鏁伴噺' }
+ , { field: 'HQty', title: '鍚堟牸鏁伴噺', edit: 'text' }
+ , { field: 'HWasterQty', title: '鎶ュ簾鏁伴噺', edit: 'text', value: "0" }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
, { field: 'HPriceQty', title: 'HPriceQty', hide: true }
, { field: 'HPlanQty', title: 'HPlanQty', hide: true }
@@ -781,37 +794,12 @@
form.on('submit(Serach)', function (data) {
var HMaterName = $("#HMaterName").val();
+ var HProcNumber = $("#HProcNumber").val();
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/LEMS/Sc_StationOutBill_Mul_RYQ',
type: "GET",
- data: { "HMaterName": HMaterName, "HOrgID": sessionStorage["OrganizationID"] },
- success: function (data1) {
- if (data1.count == 1) {
- option1.data = data1.data;
- table.render(option1);
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- });
-
-
-
- form.on('submit(Serach)', function (data) {
- var HMaterName = $("#HMaterName").val();
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/LEMS/Sc_StationOutBill_Mul_RYQ',
- type: "GET",
- data: { "HMaterName": HMaterName, "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "HMaterName": HMaterName, "HProcNumber": HProcNumber, "HOrgID": sessionStorage["OrganizationID"] },
success: function (data1) {
if (data1.count == 1) {
option1.data = data1.data;
@@ -835,6 +823,10 @@
var num = [];
for (var i = 0; i < table.cache["mainTable1"].length; i++) {
if (table.cache["mainTable1"][i] != "") {
+ if (parseFloat(table.cache["mainTable1"][i]["HQty"]) + parseFloat(table.cache["mainTable1"][i]["HWasterQty"]) > parseFloat(table.cache["mainTable1"][i]["缁撳瓨鏁伴噺"])) {
+ layer.msg("绗�" + (i + 1) + "琛�,鎶ュ簾鍔犲悎鏍兼暟閲忚秴鍑虹粨瀛樻暟閲�!");
+ return false;
+ }
table.cache["mainTable1"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable1"][i])
}
@@ -842,8 +834,7 @@
//var sSubStr = JSON.stringify(num);
-
-
+ return false;
var HEmpName1 = $("#HEmpName1").val();
var HEmpName2 = $("#HEmpName2").val();
@@ -1133,6 +1124,43 @@
})
});
+ //閫夋嫨浜у搧寮圭獥
+ form.on('submit(get_checkHProc)', function () {//宸ュ簭
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '宸ュ簭'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
+
//#region 鑾峰彇娴佽浆鍗′俊鎭�
function txtHBarCode_KeyDown(HBarCode) {
var index = layer.load();
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 7be7933..f5beb7c 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"
@@ -2502,7 +2502,7 @@
HLZQty = data.娴佽浆鍗℃暟閲�;
- var sWhere = "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] +" and 榛樿宸ヨ壓='1'";
+ var sWhere = "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] +" and 榛樿宸ヨ壓='1' and HMainProcID=0 ";
getRoutingBillList(sWhere);
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 d676107..81e0407 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"
@@ -2078,8 +2078,8 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
+ //set_ClearQuery();
+ 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/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 96dab35..46fbdbf 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"
@@ -2075,8 +2075,9 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
+ //set_ClearQuery();
+ //get_Display(sWhere);
+ 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/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 a0cc714..5645f55 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"
@@ -734,7 +734,7 @@
url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
async: true,
data: {
- "sWhere": "and HMaterID=" + $("#HMaterID2").val() + " and HOrgID = " + sessionStorage["OrganizationID"]
+ "sWhere": "and HMaterID=" + $("#HMaterID2").val() + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=0 "
, "user": sessionStorage["HUserName"]
},
success: function (result) {
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_EmbossingOutReport.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_EmbossingOutReport.html"
new file mode 100644
index 0000000..a170863
--- /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_EmbossingOutReport.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_EmbossingOutReport";
+ //#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_EmbossingOutReport" },
+ 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_StereoscopicFlowerOutReport.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_StereoscopicFlowerOutReport.html"
new file mode 100644
index 0000000..4849d2a
--- /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_StereoscopicFlowerOutReport.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_StereoscopicFlowerOutReport";
+ //#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_StereoscopicFlowerOutReport" },
+ 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/SemiFinishedProductsReport.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/SemiFinishedProductsReport.html"
new file mode 100644
index 0000000..7624a68
--- /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/SemiFinishedProductsReport.html"
@@ -0,0 +1,541 @@
+锘�<!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-form layui-inline" style="position:relative;top:10px;">
+ <label class="layui-form-label" style="width:30px">鏃ユ湡</label>
+ <div class="layui-form-item layui-inline">
+
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
+ </div>
+ <label class="layui-form-label" style="width:25px">-</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
+ </div>
+ </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-form layui-inline">
+ <label class="layui-form-label" style="width: 80px;">鎬婚噸閲�(鍗冨厠)</label>
+ <div class="layui-input-block" style="margin-left: 112px;">
+ <input type="text" class="layui-input" name="HWeight" id="HWeight" style=" width: 120px; background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-form layui-inline">
+ <label class="layui-form-label" style="width: 42px;">鎬诲尮鏁�</label>
+ <div class="layui-input-block" style="margin-left: 74px;">
+ <input type="text" class="layui-input" name="HNumberOH" id="HNumberOH" style=" width: 120px; background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-form layui-inline">
+ <label class="layui-form-label" style="width: 95px;">鎬诲疄闄呮暟閲�(绫�)</label>
+ <div class="layui-input-block" style="margin-left: 128px;">
+ <input type="text" class="layui-input" name="HActualHQty" id="HActualHQty" style=" width: 120px; background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;margin-bottom: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="HCustomerName" id="HCustomerName">
+ </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="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="HProductName" id="HProductName">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <table class="" id="mainTable1" lay-filter="mainTable1"></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 = "SemiFinishedProductsReport";
+ var HWeight = 0;
+ var HNumberOH = 0;
+ var HActualHQty = 0;
+
+ //#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('rowDouble(mainTable)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable1)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ laydate.render({
+ elem: '#HBeginDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH:mm'
+ , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
+ });
+ laydate.render({
+ elem: '#HEndDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH:mm'
+ , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
+ });
+
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ // DisPlay_HideColumn();
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/MaterOutEntryReport/SemiFinishedProductsReportList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "num": 1},
+ 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', totalRowText: '鍚堣-灏忔瘺鐨垚鍝�' });
+ 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].name == '瀹為檯鏁伴噺(绫�)' || data[i].name == '鍖规暟(浠�)' || data[i].name == '閲嶉噺(鍗冨厠)' ) {
+ 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 // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , height: 500
+ , totalRow: true //寮�鍚悎璁�
+ , cols: [col]
+ , data: data1.data
+ , done: function (obj) {
+ if (obj.data.length != 0) {
+ for (var i = 0; i < obj.data.length; i++) {
+ HWeight += obj.data[i]["閲嶉噺(鍗冨厠)"];
+ HNumberOH += obj.data[i]["鍖规暟(浠�)"];
+ HActualHQty += obj.data[i]["瀹為檯鏁伴噺(绫�)"];
+ }
+ }
+ }
+ };
+ table.render(option);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
+ }
+
+ function get_Display_1(sWhere) {
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/MaterOutEntryReport/SemiFinishedProductsReportList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere,"num":2 },
+ 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', totalRowText: '鍚堣-澶ф瘺鐨垚鍝�' });
+ 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].name == '瀹為檯鏁伴噺(绫�)' || data[i].name == '鍖规暟(浠�)' || data[i].name == '閲嶉噺(鍗冨厠)') {
+ 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: '#mainTable1'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , height: 500
+ , totalRow: true //寮�鍚悎璁�
+ , cols: [col]
+ , data: data1.data
+ , done: function (obj) {
+ if (obj.data.length != 0) {
+ for (var i = 0; i < obj.data.length; i++) {
+ HWeight += obj.data[i]["閲嶉噺(鍗冨厠)"];
+ HNumberOH += obj.data[i]["鍖规暟(浠�)"];
+ HActualHQty += obj.data[i]["瀹為檯鏁伴噺(绫�)"];
+ }
+ }
+ }
+ };
+ table.render(option);
+ $("#HWeight").val(HWeight.toFixed(2));
+ $("#HNumberOH").val(HNumberOH.toFixed(2));
+ $("#HActualHQty").val(HActualHQty.toFixed(2));
+ HWeight = 0;
+ HNumberOH = 0;
+ HActualHQty = 0;
+
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HCustomerName = $("#HCustomerName").val(); //鍗曟嵁鍙�
+ var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
+
+ if (HBeginDate != "" && HEndDate != "") {
+
+ } else {
+ HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm");
+ HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm");
+ }
+
+ sWhere = {
+ HBeginDate: HBeginDate,
+ HMaterNumber: HMaterNumber,
+ HCustomerName: HCustomerName,
+ HProductName: HProductName,
+ HEndDate: HEndDate
+ };
+
+ get_Display(JSON.stringify(sWhere));
+ get_Display_1(JSON.stringify(sWhere));
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //鍙屽嚮璺宠浆鐢熶骇鍏ュ簱鎶ヨ〃
+ function btnrowDouble(obj) {
+
+ var HProcExchBillNo = obj["宸ヨ壓鍗曞彿"];
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
+ if (HProcExchBillNo == "" || HProcExchBillNo == null) {
+ return layer.alert("鏃犵敓浜у叆搴撴槑缁�,鏃犳硶鏌ョ湅!", { icon: 5 });
+ }
+
+ var UrlName = encodeURI('OperationType=1&HProcExchBillNo=' + HProcExchBillNo + '&HBeginDate=' + HBeginDate + '&HEndDate=' + HEndDate);
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇鍏ュ簱鎶ヨ〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/sc_ICOMRKBanReport.html?' + UrlName, 'yes']
+ })
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ laydate.render({
+ elem: '#HBeginDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH:mm'
+ , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
+ });
+ laydate.render({
+ elem: '#HEndDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH:mm'
+ , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
+ });
+ $("#HMaterNumber").val("");
+ $("#HCustomerName").val("");
+ $("#HProductName").val("");
+ 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() {
+ $.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_ICOMRKBanReport.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_ICOMRKBanReport.html"
new file mode 100644
index 0000000..d7996aa
--- /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/sc_ICOMRKBanReport.html"
@@ -0,0 +1,544 @@
+锘�<!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-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" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
+ </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" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
+ </div>
+ </div>
+ </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>
+ <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-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="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:10px 0px">
+ <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 = "sc_ICOMRKBanReport";
+ var HProcExchBillNo = "";
+ var HBeginDate_u = "";
+ var HEndDate_u = "";
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]];
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+ if (!isNaN(OperationType)) {
+ HProcExchBillNo = params[params[1]];
+ HBeginDate_u = decodeURI(params[params[2]]);
+ HEndDate_u = decodeURI(params[params[3]]);
+ } else {
+ HBeginDate_u = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm");
+ HEndDate_u = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm");
+ }
+
+
+ //#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() {
+ //鍒濆鍖栨椂闂�
+ laydate.render({
+ elem: '#HBeginDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH:mm'
+ , value: HBeginDate_u
+ });
+ laydate.render({
+ elem: '#HEndDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH:mm'
+ , value: HEndDate_u
+ });
+
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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) {
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/MaterOutEntryReport/sc_ICOMRKBanReport",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere },
+ 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', totalRowText: '鍚堣' });
+ 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].name == '瀹為檯鏁伴噺(绫�)' || data[i].name == '鎵ｇ偣鏁�(鍏�)' || data[i].name == '閲嶉噺(鍗冨厠)' ) {
+ 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 // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , height: 'full-70'
+ , totalRow: true //寮�鍚悎璁�
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
+ var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
+
+ if (HProcExchBillNo != "") {
+ sWhere += " and 娴佽浆鍗″彿 ='" + HProcExchBillNo + "'";
+ HBeginDate = HBeginDate_u;
+ HEndDate = HEndDate_u;
+ }
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
+ } else {
+ sWhere += " and 鏃ユ湡 between '" + Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm") + "' and '" + Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm") + "' ";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 鐗╂枡浠ｇ爜='" + HMaterNumber + "' ";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 娴佽浆鍗″彿='" + HBillNo + "' ";
+ }
+
+ if (HProductName != "") {
+ sWhere += " and 鐗╂枡鍚嶇О='" + HProductName + "' ";
+ }
+
+ if (HProductModel != "") {
+ sWhere += " and 瑙勬牸鍨嬪彿='" + HProductModel + "' ";
+ }
+
+ //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
+ 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 + ")";
+ }
+ sWhere += com;
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ laydate.render({
+ elem: '#HBeginDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH:mm'
+ , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
+ });
+ laydate.render({
+ elem: '#HEndDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH:mm'
+ , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
+ });
+ $("#HMaterNumber").val("");
+ $("#HBillNo").val("");
+ $("#HProductName").val("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ 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 });
+ }
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#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 631e4e0..75bb1ad 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"
@@ -248,7 +248,7 @@
url: GetWEBURL() + "/MaterOutEntryReport/sc_ICOMReportList",
type: "GET",
async: false,
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "HBeginDate": $("#HBeginDate").val(), "HEndDate": $("#HEndDate").val()},
success: function (data1) {
if (data1.count == 1) {
--
Gitblit v1.9.1