From a108ec7335b74d5617a809540bcf63b1387f0729 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 17 七月 2023 10:54:24 +0800
Subject: [PATCH] 瑞琪的，报废的生成入库单的时候把传的值 之前是=KCZT08_SYS 现在改成=KCZT001 乔一入库报表,生产报表 过滤条件 按照排产日期查询,加一个自定义条件
---
WebTM/views/车间管理/报表分析/sc_ICOMRKReport.html | 509 ++++++++++++++++++++
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 86 +++
WebTM/views/index_Mobile_QiaoYi.html | 198 ++++---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 2
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 124 ++++
WebTM/views/PublicPage/HSourceReportHtml.html | 17
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 10
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 16
WebTM/views/index_QiaoYi.html | 3
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | 4
WebTM/views/车间管理/报表分析/SC_DayRkReport.html | 506 ++++++++++++++++++++
WebTM/views/index.html | 4
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 2
WebTM/WebTM.csproj | 3
14 files changed, 1,363 insertions(+), 121 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8e4f90c..e3f1bd3 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -215,13 +215,16 @@
<Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillQuery_Mobile.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Change.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Copy_PL.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessEntryReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor_third.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\SC_DayRkReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ICOMProBarCodeReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMRKReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPSumReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_EmployeePieceWorkReport.html" />
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 081e3cc..2e61ae0 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -134,7 +134,7 @@
var OperationType = 1;//鎿嶄綔绫诲瀷
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
+ var HOrgID = params[params[1]];//婧愬崟id
var HSouceBillType = decodeURI(params[params[2]]);//婧愬崟绫诲瀷
}
var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
@@ -161,10 +161,6 @@
var option = [];
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var HDeptID = 0;
-
- var params = getUrlVars();
- var HDeptID = params[params[0]];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -186,6 +182,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": HOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
@@ -197,9 +194,6 @@
}
$("#HDeptName").append(HDeptName);
- //if (!isNaN(HDeptID)) {
- // $("#HDeptName").val(HDeptID);
- //}
form.render('select');
}
layer.closeAll("loading");
@@ -304,7 +298,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
type: "GET",
- data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": linterid },
+ data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": HOrgID },
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
@@ -407,10 +401,7 @@
}
sWhere += " and " + ColName + " " + com;
}
- //浼犻�掔殑鍙傛暟涓嶄负NAN
- //if (!isNaN(HDeptID) && HDeptName == 0) {
- // HDeptName = HDeptID;
- //}
+
switch (HSouceBillType) {
case '鐢熶骇璁㈠崟':
if (HBillNo) {
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e2d5ebe..e3baee9 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -524,7 +524,9 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePiecePayReport.html">璁′欢宸ヨ祫鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePiecePaySumReport.html">璁′欢宸ヨ祫姹囨�绘姤琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/sc_ICOMReport.html">(鎸夌敓浜ц鍗�)瀹㈡埛璁㈠崟鎶ヨ〃</a></dd>
- <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="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/SC_DayRkReport1.html">鎴愬搧鍏嬮噸宸紓鏄庣粏琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ICOMProBarCodeReport.html">瀹㈡埛璁㈠崟鏄庣粏鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutSumReport_Cloth.html">鐧藉澂鍙戝竷姹囨�绘姤琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutEntryReport_Cloth.html">鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃</a></dd>
diff --git a/WebTM/views/index_Mobile_QiaoYi.html b/WebTM/views/index_Mobile_QiaoYi.html
index d8a7b35..4d03ec9 100644
--- a/WebTM/views/index_Mobile_QiaoYi.html
+++ b/WebTM/views/index_Mobile_QiaoYi.html
@@ -506,35 +506,41 @@
</a>
<dl class="layui-nav-child">
<!--<dd>
- <a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html" style="color: aqua;">
+ <a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 閲囪喘鍏ュ簱缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鐢熶骇棰嗘枡缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鐢熶骇鍏ュ簱缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 閿�鍞嚭搴撶紦瀛樺垪琛�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 閿�鍞嚭搴撴牎楠岀紦瀛樺垪琛�
+ </a>
+ </dd>-->
+ <dd>
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillQuery_Mobile.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 閲囪喘鍏ュ簱缂撳瓨鍒楄〃
+ 宸ュ簭娴佽浆鍗″垪琛�
</a>
</dd>
- <dd>
- <a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鐢熶骇棰嗘枡缂撳瓨鍒楄〃
- </a>
- </dd>
- <dd>
- <a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鐢熶骇鍏ュ簱缂撳瓨鍒楄〃
- </a>
- </dd>
- <dd>
- <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 閿�鍞嚭搴撶紦瀛樺垪琛�
- </a>
- </dd>
- <dd>
- <a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 閿�鍞嚭搴撴牎楠岀紦瀛樺垪琛�
- </a>
- </dd>-->
<dd>
<a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -548,35 +554,35 @@
</a>
</dd>
<!--<dd>
- <a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 濮斿鍏ュ簱缂撳瓨鍒楄〃
- </a>
- </dd>
- <dd>
- <a lay-href="楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 濮斿棰嗘枡缂撳瓨鍒楄〃
- </a>
- </dd>
- <dd>
- <a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_CheckList_New.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 濮斿棰嗘枡鏍￠獙缂撳瓨鍒楄〃
- </a>
- </dd>
- <dd>
- <a lay-href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_CheckList_New.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鐢熶骇琛ユ枡鏍￠獙缂撳瓨鍒楄〃
- </a>
- </dd>
- <dd>
- <a lay-href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_CheckList_New.html" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 濮斿琛ユ枡鏍￠獙缂撳瓨鍒楄〃
- </a>
- </dd>-->
+ <a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿鍏ュ簱缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿棰嗘枡缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_CheckList_New.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿棰嗘枡鏍￠獙缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_CheckList_New.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鐢熶骇琛ユ枡鏍￠獙缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_CheckList_New.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿琛ユ枡鏍￠獙缂撳瓨鍒楄〃
+ </a>
+ </dd>-->
<dd>
<a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -584,47 +590,47 @@
</a>
</dd>
<!--<dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍒嗘寮忚皟鍑虹紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍒嗘寮忚皟鍏ョ紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 閲囪喘閫�鏂欑紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鐢熶骇閫�搴撶紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鐢熶骇閫�鏂欑紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 閿�鍞��璐х紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍒拌揣鐐规暟缂撳瓨鍒楄〃null
- </a>
- </dd>-->
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鍒嗘寮忚皟鍑虹紦瀛樺垪琛╪ull
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鍒嗘寮忚皟鍏ョ紦瀛樺垪琛╪ull
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 閲囪喘閫�鏂欑紦瀛樺垪琛╪ull
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鐢熶骇閫�搴撶紦瀛樺垪琛╪ull
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鐢熶骇閫�鏂欑紦瀛樺垪琛╪ull
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 閿�鍞��璐х紦瀛樺垪琛╪ull
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鍒拌揣鐐规暟缂撳瓨鍒楄〃null
+ </a>
+ </dd>-->
</dl>
</li>
<!-- 绯荤粺绠＄悊 -->
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index 010bc80..8cc11aa 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -509,6 +509,9 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�(绾靛悜)</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/DefectiveDetailedYieldReport.html">涓嶈壇鏄庣粏鑹巼鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_StationOutSumReport.html">杞﹂棿鐢熶骇姹囨姤缁熻琛�</a></dd>-->
+ <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="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutSumReport_Cloth.html">鐧藉澂鍙戝竷姹囨�绘姤琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutEntryReport_Cloth.html">鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_ProdProcessSumReport_DyeColor.html">鏌撳巶姹囨�绘姤琛�</a></dd>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index cfe9176..ff2ebb8 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -476,7 +476,7 @@
//鑾峰彇缁勭粐ID
var SetHOrgID = $("#HOrgID").find("option:selected").val();
//椤甸潰灞�-鑷畾涔�
- var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&linterid=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
+ var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&HOrgID=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
url = encodeURI(url);
//alert(url);
layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index 274927d..cc81884 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -57,13 +57,13 @@
<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" readonly>
+ <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="HMaterModel" id="HMaterModel" readonly>
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" >
</div>
</div>
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 30fc31f..3917e5e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -89,6 +89,11 @@
</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="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
</form>
</div>
</div>
@@ -119,6 +124,7 @@
, util = layui.util
var sWhere = "";
var option = [];
+ var HModName = "ReportPODemandPlanBillList";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -129,6 +135,16 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
//#region 浜у搧缂栫爜
form.on('submit(btnHMATERIALID)', function (data) {
@@ -169,6 +185,7 @@
//set_InitGrid();
//蹇�熻繃婊�
get_FastQuery(1);
+ DisPlay_HideColumn();
}
//#endregion
@@ -374,7 +391,7 @@
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -384,14 +401,117 @@
}
//鑾峰彇鏁版嵁
$("#HSUPPLIERID").val(checkStatus.data[0].HItemID);
- $("#HSUPPLIERNAME").val(checkStatus.data[0].HName);
+ $("#HSUPPLIERNAME").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
}
+ //闅愯棌鍒楄缃�
+ 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
//浠ヤ笂鏄痩ayui妯″潡
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 1c4c605..9f0f239 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"
@@ -544,7 +544,7 @@
//, { 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 }
, { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index f33f315..9e0816e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -86,6 +86,12 @@
<input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
</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="HICOMBillNo" id="HICOMBillNo">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -323,6 +329,7 @@
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡缂栫爜
var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
+ var HICOMBillNo = $("#HICOMBillNo").val();//鐢熶骇璁㈠崟鍙�
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -345,6 +352,9 @@
if (HSeOrderBillNo) {
sWhere += " and 閿�鍞鍗曞彿 like'%" + HSeOrderBillNo + "%'";
}
+ if (HICOMBillNo) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like'%" + HICOMBillNo + "%'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 7d452e2..467271b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -131,7 +131,7 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-top:10px;margin-bottom:10px;">
+ <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; width: 185px;">
@@ -139,6 +139,39 @@
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</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="date" class="layui-input" lay-verify="HMastersDate" name="HMastersDate" id="HMastersDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <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>
@@ -355,6 +388,7 @@
//鍒濆鍖栨椂闂�
$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMastersDate").val("");
//缁勭粐
Organ();
//鍒濆鍖栬〃鏍�
@@ -591,6 +625,11 @@
get_Display_1(HinterID_S);
get_Display_2(HinterID_S)
}
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -817,9 +856,36 @@
}
var HPlanBeginDate = $("#HPlanBeginDate").val();//寮�宸ヨ捣濮嬫棩鏈�
var HPlanEndDate = $("#HPlanEndDate").val();//寮�宸ユ埅姝㈡棩鏈�
+ var HMastersDate = $("#HMastersDate").val();//鎺掍骇鏃ユ湡
var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var sWheres = "";
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like''%" + ColContent + "%''";
+ break;
+ case "8":
+ com = "like''%" + ColContent + "''";
+ break;
+ case "9":
+ com = "like''" + ColContent + "%''";
+ break;
+ case "10":
+ com = "not like''%" + ColContent + "%''";
+ break;
+ default:
+ com = "" + Comparator + "''" + ColContent + "''";
+ break;
+ }
+ sWheres += " and [" + ColName + "] " + com;
+ }
sWhere = {
HPlanBeginDate: HPlanBeginDate
@@ -829,6 +895,8 @@
, HMaterID: HMaterID
, HICMOBillNo: HICMOBillNo
, HWorkShopID: HWorkShopID
+ , HMastersDate: HMastersDate
+ , sWheres: sWheres
}
get_Display(JSON.stringify(sWhere));
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -861,6 +929,7 @@
$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
$("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
+ $("#HMastersDate").val("");//鎺掍骇鏃ユ湡
$("#HMaterID").val("0");//鐗╂枡缂栫爜id
$("#HMaterNumber").val("");//鐗╂枡缂栫爜
$("#HMaterName").val("");//鐗╂枡鍚嶇О
@@ -869,6 +938,9 @@
$("#HWorkShopID").val("0");//鐢熶骇杞﹂棿id
$("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
$("#HProdORGID").val(sessionStorage["OrganizationID"])//鐢熶骇璁㈠崟缁勭粐
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
form.render('select');
sWhere = "";
}
@@ -1341,6 +1413,18 @@
})
}
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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');
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index ed0aa47..4e244b3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -29,7 +29,7 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -58,7 +58,7 @@
<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="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="display: inline-block;" >
</div>
</div>
<div class="layui-inline">
@@ -82,7 +82,7 @@
<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="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="display: inline-block;" >
</div>
</div>
<div class="layui-inline">
@@ -298,6 +298,8 @@
function get_FastQuery() {
var HMaterID = $("#HMaterID").val();
var HMaterNumber = $("#HMaterNumber").val();
+ var HMaterName = $("#HMaterName").val();
+ var HMaterModel = $("#HMaterModel").val();
var HComplete = $("#HComplete").val();
var HPlanDate = $("#HPlanDate").val();
var HICMOBillNo = $("#HICMOBillNo").val();
@@ -306,7 +308,13 @@
sWhere += " and 鐗╂枡ID = '" + HMaterID + "'";
}
if (HMaterNumber) {
- sWhere += " and 鐗╂枡缂栫爜 = '" + HMaterNumber + "'";
+ sWhere += " and 鐗╂枡缂栫爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ }
+ if (HMaterModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HMaterModel + "%'";
}
if (HComplete) {
sWhere += " and 榻愬鐘舵�� = '" + HComplete + "'";
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_DayRkReport.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_DayRkReport.html"
new file mode 100644
index 0000000..9c54d3d
--- /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_DayRkReport.html"
@@ -0,0 +1,506 @@
+锘�<!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 = "SC_DayRkReport";
+ 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();
+ });
+
+ //#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/SC_DayRkReport",
+ 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/SC_DayRkReport",
+ 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 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_ICOMRKReport.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_ICOMRKReport.html"
new file mode 100644
index 0000000..c5b732c
--- /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_ICOMRKReport.html"
@@ -0,0 +1,509 @@
+锘�<!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_ICOMRKReport";
+
+ //#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() {
+ //鍒濆鍖栨椂闂�
+ 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 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_ICOMRKReport",
+ 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 (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 });
+ }
+ })
+ }
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1