MES-WEB-LayUI.git

			@@ -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');
			}