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_LiftMaterPlanBillEdit.html | 78 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 37 deletions(-)
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({
--
Gitblit v1.9.1