MES-WEB-LayUI.git

			@@ -55,7 +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>
			<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">
			@@ -200,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>
			@@ -273,30 +273,7 @@
			// }, 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]]; //ä»åæ®è·å æºåç±»å

			//å¤ææ¯å¦æ°å¢
			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
			RoadBillMain(linterid);
			//RoadBillSub(linterid);
			}

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

			//åå§å è½½è¡¨æ ¼
			option.data = rowdata;
			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(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			@@ -605,6 +608,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async:false,
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			@@ -612,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");
			@@ -833,6 +838,8 @@
			}
			})
			}

			obj.event = "";
			return false;
			}

			@@ -871,6 +878,7 @@
			$.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) {
			@@ -887,6 +895,10 @@
			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;";
			@@ -894,11 +906,11 @@
			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 (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;
			@@ -952,6 +964,7 @@
			$.ajax({
			url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (d) {

			@@ -960,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
			@@ -1013,9 +1026,9 @@
			}
			form.render('select');
			form.render('checkbox');






			}
			})
			}
			@@ -1040,7 +1053,7 @@
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num);
			var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];


			var index = layer.load();
			$.ajax({
			type: "POST",