MES-WEB-LayUI.git

			@@ -55,6 +55,7 @@
			<div style="padding: 10px; ">
			<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="btnSave" id="btnSave">ä¿å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">åè®¾ç½®</button>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<div class="layui-tab-content">
			@@ -199,9 +200,9 @@
			<option value="1">èæµ·å®ä¸éå¢</option>
			<option value="100035">èæµ·éè®¯å¬å¸</option>
			<option value="100037">éè®¯å¬å¸æ¬é¨</option>
			<option value="100038">ææºäºä¸é¨</option>
			<option value="100038">æå·å·¥å</option>
			<option value="100039">å¹³æ¿äºä¸é¨</option>
			<option value="100040">èæµ·çµåå¬å¸</option>
			<option value="100040">æ±å±±å·¥å</option>
			<option value="100041">èæµ·éå®å¬å¸</option>
			<option value="100042">é¦æ¸¯éå®å¬å¸</option>
			<option value="100043">èæµ·çµååå¡æéå¬å¸</option>
			@@ -272,33 +273,8 @@
			// }, function () { window.location.href = "../../user/login.html"; });
			//}

			var params = getUrlVars();
			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",
			type: "GET",
			data: { "HBillType": '4609' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(linterid, linteridSub);
			//RoadBillSub(linterid);
			}


			var HModName = "JIT_NeedMaterPlanBill";
			var option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			@@ -347,11 +323,36 @@
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			}

			//åå§å è½½è¡¨æ ¼
			option.data = rowdata;
			table.render(option);
			DisPlay_HideColumn();

			var params = getUrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å æ·»å ä¿å
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == -1) {
			OperationType = 1;
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '4609' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			//$("#HProdORGID").attr("disabled", true);
			RoadBillMain(linterid);
			//RoadBillSub(linterid);
			}

			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			@@ -508,6 +509,11 @@
			}
			});

			//éèåè®¾ç½®
			form.on('submit(HideColumn)', function (data) {
			get_HideColumn();
			});

			//çå¬æäº¤
			form.verify({
			numberOrEmpty: function (value, item) {
			@@ -602,6 +608,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async:false,
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			@@ -609,6 +616,7 @@
			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");
			@@ -631,7 +639,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);
			//ç©æå±æ§
			@@ -831,19 +838,133 @@
			}
			})
			}

			obj.event = "";
			return false;
			}

			})
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

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

			//ç¼è¾ é¡µé¢èµå¼
			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",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (d) {

			@@ -852,7 +973,7 @@
			"HBillNo": d.data[0].åæ®å·
			, "HInterID": d.data[0].hmainid
			, "HAddress": d.data[0].äº¤è´§å°ç¹
			, "HProdORGID": d.data[0].ä¸»çäº§ç»ç»
			, "HProdORGID": d.data[0].HProdORGID
			, "HDeptID": d.data[0].HDeptID
			, "HDeptIDName": d.data[0].è½¦é´åç§°
			, "HSettleCurrId": d.data[0].HSettleCurrId
			@@ -862,44 +983,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].æºååID
			, "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].æºååID
			, "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);
			//å³éç¶æ
			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);
			//çäº§ç»ç»
			$('#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');

			//å»¶è¿åå
			$('#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);
			form.render('select');


			}
			})
			}
			@@ -923,9 +1052,8 @@

			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({
			type: "POST",