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,6 +273,61 @@
			// }, function () { window.location.href = "../../user/login.html"; });
			//}


			var HModName = "JIT_NeedMaterPlanBill";
			var option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, cellMinWidth: 120
			, totalRow: true
			, height: 'full-270'
			, cols: [[ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'HLaterReason', title: 'å»¶è¿åå ', templet: '#HLaterReason', width: 200 }//list
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'HMaterNumber', title: 'ç©æç¼ç ', edit: 'text', event: "HMaterID" }
			, { field: 'HMaterName', title: 'ç©æåç§°' }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·' }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'HUnitIDName', title: 'è®¡éåä½', edit: 'text', event: "HUnitID" }
			, { field: 'HErpClsID', title: 'ç©æå±æ§', templet: '#HErpClsID' }//list
			, { field: 'HQty', title: 'æ°é', edit: 'text', totalRow: true}
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HProdORGID', title: 'çäº§ç»ç»', templet: "#HProdORGIDSub" }
			, { field: 'HStatus', title: 'ç¶æ', templet: '#HStatus' }//list
			, { field: 'HFixleadTime', title: 'æåæ', edit: 'text', totalRow: true}
			, { field: 'HSourceInterID', title: 'æ¥è®¡åå·¥åFID', edit: 'text' }
			, { field: 'HSourceEntryID', title: 'æ¥è®¡åå·¥åFENTRYID', width: 200, edit: 'text' }
			, { field: 'HSourceBillNo', title: 'çäº§è®¢åå·', edit: 'text' }
			, { field: 'HSourceBillType', title: 'æºåç±»å', edit: 'text' }
			, { field: 'HDayPlanDate', title: 'å·¥åçäº§æ¥æ', width: 200, event: 'HDayPlanDate' }//date
			, { field: 'HRelationQty', title: 'å³èæ°é', edit: 'text', totalRow: true}
			, { field: 'HICMOInterID', title: 'çäº§è®¢ååç ', edit: 'text' }
			, { field: 'HICMOEntryID', title: 'çäº§è®¢åååç ', edit: 'text' }
			, { field: 'HICMOBillSEQ', title: 'çäº§è®¢åè¡å·', edit: 'text' }
			, { field: 'HCloseMan', title: 'è¡å³é', width: 200, edit: 'text' }
			, { field: 'HEntryCloseDate', title: 'è¡å³éæ¥æ', width: 200, event: 'HEntryCloseDate' }//date
			, { field: 'HCloseTypeSub', title: 'æ¯å¦æå·¥å³é', templet: "#HCloseTypeSub" }//ck
			, { field: 'HReciveQty', title: 'å¥åºæ°é', edit: 'text', totalRow: true }
			, { field: 'HCloseStatus', title: 'å³éç¶æ', templet: "#HCloseStatus" }//ck
			, { field: 'HRemoveQty', title: 'è½¬ç§»æ°é', edit: 'text', totalRow: true }
			, { field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', edit: 'text' }
			, { field: 'HICMOEmpID', title: 'HICMOEmpID', hide: true }
			, { field: 'HICMOEmpIDName', title: 'çäº§è®¢åå¶åäºº', edit: 'text', event: "HICMOEmpID" }
			, { field: 'HUnReciveQty', title: 'æªæ¶ææ°é', edit: 'text', totalRow: true}
			, { field: 'HICMOBillDate', title: 'çäº§è®¢ååæ®æ¥æ', event: "HICMOBillDate", width: 200 }//date
			, { field: 'HICMOBillDeliveryDate', title: 'çäº§è®¢åäº¤è´§æ¥æ', event: "HICMOBillDeliveryDate", width: 200 } // date
			, { field: 'HICMOBillRemark', title: 'çäº§è®¢åæè¦', edit: 'text' }
			, { field: 'HICMOBillNote', title: 'çäº§è®¢åè¡¨ä½å¤æ³¨', edit: 'text', width: 200 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			}
			//åå§å è½½è¡¨æ ¼
			option.data = rowdata;
			DisPlay_HideColumn();

			var params = getUrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å æ·»å ä¿å
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			@@ -294,62 +349,11 @@
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			//$("#HProdORGID").attr("disabled", true);
			RoadBillMain(linterid);
			//RoadBillSub(linterid);
			}
			var HModName = "JIT_NeedMaterPlanBill";
			var option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, cellMinWidth: 120
			, height: 'full-270'
			, cols: [[ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'HLaterReason', title: 'å»¶è¿åå ', templet: '#HLaterReason', width: 200 }//list
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'HMaterNumber', title: 'ç©æç¼ç ', edit: 'text', event: "HMaterID" }
			, { field: 'HMaterName', title: 'ç©æåç§°' }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·' }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'HUnitIDName', title: 'è®¡éåä½', edit: 'text', event: "HUnitID" }
			, { field: 'HErpClsID', title: 'ç©æå±æ§', templet: '#HErpClsID' }//list
			, { field: 'HQty', title: 'æ°é', edit: 'text' }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HProdORGID', title: 'çäº§ç»ç»', templet: "#HProdORGIDSub" }
			, { field: 'HStatus', title: 'ç¶æ', templet: '#HStatus' }//list
			, { field: 'HFixleadTime', title: 'æåæ', edit: 'text' }
			, { field: 'HSourceInterID', title: 'æ¥è®¡åå·¥åFID', edit: 'text' }
			, { field: 'HSourceEntryID', title: 'æ¥è®¡åå·¥åFENTRYID', width: 200, edit: 'text' }
			, { field: 'HSourceBillNo', title: 'çäº§è®¢åå·', edit: 'text' }
			, { field: 'HSourceBillType', title: 'æºåç±»å', edit: 'text' }
			, { field: 'HDayPlanDate', title: 'å·¥åçäº§æ¥æ', width: 200, event: 'HDayPlanDate' }//date
			, { field: 'HRelationQty', title: 'å³èæ°é', edit: 'text' }
			, { field: 'HICMOInterID', title: 'çäº§è®¢ååç ', edit: 'text' }
			, { field: 'HICMOEntryID', title: 'çäº§è®¢åååç ', edit: 'text' }
			, { field: 'HICMOBillSEQ', title: 'çäº§è®¢åè¡å·', edit: 'text' }
			, { field: 'HCloseMan', title: 'è¡å³é', width: 200, edit: 'text' }
			, { field: 'HEntryCloseDate', title: 'è¡å³éæ¥æ', width: 200, event: 'HEntryCloseDate' }//date
			, { field: 'HCloseTypeSub', title: 'æ¯å¦æå·¥å³é', templet: "#HCloseTypeSub" }//ck
			, { field: 'HReciveQty', title: 'å¥åºæ°é', edit: 'text' }
			, { field: 'HCloseStatus', title: 'å³éç¶æ', templet: "#HCloseStatus" }//ck
			, { field: 'HRemoveQty', title: 'è½¬ç§»æ°é', edit: 'text' }
			, { field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', edit: 'text' }
			, { field: 'HICMOEmpID', title: 'HICMOEmpID', hide: true }
			, { field: 'HICMOEmpIDName', title: 'çäº§è®¢åå¶åäºº', edit: 'text', event: "HICMOEmpID" }
			, { field: 'HUnReciveQty', title: 'æªæ¶ææ°é', edit: 'text' }
			, { field: 'HICMOBillDate', title: 'çäº§è®¢ååæ®æ¥æ', event: "HICMOBillDate", width: 200 }//date
			, { field: 'HICMOBillDeliveryDate', title: 'çäº§è®¢åäº¤è´§æ¥æ', event: "HICMOBillDeliveryDate", width: 200 } // date
			, { field: 'HICMOBillRemark', title: 'çäº§è®¢åæè¦', edit: 'text' }
			, { field: 'HICMOBillNote', title: 'çäº§è®¢åè¡¨ä½å¤æ³¨', edit: 'text', width: 200 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			}

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

			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			@@ -605,6 +609,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async:false,
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			@@ -612,6 +617,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");
			@@ -687,7 +693,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -699,7 +705,7 @@
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			$("#HDeptIDName").val(checkStatus.data[0].HName);
			$("#HDeptIDName").val(checkStatus.data[0].é¨é¨åç§°);
			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -749,7 +755,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_MaterialList.html", "yes"]
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -763,9 +769,9 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].HNumber
			, "HMaterName": checkStatus.data[0].HName
			, "HMaterModel": checkStatus.data[0].HModel
			, "HMaterNumber": checkStatus.data[0].ç©æä»£ç
			, "HMaterName": checkStatus.data[0].ç©æåç§°
			, "HMaterModel": checkStatus.data[0].è§æ ¼åå·
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -783,7 +789,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_UnitList.html", "yes"]
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -796,7 +802,7 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HUnitID": checkStatus.data[0].HItemID
			, "HUnitIDName": checkStatus.data[0].HName
			, "HUnitIDName": checkStatus.data[0].è®¡éåä½åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -814,7 +820,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -827,12 +833,14 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HICMOEmpID": checkStatus.data[0].HItemID
			, "HICMOEmpIDName": checkStatus.data[0].HName
			, "HICMOEmpIDName": checkStatus.data[0].é¨é¨åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			obj.event = "";
			return false;
			}

			@@ -871,6 +879,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 +896,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 +907,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 +965,7 @@
			$.ajax({
			url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (d) {

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






			}
			})
			}
			@@ -1040,7 +1054,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",