From 042cd7abea3b3c2fbe0de8f28c19d3ceb3c24c0e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 16 八月 2023 14:50:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/产线组装追溯/Cj_AssemblyTraceability.html | 569 +++++++++++++++
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 54 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 2
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 644 ++++++++++-------
WebTM/views/车间管理/产线组装追溯/Cj_AssemblyTraceabilityList.html | 764 +++++++++++++++++++++
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 6
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 50 +
WebTM/views/车间管理/报表分析/SC_DayRkReport.html | 8
WebTM/views/index.html | 9
WebTM/views/车间管理/报表分析/sc_ICOMReport.html | 4
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 2
WebTM/WebTM.csproj | 2
12 files changed, 1,790 insertions(+), 324 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 347febf..a605058 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -256,6 +256,8 @@
<Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceability.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceabilityList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillQuery_Mobile.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Change.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Copy_PL.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index a1e10dd..e67e69b 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -366,7 +366,7 @@
<a>鎶ヨ〃</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
- <!--<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>-->
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/MaterialShorAnalysisReport.html" style="margin: 0 0 0 13px;">缂烘枡鍒嗘瀽鎶ヨ〃</a></dd>
@@ -555,6 +555,13 @@
<dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鐢熶骇鏃ヨ鍒掑崟/Sc_WorkBillAutoSortBillMain.html">鐢熶骇鏃ヨ鍒掑崟鍒楄〃</a></dd>
</dl>
</dd>
+ <dd>
+ <a>浜х嚎缁勮杩芥函</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎缁勮杩芥函/Cj_AssemblyTraceability.html">浜х嚎缁勮杩芥函鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎缁勮杩芥函/Cj_AssemblyTraceabilityList.html">浜х嚎缁勮杩芥函鍒楄〃</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<!-- 璐ㄩ噺绠＄悊 -->
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index 63cbbe6..5bec0ab 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -492,9 +492,9 @@
if (Source) {
sWhere += " and 鐢熶骇璧勬簮 like '%" + Dept + "%'";
}
- if (HOrgID) {
- sWhere += " and HOrgID = '" + HOrgID + "'";
- }
+ //if (HOrgID) {
+ // sWhere += " and HOrgID = '" + HOrgID + "'";
+ //}
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
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 3917e5e..ca6e70b 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"
@@ -200,7 +200,7 @@
columns.push({ field: '渚涘簲鍟�', title: '渚涘簲鍟�' });
columns.push({ field: 'FSUMQTY', title: '鍚堣' });
columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�' });
- columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�' });
+ columns.push({ field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿' });
columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿' });
columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞' });
columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�' });
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_S.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_S.html"
index 492c631..4e11729 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_S.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_S.html"
@@ -164,8 +164,7 @@
$("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
//鐢熶骇缁勭粐鍔犺浇
Organ();
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+
//蹇�熻繃婊�
get_FastQuery(1);
}
@@ -174,12 +173,6 @@
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
var columns = [];
- var myDate = new Date();
- var yyyy = myDate.getFullYear();
- var MM = myDate.getMonth() + 1;
- var dd = myDate.getDate();
- var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
- var MonthCount = new Date(yyyy, MM-1, 0).getDate();
columns.push({ type: 'checkbox', fixed: 'left' });
columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐' });
@@ -195,11 +188,37 @@
columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜' });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
- }
- for (var i = 1; i <= dd; i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
+ //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+ var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
+ var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
+ //鑾峰彇骞�
+ var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
}
columns.push({ field: '', title: '鎻愭枡璁″垝鍚堣' });
@@ -245,7 +264,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList_S',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], HBEGINDATE: $("#HBEGINDATE").val(), HENDDATE: $("#HENDDATE").val() },
success: function (result) {
if (result.count == 1) {
option.data = result.data;
@@ -281,6 +300,10 @@
var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
var HPURORDERNO = $("#HPURORDERNO").val();//閲囪喘璁㈠崟鍙�
+ if (HBEGINDATE > HENDDATE) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
+
if (HORGID != "") {
sWhere += " and a.HPURCHASEORGID= " + HORGID+" ";
}
@@ -300,7 +323,8 @@
if (HPURORDERNO) {
sWhere += " and HPOOrderBillNo like''%" + HPURORDERNO + "%'' ";
}
-
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
get_Display(sWhere);
sWhere = " where 1=1 ";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
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/ReportWorkDemandPlanBillList.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/ReportWorkDemandPlanBillList.html"
index d102302..cfb01ca 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/ReportWorkDemandPlanBillList.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/ReportWorkDemandPlanBillList.html"
@@ -150,8 +150,7 @@
$("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
//鐢熶骇缁勭粐鍔犺浇
Organ();
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+
//蹇�熻繃婊�
get_FastQuery(1);
}
@@ -160,12 +159,6 @@
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
var columns = [];
- var myDate = new Date();
- var yyyy = myDate.getFullYear();
- var MM = myDate.getMonth() + 1;
- var dd = myDate.getDate();
- var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
- var MonthCount = new Date(yyyy, MM-1, 0).getDate();
columns.push({ type: 'checkbox', fixed: 'left' });
columns.push({ field: '缁勭粐', title: '鐢熶骇缁勭粐' });
@@ -178,11 +171,37 @@
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜' });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
columns.push({ field: 'TQSUM', title: '瑕佹枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
- }
- for (var i = 1; i <= dd; i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
+ //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+ var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
+ var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
+ //鑾峰彇骞�
+ var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
}
columns.push({ field: '', title: '璁″垝鏄庣粏_鍚堣' });
@@ -261,6 +280,9 @@
var HENDDATE = $("#HENDDATE").val();//鑷�
var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
var HDeptID = $("#HDeptID").val();//鐢熶骇杞﹂棿
+ if (HBEGINDATE > HENDDATE) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
sWhere = {
HORGID: HORGID
@@ -269,6 +291,8 @@
, HMATERIALID: HMATERIALID
, HDeptID: HDeptID
}
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
get_Display(JSON.stringify(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 c16c86c..0d6b331 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"
@@ -430,21 +430,20 @@
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
} else {
-
- layer.open({
+ var index = layer.open({
type: 1, // page 灞傜被鍨�
- area: ['500px', '300px'],
- title: 'Hello layer',
+ area: ['20%', '20%'],
shade: 0.6, // 閬僵閫忔槑搴�
- shadeClose: true, // 鐐瑰嚮閬僵鍖哄煙锛屽叧闂脊灞�
- maxmin: true, // 鍏佽鍏ㄥ睆鏈�灏忓寲
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+ maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
- content: '<div style="padding: 32px;">涓�涓櫘閫氱殑椤甸潰灞傦紝浼犲叆浜嗚嚜瀹氫箟鐨� HTML</div>'
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
});
- setTimeout(get_btnProPC(HWorkShopID), 3000);
- layer.closeAll();
+ setTimeout(function () {
+ get_btnProPC(HWorkShopID);
+ layer.close(index);
+ }, 1000)
}
-
})
//琛屽唴浜嬩欢
@@ -706,6 +705,28 @@
, cellMinWidth: 90
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ //, done: function (res, page, count) {
+ // var that = this.elem.next();
+ // res.data.forEach(function (item, index) {
+ // var NumCount = item.FBASEQTY;//鑾峰彇鎬诲簱瀛樻暟閲�
+ // for (var i = 0; i < Days; i++) {
+ // var dateNowTime = Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + i), 'yyyy-MM-dd');
+ // if (item[dateNowTime] != null) {
+ // if (NumCount > parseFloat(item[dateNowTime])) {
+ // NumCount -= parseFloat(item[dateNowTime]);
+ // } else {
+ // var num = 6;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
+ // tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
+ // rq = tr.children()[num + 1 + i];
+ // rq.style.color = '#f66161';//鐒跺悗鍙樿壊
+ // rq = tr.children()[num];
+ // rq.style.color = '#f66161';//鐒跺悗鍙樿壊
+ // }
+ // }
+ // }
+ // });
+ // $('.layui-table-cell').css({ 'height': 'auto' });
+ //}
};
}
@@ -1162,6 +1183,9 @@
var data = table.cache["mainTable"];
var HICOMNum = [];
for (var i = 0; i < data.length; i++) {
+ if (isNaN(data[i]["HICMOInterID"])) {
+ return layer.msg("璇峰厛杩涜淇濆瓨!!")
+ }
HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
}
$('#HProgressBar').html(`
@@ -1267,12 +1291,14 @@
var HDelData = 0;
JDTLen = (100 / option.data.length).toFixed(2);
var HJDLen = 0;
- var ajaxLoad = layer.load();
//濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
//鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
var HinterID_S = [];
for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["灏忔椂浜ц兘"] == "0") {
+ return layer.msg("璇峰厛鐐瑰嚮鍑嗗鎸夐挳,纭繚灏忔椂浜ц兘涓嶄负0!!!")
+ }
HinterID_S.push(option.data[i]["hmainid"]);
}
$.ajax({
@@ -1295,13 +1321,13 @@
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + ")";
$.ajax({
- url: GetWEBURL() +'/Gy_SOPBillList/UpDelSQL',
+ url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
type: "GET",
async: false,
data: { "sWhere": sql },
success: function (data1) {
if (data1.count == 1) {
- HDelData = 1;
+
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -1310,274 +1336,288 @@
}
});
- get_FastQuery(2);
+ get_HFData(0, 0);
- if (HDelData == 1) {
- //鎸変换鍔″崟浼樺厛绾� 寰幆
- for (var i = 0; i < option.data.length; i++) {
- //鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
- lMainID = option.data[i]["HICMOInterID"];
- sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
- dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
- sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
- sPlanQty = option.data[i]["璁″垝鏁伴噺"];
- lHGroupID = option.data[i]["HGroupID"];
- sGroupName = option.data[i]["HGroupName"];
- lMaterID = option.data[i]["HMaterID"];
- sMaterNumber = option.data[i]["鐗╂枡浠ｇ爜"];
- sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
- sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
- sWorkQty = option.data[i]["灏忔椂浜ц兘"];
- sYX = option.data[i]["浼樺厛绾�"];
- //鍓╀綑闇�姹傚伐鏃�
- iLeftQty = sPlanQty;
- if (sWorkQty <= 0) {
- sLeftProdTimes = 0;
- }
- else {
- sLeftProdTimes = iLeftQty / sWorkQty;
- }
- //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
- if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = option.data[i]["HSourceID"];
- sSourceName = option.data[i]["鐢熶骇璧勬簮"];
- sSourceNumber = option.data[i]["鐢熶骇璧勬簮浠ｇ爜"];
- //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes + "," + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- ds = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
- {
- //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- ds = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
- {
- //璺冲埌涓嬩竴鍗� 鏈崟绾㈣壊鏄剧ず
- $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
- continue;
- }
- else {
- $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
- //寮�濮嬫帓鍗�
- bFind = false;
- //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
- for (var j = 0; j < ds.length; j++) {
- //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) > sLeftProdTimes) {
- if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
- {
- //鍦ㄦ湰璧勬簮涓婄敓浜�
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[j]["HitemID"];
- sSourceName = ds[j]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
- }
- if (dsSub != null)//涓嶅姞鐝帓绋�
- {
- iRow = i + 1;
- //灏嗘暟鎹帓鍒扮綉鏍间腑
- //grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- //Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, false, oClsGridValues);
- SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
- }
- bFind = true;
- }
- }
- }
- if (!bFind) {
- for (var j = 0; j < ds.length; j++) {
- //鍒ゆ柇璧勬簮鏈�澶у墿浣欏伐鏃讹紝鏄惁澶т簬 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鏈�澶у墿浣欏伐鏃�"]) > sLeftProdTimes) {
- if (iLeftQty > 0) {
-
- //鍦ㄦ湰璧勬簮涓婄敓浜�
- grdMain.RowCount = grdMain.RowCount + 1;
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[j]["HitemID"];
- sSourceName = ds[j]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;
- }
- //if (dsSub != null)//鍔犵彮鎺掔▼
- //{
- // //灏嗘暟鎹帓鍒扮綉鏍间腑
- // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
- //}
- }
- bFind = true;
- }
- }
- }
-
- if (!bFind) {
- //濡傛灉娌℃湁鎵惧埌鍚堥�傝祫婧愬垯锛岀洿鎺ユ帓鏈�鍚庝竴涓墿浣欐渶澶х殑璧勬簮銆�
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[ds.length - 1]["HitemID"];
- sSourceName = ds[ds.length - 1]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[ds.length - 1]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;
- }
- //if (dsSub != null)//鍔犵彮鎺掔▼
- //{
- // //灏嗘暟鎹帓鍒扮綉鏍间腑
- // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
- //}
- }
+ //鍒濆鍖栬〃鏍兼暟鎹�
+ for (var i = 0; i < option.data.length; i++) {
+ for (var j = (22 + HPlanDay); j < 53; j++) {
+ if (option.data[i][option.cols[0][j].field] != null) {
+ option.data[i][option.cols[0][j].field] = "";
}
}
- table.render(option);
- set_AddNew();
- } else {
- layer.msg("鏁版嵁娓呯┖澶辫触!")
}
- layer.close(ajaxLoad);
+
+ //get_FastQuery(2);
+
+ //鎸変换鍔″崟浼樺厛绾� 寰幆
+ for (var i = 0; i < option.data.length; i++) {
+ //鑾峰彇閿佸畾鐨勬帓浜ф暟閲�
+ var SDSum = 0;
+ if (HPlanDay > 0) {
+ for (var j = 22; j < (22 + HPlanDay); j++) {
+ SDSum += TableData[i][option.cols[0][j].field];
+ }
+ }
+
+ //鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
+ lMainID = option.data[i]["HICMOInterID"];
+ sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
+ dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
+ sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
+ sPlanQty = option.data[i]["璁㈠崟鍙帓鏁伴噺"];
+ lHGroupID = option.data[i]["HGroupID"];
+ sGroupName = option.data[i]["HGroupName"];
+ lMaterID = option.data[i]["HMaterID"];
+ sMaterNumber = option.data[i]["鐗╂枡浠ｇ爜"];
+ sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
+ sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
+ sWorkQty = option.data[i]["灏忔椂浜ц兘"];
+ sYX = option.data[i]["浼樺厛绾�"];
+ if (SDSum > 0) {
+ sPlanQty = sPlanQty - SDSum;
+ }
+ //鍓╀綑闇�姹傚伐鏃�
+ iLeftQty = sPlanQty;
+ if (sWorkQty <= 0) {
+ sLeftProdTimes = 0;
+ }
+ else {
+ sLeftProdTimes = iLeftQty / sWorkQty;
+ }
+ //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
+ if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = option.data[i]["HSourceID"];
+ sSourceName = option.data[i]["鐢熶骇璧勬簮"];
+ sSourceNumber = option.data[i]["鐢熶骇璧勬簮浠ｇ爜"];
+ //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
+ var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes + "," + lSourceID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ ds = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
+ {
+ //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
+ var sql = "exec h_p_Sc_ICMOGetWorkSource " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ ds = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
+ {
+ get_HFData(1, i);
+ //璺冲埌涓嬩竴鍗� 鏈崟绾㈣壊鏄剧ず
+ $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ continue;
+ }
+ else {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
+ //寮�濮嬫帓鍗�
+ bFind = false;
+ //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
+ for (var j = 0; j < ds.length; j++) {
+ //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
+ if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) > sLeftProdTimes) {
+ if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
+ {
+ //鍦ㄦ湰璧勬簮涓婄敓浜�
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = ds[j]["HitemID"];
+ sSourceName = ds[j]["璧勬簮鍚嶇О"];
+ sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
+ option.data[i]["HSourceID"] = lSourceID;
+ option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dsSub = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ if (dsSub == null || dsSub.length == 0) {
+ get_HFData(1, i);
+ continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
+ }
+ if (dsSub != null)//涓嶅姞鐝帓绋�
+ {
+ iRow = i + 1;
+ //灏嗘暟鎹帓鍒扮綉鏍间腑
+ SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
+
+ set_AddNew1(option.data[i]);
+ }
+ bFind = true;
+ }
+ } else {
+ get_HFData(1, i);
+ }
+ }
+ //if (!bFind) {
+ // for (var j = 0; j < ds.length; j++) {
+ // //鍒ゆ柇璧勬簮鏈�澶у墿浣欏伐鏃讹紝鏄惁澶т簬 鐢熶骇鍛ㄦ湡
+ // if (parseFloat(ds[j]["鏈�澶у墿浣欏伐鏃�"]) > sLeftProdTimes) {
+ // if (iLeftQty > 0) {
+
+ // //鍦ㄦ湰璧勬簮涓婄敓浜�
+ // grdMain.RowCount = grdMain.RowCount + 1;
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // lSourceID = ds[j]["HitemID"];
+ // sSourceName = ds[j]["璧勬簮鍚嶇О"];
+ // sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
+ // option.data[i]["HSourceID"] = lSourceID;
+ // option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ // option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ // var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ // type: "GET",
+ // async: false,
+ // data: { "sWhere": sql },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // dsSub = data1.data
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ // if (dsSub == null || dsSub.length == 0) {
+ // continue;
+ // }
+ // //if (dsSub != null)//鍔犵彮鎺掔▼
+ // //{
+ // // //灏嗘暟鎹帓鍒扮綉鏍间腑
+ // // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
+ // // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
+ // //}
+ // }
+ // bFind = true;
+ // }
+ // }
+ //}
+
+ //if (!bFind) {
+ // //濡傛灉娌℃湁鎵惧埌鍚堥�傝祫婧愬垯锛岀洿鎺ユ帓鏈�鍚庝竴涓墿浣欐渶澶х殑璧勬簮銆�
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // lSourceID = ds[ds.length - 1]["HitemID"];
+ // sSourceName = ds[ds.length - 1]["璧勬簮鍚嶇О"];
+ // sSourceNumber = ds[ds.length - 1]["璧勬簮浠ｇ爜"];
+ // option.data[i]["HSourceID"] = lSourceID;
+ // option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ // option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ // type: "GET",
+ // async: false,
+ // data: { "sWhere": sql },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // dsSub = data1.data
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ // if (dsSub == null || dsSub.length == 0) {
+ // continue;
+ // }
+ // //if (dsSub != null)//鍔犵彮鎺掔▼
+ // //{
+ // // //灏嗘暟鎹帓鍒扮綉鏍间腑
+ // // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
+ // // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
+ // //}
+ //}
+ }
+ }
+ table.render(option);
+ }
+
+ var TableData = [];
+ function get_HFData(num,nums) {
+ if (num == 0) {
+ TableData = option.data;
+ } else {
+ option.data[nums] = TableData[nums];
+ }
}
//灏嗘暟鎹帓绋嬪埌缃戞牸
@@ -1684,7 +1724,7 @@
else {
for (var i = 0; i < ds.length; i++) {
//鎵惧埌瀵瑰簲鐨勫垪
- for (var j = 22; j < grd.cols[0].length; j++) {
+ for (var j = 22; j < 53; j++) {
if (sLeftQty > 0) {
if (ds[i]["鏃ユ湡"] == grd.cols[0][j].field) {
//濡傛灉鏃堕棿琚� 涓婇亾浣欓噺鍗犵敤 鍒� 璺宠繃
@@ -1743,33 +1783,36 @@
}
else {
if (sLeftQty > parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"])) {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
+ grd.data[iRow][grd.cols[0][j].field] = parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]));
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
- option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HUseTimes"] = ds[i]["鍓╀綑宸ユ椂"];
break;
//oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
//oClsGridValues.Add(oSub);
}
else {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = sLeftQty;
+ grd.data[iRow][grd.cols[0][j].field] = sLeftQty;
+ //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
sLeftQty = 0;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
- option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
break;
//oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
//oClsGridValues.Add(oSub);
}
}
}
- }
+ }
}
}
}
+
}
}
@@ -1936,6 +1979,9 @@
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
+ if (parseFloat(table.cache["mainTable"][i]["璁㈠崟鍙帓鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"]) + parseFloat(table.cache["mainTable"][i]["浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�"])) {
+ return layer.msg("绗�" + (i + 1) + "琛屾帓浜ф暟閲忚秴鍑鸿鍗曟暟閲�!");
+ }
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
}
@@ -1962,6 +2008,36 @@
}
layer.close(index);
layer.msg("淇濆瓨鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ function set_AddNew1(num) {
+
+ //var sMainStr = JSON.stringify(data.field);
+ var sSubStr = "["+JSON.stringify(num)+"]";
+ var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg("淇濆瓨鎴愬姛");
+ layer.close(index);
}
else {
layer.close(index);
@@ -2199,7 +2275,7 @@
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 1; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length - 1; 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>';
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceability.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceability.html"
new file mode 100644
index 0000000..b3edfbd
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceability.html"
@@ -0,0 +1,569 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>浜х嚎缁勮杩芥函鍗�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <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>
+
+ <style>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px;">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">閫�鍑�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">閲囬泦淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <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="HBarCode" lay-verify="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ </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="HMaker" lay-verify="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 68px;">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" id="HICMOInterID" name="HICMOInterID" value="0" />
+ <input type="hidden" id="HICMOEntryID" name="HICMOEntryID" value="0" />
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧MAC</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMateMAC" name="HMateMAC" id="HMateMAC" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧SN</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBarCode_P" lay-verify="HBarCode_P" id="HBarCode_P" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">浜у搧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" id="HMaterID" name="HMaterID" value="0" />
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </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" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 184px;">
+ <select name="HAssemblyStatus" id="HAssemblyStatus" lay-verify="HAssemblyStatus">
+ <option value="鐢熶骇涓�" selected>鐢熶骇涓�</option>
+ <option value="姹囨姤">姹囨姤</option>
+ <option value="妫�楠�">妫�楠�</option>
+ <option value="鍖呰">鍖呰</option>
+ <option value="鍏ュ簱">鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 56%;">
+ <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="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 50%;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-card" style="width: 49%; float: left;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍏抽敭浠舵竻鍗�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--鍏抽敭浠舵竻鍗�-->
+ <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-card" style="width: 49%; float: left; margin-left: 1%; ">
+ <ul class="layui-tab-title">
+ <li class="layui-this">閲囬泦璁板綍</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--閲囬泦璁板綍-->
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine2"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine2"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <input type="hidden" id="HProdOrgID" name="HProdOrgID" value="0" />
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script type="text/html" id="barDemo2">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var option = [];
+ var option2 = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ OperationType = 1;
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ //璧嬪��
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ }
+ });
+
+
+
+ ////琛屽唴浜嬩欢
+ //table.on('tool(mainTable)', function (obj) {
+ // set_GridDelete(obj); //琛屽唴鍒犻櫎
+ //});
+
+ ////琛屽唴浜嬩欢
+ //table.on('tool(mainTable2)', function (obj) {
+ // set_GridDelete2(obj); //琛屽唴鍒犻櫎
+ //});
+
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ //涓虹┖楠岃瘉
+ if (AllowLoadData(data)) {
+ set_AddNew(data,3);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ $("#HBarCode").focus(); //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ set_InitGrid();
+ set_InitGrid2();
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HProdOrgID").val(sessionStorage["OrganizationID"]);//缁勭粐
+ //鍒濆鍖栨棩鏈�
+ $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ get_Display();
+ }
+
+ function set_InitGrid() {
+ //瀛愯〃 鍒濆鍖栬〃鏍兼暟鎹�
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }//f7
+ , { field: 'HMaterID', title: 'HMaterID ', hide: true }//f7
+ , { field: '浜у搧鏉＄爜', title: 'SN鐮�' }
+ , { field: '閰嶄欢鏉＄爜', title: '閰嶄欢SN鐮�' }
+ , { field: '浠诲姟鍗曞彿', title: '璁㈠崟鍙�' }
+ , { field: 'HPRDORGID', title: 'HPRDORGID', hide: true }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+ //var rowdata = [{
+ // "HDate": "", "HMaterName": "", "HMaterID": 0, "HBarCode": "", "HBarCode_P": "",
+ // "HICMOBillNo": ""
+ //}];
+ option.data = [];
+ table.render(option);
+
+ }
+
+ function set_InitGrid2() {
+ //瀛愯〃 鍒濆鍖栬〃鏍兼暟鎹�
+ option2 = {
+ elem: '#mainTable2'
+ //, toolbar: '#toolbarDemo2'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HDate', title: '鏃ユ湡', edit: 'text' }
+ , { field: 'HMaterName', title: '閰嶄欢鍚嶇О' }//f7
+ , { field: 'HMaterID', title: 'HMaterID ', hide: true }//f7
+ , { field: 'HMaterModel', title: '閰嶄欢瑙勬牸' }
+ , { field: 'HQty', title: '閰嶄欢鏁伴噺' }
+ , { field: 'HBardQty', title: '宸叉壂鏁伴噺' }
+ , { field: 'HPRDORGID', title: 'HPRDORGID', hide: true }
+ , { field: 'HBarCode', title: 'HBarCode', hide: true }
+ , { field: 'HEQty', title: 'HEQty', hide: true }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo2' }
+ ]]
+ };
+ var rowdata = [{
+ "HDate": "", "HMaterName": "", "HMaterID": 0, "HMaterModel": "", "HQty": 0,
+ "HBardQty": 0, "HPRDORGID": $("#HProdOrgID").val(), "HBarCode": "","HEQty":0
+ }];
+ option2.data = rowdata;
+ table.render(option2);
+
+ }
+
+ //鍒濆鍖栨煡璇�
+ function get_Display() {
+ var sWhere = " and HProdOrgID=" + sessionStorage["OrganizationID"] + " and 鍒跺崟浜�='" + $("#HMaker").val() +"' and DATEDIFF(DAY,GETDATE(),鏃ユ湡)=0";
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_AssemblyBill/Sc_AssemblyBillAddList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ ins = table.render(option);
+ layer.close(ajaxLoad);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+ //鏉＄爜鍥炶溅鏌ヨ
+ function txtHBarCode_KeyDown(HBarCode) {
+
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_AssemblyBill/HBardCodeList",
+ async: true,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HICMOBillNo": $("#HICMOBillNo").val()},
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ var data_1 = null;
+ var option_s = [];
+ if ($("#HICMOBillNo").val() == "") {
+ $("#HICMOBillNo").val(data.data[0]["FMOBILLNO"]);
+ $("#HICMOInterID").val(data.data[0]["HSourceInterID"]);
+ $("#HICMOEntryID").val(data.data[0]["HSourceEntryID"]);
+ $("#HBarCode_P").val($("#HBarCode").val());
+ $("#HMaterID").val(data.data[0]["HItemID"]);
+ $("#HMaterNumber").val(data.data[0]["HMaterNumber"]);
+ $("#HMaterName").val(data.data[0]["HMaterName"]);
+ $("#HMaterModel").val(data.data[0]["HMaterModel"]);
+ var num = [];
+ for (var i = 0; i < data.data.length; i++) {
+ num.push({
+ "HDate": Format(new Date().getTime(), 'yyyy-MM-dd hh:mm:ss'), "HMaterName": data.data[i]["HMaterName_z"], "HMaterID": data.data[i]["HMaterID"], "HMaterModel": data.data[i]["HMaterModel_z"], "HQty": data.data[i]["FMUSTQTY"],
+ "HBardQty": 0, "HPRDORGID": $("#HProdOrgID").val(), "HBarCode": "","HEQty":0
+ });
+ }
+ option2.data = num;
+ data_1 = set_AddNew({ "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val() } }, 1);
+
+ } else {
+ option_s = JSON.stringify(option2.data);
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HMaterID"] == data.data[0]["HMaterID"]) {
+ option2.data[i]["HBardQty"] += data.data[0]["HQty"];
+ option2.data[i]["HBarCode"] = $("#HBarCode").val();
+ option2.data[i]["HEQty"] = data.data[0]["HQty"];
+ } else {
+ option2.data[i]["HBarCode"] = "";
+ }
+ }
+ data_1 = set_AddNew({ "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val() } }, 2);
+
+ }
+ if (data_1.count == 1) {
+ layer.msg("鎻愪氦鎴愬姛");
+ layer.close(index);
+ table.render(option2);
+ }
+ else {
+ option2.data = JSON.parse(option_s);
+ layer.msg(data_1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCode").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ ////琛屽唴鍒犻櫎
+ //function set_GridDelete(obj) {
+ // var data = obj.data;
+ // var rowIndex = $(obj.tr).attr("data-index");
+ // if (obj.event === 'del') {
+ // layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ // if (rowIndex === '0') {
+ // layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ // } else {
+ // var oldData = table.cache["mainTable"];
+ // oldData.splice(obj.tr.data('index'), 1)
+ // option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ // table.render(option);
+ // layer.close(index);
+ // }
+ // });
+ // }
+ //}
+
+ ////琛屽唴鍒犻櫎
+ //function set_GridDelete2(obj) {
+ // var data = obj.data;
+ // var rowIndex = $(obj.tr).attr("data-index");
+ // if (obj.event === 'del') {
+ // layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ // if (rowIndex === '0') {
+ // layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ // } else {
+ // var oldData = table.cache["mainTable2"];
+ // oldData.splice(obj.tr.data('index'), 1)
+ // option2.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ // table.render(option2);
+ // layer.close(index);
+ // }
+ // });
+ // }
+ //}
+
+ //淇濆瓨鏁版嵁
+ function set_AddNew(data, num) {
+ var data_1 = [];
+ //杩囨护瀛愯〃鍒犻櫎涔嬪悗鐣欎笅鐨勭┖鏁版嵁
+ var num2 = [];
+ for (var i = 0; i < option2.data.length; i++) {
+ //缁欎笉鑳戒负绌虹殑鏁版嵁 璧嬪��(瀛�)
+ if (option2.data[i] != "") {
+ num2.push(option2.data[i]);
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num2);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + num + ";" + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_AssemblyBill/AddBill",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (res) {
+ layer.close(index);
+ if (num != 3) {
+ data_1 = res;
+ } else {
+ if (res.count == 1) {
+ layer.msg("鎻愪氦鎴愬姛", { time: 1 * 1000, icon: 1 }, function () {
+ location.replace('Cj_AssemblyTraceability.html');
+ });
+ }
+ else {
+ layer.msg(res.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ return data_1;
+ }
+
+ //鏁版嵁楠岃瘉
+ function AllowLoadData(data) {
+ var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟
+ if (HICMOBillNo == "") {
+ layer.msg("璇锋壂浜у搧鐮�!");
+ return false;
+ }
+ var count = 0;
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HBardQty"] != 0) {
+ count += 1;
+ }
+ }
+ if (count == 0) {
+ layer.msg("璇锋壂閰嶄欢鐮�!");
+ return false;
+ }
+ return true;
+ }
+
+ //鑾峰彇鍙傛暟
+ 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/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceabilityList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceabilityList.html"
new file mode 100644
index 0000000..08216f6
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceabilityList.html"
@@ -0,0 +1,764 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>浜х嚎缁勮杩芥函鍒楄〃</title>
+ <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/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
+ <script src="../../../layuiadmin/pubcustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+</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">
+ <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProdOrgID" id="HProdOrgID" lay-verify="HProdOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </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;margin-left:5%;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 107px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </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="HModel" id="HModel">
+ </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>
+ </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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<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
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+ var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HModName = "Cj_AssemblyTraceabilityList";
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
+ //娴忚
+ case 'get_PrintReport': get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CloseBill(2);
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+ get_FastQuery(2);
+ });
+ //#endregion
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
+
+ get_btnHMaterID();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HProdOrgID").append(Organization);
+ $("#HProdOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Organ();
+ //鏌ヨ
+ get_FastQuery(1);
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#HMaterID").val(0);//鐗╂枡
+ $("#HMaterName").val("");//鐗╂枡
+ $("#HMaterNumber").val("");//鐗╂枡
+ $("#HModel").val("");//鐗╂枡
+ $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#HProdOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
+ $("#btnSearch").click();
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //鐗╂枡
+ function get_btnHMaterID() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_AssemblyBill/list1',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ if (data[i].name == '鐢熶骇鏁伴噺' || data[i].name == '娴佽浆鍗℃暟閲�' || data[i].name == '鍏ュ簱鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(number) {
+ var HProdOrgID = "";
+ var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
+ //var HMaterID = $("#HMaterID").val();
+ var HMaterName = $("#HMaterName").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HModel = $("#HModel").val();
+ var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
+
+ if (number == 1) {
+ HProdOrgID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HProdOrgID = $("#HProdOrgID").val();//缁勭粐
+ }
+
+ if (HOrderProcNO) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ }
+ if (HMaterName) {
+ sWhere += "and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += "and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModel) {
+ sWhere += "and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ if (HProdOrgID) {
+ sWhere += " and HProdOrgID = '" + HProdOrgID + "'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+ //var linteridSub = data[0].hsubid;
+
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+
+ //鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+
+ //#endregion
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "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 = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ 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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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 });
+ }
+ })
+ }
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ 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
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 58646bd..47aaec6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -177,7 +177,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input type="hidden" value="0" name="HProcID" id="HProcID">
+ <!--<input type="hidden" value="0" name="HProcID" id="HProcID">-->
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
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"
index 736a550..4f50ad1 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_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"
@@ -97,8 +97,8 @@
<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>
+ <!--<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>
@@ -243,7 +243,7 @@
}
option = {
elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
, cellMinWidth: 120
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 500
@@ -314,7 +314,7 @@
}
option = {
elem: '#mainTable1'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
, cellMinWidth: 120
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 500
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 5cebee3..3715bcf 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"
@@ -397,7 +397,7 @@
success: function (data1) {
if (data1.count == 1) {
layer.msg(data1.Message);
- get_FastQuery();
+ //get_FastQuery();
} else {
layer.msg(data1.Message);
}
@@ -427,7 +427,7 @@
data: { "sMainSub": sMainSub },
success: function (data1) {
if (data1.count == 1) {
- get_FastQuery();
+ //get_FastQuery();
layer.close(index);
layer.msg(data1.Message);
} else {
--
Gitblit v1.9.1