From 5490d96baf0fe2606d63f74e7b52c8dfae916717 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 20 五月 2022 23:02:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 7
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 1
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 7
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 522 ++++++++++++++++++++++++++++++++
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html | 84 ++--
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 68 ++--
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 78 ++--
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html | 29
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html | 32 -
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 48 +-
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 7
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 33 +
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 1
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html | 7
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html | 1
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html | 7
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | 7
WebTM/views/index.html | 2
WebTM/WebTM.csproj | 1
19 files changed, 748 insertions(+), 194 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index eb8c363..28cdb6f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -863,6 +863,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackedBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackingBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatFormImport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index c62bc41..34b13ae 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -363,7 +363,7 @@
<dd>
<a>鐢熶骇璁″垝骞冲彴</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/">鐢熶骇璁″垝骞冲彴1</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">鐢熶骇璁″垝骞冲彴</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">瀵煎叆</a></dd>
</dl>
</dd>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index fbdf895..d127421 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -172,7 +172,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '鎻愭枡鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -391,7 +391,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -406,7 +406,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -414,7 +413,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index ea6df00..38a3fc1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -284,11 +284,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -303,7 +301,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -887,9 +885,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList",
type: "GET",
@@ -912,42 +910,49 @@
, "HExplanation": d.data[0].鎽樿
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
- , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[0].瀛愯〃閲囪喘缁勭粐
- , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�
- , "HDayPlanBillNo": d.data[0].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
- , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[0].HWorkShopID
- , "HWorkShopIDName": d.data[0].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[0].鍙敤閲囪喘鏁伴噺
- , "HPOOrderInterID": d.data[0].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[0].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[0].閲囪喘璁㈠崟鍙�
- , "HPOOrderBillSEQ": d.data[0].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[0].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[0].濮斿璁㈠崟瀛愬唴鐮�
- , "HWWOrderBillNo": d.data[0].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[0].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[0].閲囪喘閮ㄩ棬
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[0].閫佽揣鍗曟暟閲�
- , "HReciveQty": d.data[0].鏀舵枡鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿
- , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[0].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[0].閲囪喘璁㈠崟浜よ揣鏃ユ湡),'yyyy-MM-dd')
- , "HPOOrderBillRemark": d.data[0].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[0].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HLaterReason": d.data[i].寤惰繜鍘熷洜, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[i].瑙勬牸鍨嬪彿, "HUnitID": d.data[i].HUnitID, "HUnitIDName": d.data[i].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[i].鐗╂枡灞炴��, "HQty": d.data[i].鏁伴噺, "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[i].瀛愯〃閲囪喘缁勭粐
+ , "HStatus": d.data[i].鐘舵��, "HFixleadTime": d.data[i].鎻愬墠鏈�
+ , "HDayPlanBillNo": d.data[i].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[i].婧愬崟ID, "HSourceEntryID": d.data[i].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[i].婧愬崟鍗曞彿, "HSourceBillType": d.data[i].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[i].HWorkShopID
+ , "HWorkShopIDName": d.data[i].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[i].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[i].鍙敤閲囪喘鏁伴噺
+ , "HPOOrderInterID": d.data[i].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[i].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[i].閲囪喘璁㈠崟鍙�
+ , "HPOOrderBillSEQ": d.data[i].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[i].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[i].濮斿璁㈠崟瀛愬唴鐮�
+ , "HWWOrderBillNo": d.data[i].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[i].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[i].閲囪喘閮ㄩ棬
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[i].閫佽揣鍗曟暟閲�
+ , "HReciveQty": d.data[i].鏀舵枡鏁伴噺, "HCloseStatus": d.data[i].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[i].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[i].閿�鍞鍗曞彿
+ , "HUnReciveQty": d.data[i].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[i].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[i].閲囪喘璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd')
+ , "HPOOrderBillRemark": d.data[i].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[i].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ for (var i = 0; i < d.data.length; i++) {
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub'+(i+1)).attr("checked", true);
+ }
- //鍏抽棴鐘舵��
- if (d.data[0].鍏抽棴鐘舵�� == "1") {
- $('#HCloseStatus1').attr("checked", true);
+ //鍏抽棴鐘舵��
+ if (d.data[i].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus' + (i + 1)).attr("checked", true);
+ }
+
+
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + (i + 1)).find("option[value='" + d.data[i].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ $('#HErpClsID' + (i + 1)).find("option[value='" + d.data[i].鐗╂枡灞炴�� + "']").attr("selected", true);
+ $('#HPURCHASEORGIDSub' + (i + 1)).find("option[value='" + d.data[i].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
+ $('#HStatus' + (i + 1)).find("option[value='" + d.data[i].鐘舵�� + "']").attr("selected", true);
+
}
form.render('checkbox');
-
- //寤惰繜鍘熷洜
- $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
- $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
- $('#HPURCHASEORGIDSub1').find("option[value='" + d.data[0].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
- $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
form.render('select');
}
})
@@ -972,8 +977,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
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 f972ac6..6b3a93d 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"
@@ -186,7 +186,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
//, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -398,7 +398,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝淇℃伅鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -413,7 +413,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -421,7 +420,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝淇℃伅鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
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_PODemandPlanConfigBill_Add.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_PODemandPlanConfigBill_Add.html"
index 19ccd2f..cadb713 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_PODemandPlanConfigBill_Add.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_PODemandPlanConfigBill_Add.html"
@@ -145,11 +145,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -163,7 +161,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -255,7 +253,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1 ) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -410,9 +408,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
type: "GET",
@@ -426,15 +424,17 @@
, "HPRDORGID": d.data[0].缁勭粐
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[0].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
- , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
- , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HSupplierID": d.data[i].HSupplierID, "HSupplierNumber": d.data[i].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[i].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О, "HMaterModel": d.data[i].瑙勬牸鍨嬪彿
+ , "HJITMaterGroup": d.data[i].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[i].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[i].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[i].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[i].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+ , "HLeadTime": d.data[i].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[i].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[i].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[i].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- form.render('select');
}
})
}
@@ -453,8 +453,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
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/Gy_WorkWarehouseBillList.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/Gy_WorkWarehouseBillList.html"
index 655402a..203ffc5 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/Gy_WorkWarehouseBillList.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/Gy_WorkWarehouseBillList.html"
@@ -180,7 +180,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
//, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -340,7 +340,7 @@
, area: ['100%', '100%']
, title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -355,7 +355,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -363,7 +362,7 @@
, area: ['100%', '100%']
, title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
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/Gy_WorkWarehouseBill_Add.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/Gy_WorkWarehouseBill_Add.html"
index 980d784..e0d47b1 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/Gy_WorkWarehouseBill_Add.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/Gy_WorkWarehouseBill_Add.html"
@@ -143,11 +143,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -161,7 +159,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -241,7 +239,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -250,7 +248,9 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData()) {
+ set_AddNew(data);
+ }
});
//鐩戝惉鎻愪氦
@@ -272,7 +272,7 @@
//缁勭粐閫夋嫨椤甸潰
function get_Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -395,9 +395,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/ComplementGoodBillList",
type: "GET",
@@ -410,15 +410,16 @@
, "HInterID": d.data[0].hmainid
, "HPRDORGID": d.data[0].缁勭粐
});
-
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿浠ｇ爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HWHID": d.data[0].HWHID
- , "HWHNumber": d.data[0].浠撳簱浠ｇ爜, "HWHName": d.data[0].浠撳簱鍚嶇О, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
- option.data = rowdata;
- table.render(option);
- form.render('select');
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].杞﹂棿浠ｇ爜, "HWorkShopName": d.data[i].杞﹂棿鍚嶇О, "HWHID": d.data[i].HWHID
+ , "HWHNumber": d.data[i].浠撳簱浠ｇ爜, "HWHName": d.data[i].浠撳簱鍚嶇О, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ option.data = rowdata;
+ table.render(option);
+ }
}
})
}
@@ -437,8 +438,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';'+ OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -464,6 +464,16 @@
});
}
+ //闈炵┖楠岃瘉
+ function AllowLoadData() {
+
+ if ($("#HPRDORGID").val() == "0") {
+ layer.msg("缁勭粐娌℃湁閫夋嫨");
+ return false;
+ }
+ return true;
+ }
+
//#endregion
});
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/JIT_NeedMaterPlanConfigBillList.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/JIT_NeedMaterPlanConfigBillList.html"
index b905ea7..2e78e14 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/JIT_NeedMaterPlanConfigBillList.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/JIT_NeedMaterPlanConfigBillList.html"
@@ -186,7 +186,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
//, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -398,7 +398,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝淇℃伅鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -413,7 +413,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -421,7 +420,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝淇℃伅鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
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/JIT_NeedMaterPlanConfigBill_Add.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/JIT_NeedMaterPlanConfigBill_Add.html"
index 6d6dfee..7516e6c 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/JIT_NeedMaterPlanConfigBill_Add.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/JIT_NeedMaterPlanConfigBill_Add.html"
@@ -145,16 +145,14 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '4611' },
+ data: { "HBillType": '4615' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -163,7 +161,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -255,7 +253,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -410,9 +408,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/NeedMaterPlanConfigBillList",
type: "GET",
@@ -425,16 +423,17 @@
, "HInterID": d.data[0].hmainid
, "HPRDORGID": d.data[0].缁勭粐
});
-
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿缂栫爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
- , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
- , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].杞﹂棿缂栫爜, "HWorkShopName": d.data[i].杞﹂棿鍚嶇О, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О, "HMaterModel": d.data[i].瑙勬牸鍨嬪彿
+ , "HJITMaterGroup": d.data[i].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[i].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[i].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[i].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[i].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+ , "HLeadTime": d.data[i].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[i].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[i].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[i].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- form.render('select');
}
})
}
@@ -453,8 +452,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
index cbf8f83..9deb464 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
@@ -154,7 +154,6 @@
<div class="layui-form-item" style="padding-top: 10px;">
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
-
</div>
</div>
</form>
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_DayPlanBillEdit.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_DayPlanBillEdit.html"
index a479d5e..1dee345 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_DayPlanBillEdit.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_DayPlanBillEdit.html"
@@ -582,11 +582,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -601,7 +599,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -1191,7 +1189,7 @@
if (table.cache["mainTable"][i] != "") {
//鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
if (table.cache["mainTable"][i].HEntryCloseDate == "") {
- table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01 00:00:00.000"
+ table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01"
}
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
@@ -1201,8 +1199,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -1229,15 +1226,14 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (d) {
-
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": d.data[0].鍗曟嵁鍙�
@@ -1293,7 +1289,7 @@
, "HSourceBillNo": d.data[0].婧愬崟缂栧彿
, "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟鏄庣粏鍐呯爜
, "HMainInterID": d.data[0].瀵煎叆鎺掍骇ID
- , "HProdORGID": d.data[0].鐢熶骇缁勭粐
+ , "HProdORGID": d.data[0].HProdORGID
, "HLeftPlanQty": d.data[0].鏈帓鏁伴噺
, "HEmpID": d.data[0].HEmpID
, "HEmpIDName": d.data[0].鑱屽憳
@@ -1309,15 +1305,17 @@
, "HHangUp": d.data[0].鎸傝捣鏍囪 == "0" ? false : true
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HMasterDate": Format(new Date(d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
- , "HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[0].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[0].缁撴潫鏃堕棿), "yyyy-MM-dd")
- , "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[0].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate":Format(new Date(d.data[0].瀛愬叧闂椂闂�), "yyyy-MM-dd")
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": d.data[0].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[0].鏄惁榻愬
- , "HStatusTag": d.data[0].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[0].鎵嬪伐淇敼鏍囪 == 0 ? false : true
- }];
-
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ rowdata.push({
+ "HMasterDate": Format(new Date(d.data[i].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[i].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[i].姹囨姤瀹屾垚鏁伴噺
+ , "HTimes": d.data[i].鍓╀綑宸ユ椂, "HUseTimes": d.data[i].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[i].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[i].缁撴潫鏃堕棿), "yyyy-MM-dd")
+ , "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[i].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), "yyyy-MM-dd")
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[i].Excel鍒楀ご, "HLockedSub": d.data[i].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[i].鏄惁榻愬
+ , "HStatusTag": d.data[i].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[i].鎵嬪伐淇敼鏍囪 == 0 ? false : true
+ });
+ }
option.data = rowdata;
table.render(option);
@@ -1329,25 +1327,27 @@
if (d.data[0].鎸傝捣鏍囪 == "1") {
$("#checkboxHHangUp").attr("checked", true);
}
+ for (var i = 0; i < d.data.length; i++) {
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
+ }
- //閿佸畾鏍囪
- if (d.data[0].瀛愰攣瀹氭爣璁� == "1") {
- $('#HLockedSub1').attr("checked", true);
- }
+ //閿佸畾鏍囪
+ if (d.data[i].瀛愰攣瀹氭爣璁� == "1") {
+ $('#HLockedSub' + (i + 1)).attr("checked", true);
+ }
- //鐘舵�佹爣璁�
- if (d.data[0].鐘舵�佹爣璁� == "1") {
- $('#HStatusTag1').attr("checked", true);
- }
+ //鐘舵�佹爣璁�
+ if (d.data[i].鐘舵�佹爣璁� == "1") {
+ $('#HStatusTag' + (i + 1)).attr("checked", true);
+ }
- //鎵嬪伐淇敼鏍囪
- if (d.data[0].鎵嬪伐淇敼鏍囪 == "1") {
- $('#HIsHandModify1').attr("checked", true);
+ //鎵嬪伐淇敼鏍囪
+ if (d.data[i].鎵嬪伐淇敼鏍囪 == "1") {
+ $('#HIsHandModify' + (i + 1)).attr("checked", true);
+ }
}
form.render('checkbox');
}
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 4ec2752..ee2ab03 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"
@@ -170,7 +170,7 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
@@ -401,7 +401,7 @@
, area: ['100%', '100%']
, title: '鏃ヨ鍒掑伐鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -416,7 +416,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -424,7 +423,7 @@
, area: ['100%', '100%']
, title: '鏃ヨ鍒掑伐鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
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"
new file mode 100644
index 0000000..6921a65
--- /dev/null
+++ "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"
@@ -0,0 +1,522 @@
+锘�<!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/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>
+</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 style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel瀵煎叆</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-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" style="width: 85px;">寮�宸ヨ捣濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 75px;">
+ </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>
+ <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="HSeOrderBillNo" id="HSeOrderBillNo">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</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="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 75px;">
+ </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;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ </div>
+ <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="HICMOBillNo" id="HICMOBillNo">
+ </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="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; width: 185px;">
+ <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
+ <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <option value="鏍囧噯Bom">鏍囧噯Bom</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <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="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d" readonly>
+ </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="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </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_BatchFill"><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="btn-CopyLine"><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>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ //#region 鍏敤鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , excel = layui.excel
+ , element = layui.element;
+
+ var sWhere = "";
+ var option = [];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ switch (obj.event) {
+ case 'btn-CopyLine':
+ console.log(JSON.stringify(data))
+ console.log()
+
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ data[0]["鐢熶骇璧勬簮"] = "";
+ data[0]["HSourceID"] = 0;
+ data[0]["hmainid"] = "";
+ data[0]["鍗曟嵁鍙�"] = "";
+ var copydata = JSON.stringify(data);
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ break;
+ }
+ });
+
+ //瀵煎叆
+ form.on('submit(ExcelImport)', function () {
+ btnExcelImport();
+ });
+
+ //淇濆瓨
+ form.on('submit(btnSave)', function (data) {
+ set_AddNew(data);
+ });
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {
+ btnHMaterID();
+ });
+
+ //鐢熶骇杞﹂棿
+ form.on('submit(btnHWorkShopID)', function (data) {
+ btnHWorkShopID();
+ });
+
+ //蹇�熻繃婊�
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //缁勭粐
+ Organ();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ get_FastQuery();
+ }
+ //#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ 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);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //琛ㄦ牸鏁版嵁
+ 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()
+
+ columns.push({ type: 'checkbox', fixed: 'left' });
+ columns.push({ field: 'hmainid', title: 'hmainid', hide: true });
+ columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width:150 });
+ columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width:150 });
+ columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
+ columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150 });
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width:150 });
+ columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width:150 });
+ columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+ columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width:150 });
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width:150 });
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width:150 });
+ columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true});
+ columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width:150 });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width:150 });//0
+ columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150 });//0
+ columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width:150 });
+ columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
+ columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
+ columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150 });//0
+ columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
+ columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width:150 });
+ columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+ columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width:150 });
+ columns.push({ field: 'HSourceID', title: 'HSourceID', hide:true });
+ columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width:150 });
+ for (var i = 0; i <= (SumMonth - dd); i++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), edit: 'text',width:120 })//0
+ }
+ for (var i = 1; i < dd; i++) {
+ columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), edit: 'text',width: 120 })//0
+ }
+ columns.push({ field: 'T31', title: 'T31', width: 150 });//0
+ columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
+ columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150 });
+ columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150 });
+ columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150 });
+ columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150 });
+ columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150 });
+ columns.push({ field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 150 });
+ columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
+ columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
+ columns.push({ field: '鏃ヨ鍒掑伐鍗曚富鐮�', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150 });
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [columns]
+ };
+ }
+
+ //鏌ヨ鍔犺浇鏁版嵁
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //Excel瀵煎叆
+ function btnExcelImport() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: 'Excel瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html?OperationType=1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ //鐗╂枡鍒楄〃
+ function btnHMaterID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , 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);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterModel").val(checkStatus.data[0].HModel);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+
+ }
+
+ //鐢熶骇杞﹂棿鍒楄〃
+ function btnHWorkShopID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+ $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HPlanBeginDate = $("#HPlanBeginDate").val();//寮�宸ヨ捣濮嬫棩鏈�
+ var HProdORGID = $("#HProdORGID").val();//鐢熶骇璁㈠崟缁勭粐
+ var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
+ var HPlanEndDate = $("#HPlanEndDate").val();//寮�宸ユ埅姝㈡棩鏈�
+ var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
+ var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
+ var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+
+ sWhere = {
+ HPlanBeginDate: HPlanBeginDate
+ , HProdORGID: HProdORGID
+ , HSeOrderBillNo: HSeOrderBillNo
+ , HPlanEndDate: HPlanEndDate
+ , HMaterID: HMaterID
+ , HICMOBillNo: HICMOBillNo
+ , HWorkShopID: HWorkShopID
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //閲嶇疆
+ function set_ClearQuery() {
+ $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
+ $("#HProdORGID").val("0");//鐢熶骇璁㈠崟缁勭粐
+ $("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
+ $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
+ $("#HMaterID").val("0");//鐗╂枡缂栫爜id
+ $("#HMaterNumber").val("");//鐗╂枡缂栫爜
+ $("#HMaterName").val("");//鐗╂枡鍚嶇О
+ $("#HMaterModel").val("0");//瑙勬牸鍨嬪彿
+ $("#HICMOBillNo").val("");//鐢熶骇璁㈠崟鍙�
+ $("#HWorkShopID").val("0");//鐢熶骇杞﹂棿id
+ $("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
+ sWhere = "";
+ }
+
+ //淇濆瓨
+ function set_AddNew(data) {
+
+ //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ //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: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ get_FastQuery();
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+</script>
\ No newline at end of file
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_DayPlanPlatFormImport.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_DayPlanPlatFormImport.html"
index ae283c6..e4df184 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_DayPlanPlatFormImport.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_DayPlanPlatFormImport.html"
@@ -49,7 +49,7 @@
<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>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
</div>
@@ -92,7 +92,7 @@
<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_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
</div>
</script>
</form>
@@ -128,6 +128,9 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -168,7 +171,12 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- Pub_Close(2);
+ if (OperationType == 1) {
+ Pub_Close(1);
+ }
+ else {
+ Pub_Close(2);
+ }
})
//瀵煎叆 淇濆瓨鏁版嵁
@@ -194,18 +202,20 @@
set_InitGrid();
}
+ //#endregion
+
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
var myDate = new Date();
var yyyy = myDate.getFullYear();
var MM = myDate.getMonth() + 1;
var dd = myDate.getDate();
- var SumMonth = new Date(yyyy, MM, 0).getDate();
+ var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
var columns = [];
columns.push({ type: 'checkbox', fixed: 'left' });
- columns.push({ field: 'hmainid', title: ' hmainid', width: 200, hide: true });
- columns.push({ field: '鍗曟嵁鍙�', title: ' 鍗曟嵁鍙�', width: 200 });
+ columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
+ columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 });
columns.push({ field: '鐢熶骇璁㈠崟鍙�*', title: '鐢熶骇璁㈠崟鍙�' });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿*', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 200 });
columns.push({ field: '缁勭粐缂栫爜*', title: '缁勭粐缂栫爜' });
@@ -302,6 +312,17 @@
}
}
+ //鑾峰彇鍙傛暟
+ 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
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
index 92e5ee6..6bff735 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -276,11 +276,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -295,7 +293,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -631,7 +629,6 @@
//澶氶�� 鍒锋柊琛ㄦ牸
function checkRefresh() {
for (var i = 1; i <= option.data.length; i++) {
- console.log(JSON.stringify(option.data[i - 1]))
//寤惰繜鍘熷洜
$('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
//鐗╂枡灞炴��
@@ -838,9 +835,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
type: "GET",
@@ -862,44 +859,52 @@
, "HExplanation": d.data[0].鎽樿
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
- , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HProdORGID": d.data[0].瀛愮敓浜х粍缁�
- , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
- , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd')
- , "HRelationQty": d.data[0].鍏宠仈鏁伴噺, "HICMOInterID": d.data[0].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟瀛愬唴鐮�
- , "HICMOBillSEQ": d.data[0].鐢熶骇璁㈠崟琛屽彿, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd')
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HReciveQty": d.data[0].鍏ュ簱鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false
- , "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿, "HICMOEmpID": d.data[0].HICMOEmpID, "HICMOEmpIDName": d.data[0].鐢熶骇璁㈠崟鍒跺崟浜�
- , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HICMOBillDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd')
- , "HICMOBillDeliveryDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[0].鐢熶骇璁㈠崟鎽樿
- , "HICMOBillNote": d.data[0].鐢熶骇璁㈠崟琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HLaterReason": d.data[i].寤惰繜鍘熷洜, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[i].瑙勬牸鍨嬪彿, "HUnitID": d.data[i].HUnitID, "HUnitIDName": d.data[i].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[i].鐗╂枡灞炴��, "HQty": d.data[i].鏁伴噺, "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HProdORGID": d.data[i].瀛愮敓浜х粍缁�
+ , "HStatus": d.data[i].鐘舵��, "HFixleadTime": d.data[i].鎻愬墠鏈�, "HSourceInterID": d.data[i].婧愬崟ID, "HSourceEntryID": d.data[i].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[i].婧愬崟鍗曞彿, "HSourceBillType": d.data[i].瀛愭簮鍗曠被鍨�, "HDayPlanDate": Format(new Date(d.data[i].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd')
+ , "HRelationQty": d.data[i].鍏宠仈鏁伴噺, "HICMOInterID": d.data[i].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": d.data[i].鐢熶骇璁㈠崟瀛愬唴鐮�
+ , "HICMOBillSEQ": d.data[i].鐢熶骇璁㈠崟琛屽彿, "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), 'yyyy-MM-dd')
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HReciveQty": d.data[i].鍏ュ簱鏁伴噺, "HCloseStatus": d.data[i].鍏抽棴鐘舵�� == "1" ? true : false
+ , "HRemoveQty": d.data[i].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[i].閿�鍞鍗曞彿, "HICMOEmpID": d.data[i].HICMOEmpID, "HICMOEmpIDName": d.data[i].鐢熶骇璁㈠崟鍒跺崟浜�
+ , "HUnReciveQty": d.data[i].鏈敹鏂欐暟閲�, "HICMOBillDate": Format(new Date(d.data[i].鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd')
+ , "HICMOBillDeliveryDate": Format(new Date(d.data[i].鐢熶骇璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[i].鐢熶骇璁㈠崟鎽樿
+ , "HICMOBillNote": d.data[i].鐢熶骇璁㈠崟琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ for (var i = 0; i < d.data.length; i++) {
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
+ }
- //鍏抽棴鐘舵��
- if (d.data[0].鍏抽棴鐘舵�� == "1") {
- $('#HCloseStatus1').attr("checked", true);
- }
- form.render('checkbox');
+ //鍏抽棴鐘舵��
+ if (d.data[i].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus' + (i + 1)).attr("checked", true);
+ }
- //寤惰繜鍘熷洜
- $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
- //鐗╂枡灞炴��
- $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
- //鐢熶骇缁勭粐
- $('#HProdORGIDSub1').find("option[value='" + d.data[0].瀛愮敓浜х粍缁� + "']").attr("selected", true);
- //鐘舵��
- $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + (i + 1)).find("option[value='" + d.data[i].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ //鐗╂枡灞炴��
+ $('#HErpClsID' + (i + 1)).find("option[value='" + d.data[i].鐗╂枡灞炴�� + "']").attr("selected", true);
+ //鐢熶骇缁勭粐
+ $('#HProdORGIDSub' + (i + 1)).find("option[value='" + d.data[i].瀛愮敓浜х粍缁� + "']").attr("selected", true);
+ //鐘舵��
+ $('#HStatus' + (i + 1)).find("option[value='" + d.data[i].鐘舵�� + "']").attr("selected", true);
+ }
form.render('select');
+ form.render('checkbox');
+
+
+
}
})
}
@@ -923,8 +928,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index 1ac8e71..3163db1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -172,7 +172,7 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
, { field: '鏃ユ湡', title: '瑕佹枡鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉' }
@@ -391,7 +391,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -406,7 +406,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -414,7 +413,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index 30bd422..5f832d2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -141,6 +141,7 @@
<label class="layui-form-label">瀹屾垚鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="" selected>鍏ㄩ儴</option>
<option value="鏈畬鎴�" selected>鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 52e621d..144a74b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -148,6 +148,7 @@
<label class="layui-form-label">瀹屾垚鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="" selected>鍏ㄩ儴</option>
<option value="鏈畬鎴�" selected>鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
--
Gitblit v1.9.1