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">
			@@ -207,9 +208,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>
			@@ -253,6 +254,7 @@
			, element = layui.element;

			//åå§è¡¨æ ¼æ°æ®
			var HModName = "JIT_Cg_PODemandPlanBill";
			var rowdata = [{
			"HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
			, "HErpClsID": "", "HQty": "", "HRemark": "", "HPURCHASEORGID": "", "HStatus": "", "HFixleadTime": ""
			@@ -293,7 +295,6 @@
			type: "GET",
			data: { "HBillType": '4608' },
			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"));
			@@ -302,7 +303,6 @@
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(linterid);
			//RoadBillSub(linterid);
			}

			var option = {
			@@ -311,6 +311,7 @@
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, cellMinWidth: 120
			, height: 'full-270'
			, totalRow: true
			, cols: [[ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			@@ -322,11 +323,11 @@
			, { 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: 'HQty', title: 'æ°é', edit: 'text', totalRow: true }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HPURCHASEORGID', title: 'éè´ç»ç»', templet: "#HPURCHASEORGIDSub" }
			, { field: 'HStatus', title: 'ç¶æ', templet: '#HStatus' }//list
			, { field: 'HFixleadTime', title: 'æåæ', edit: 'text' }
			, { field: 'HFixleadTime', title: 'æåæ', edit: 'text', totalRow: true}
			, { field: 'HDayPlanBillNo', title: 'æ¥è®¡åå·¥åç¼å·', edit: 'text' }
			, { field: 'HSourceInterID', title: 'æ¥è®¡åå·¥åFID', edit: 'text' }
			, { field: 'HSourceEntryID', title: 'æ¥è®¡åå·¥åFENTRYID', width: 200, edit: 'text' }
			@@ -335,7 +336,7 @@
			, { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
			, { field: 'HWorkShopIDName', title: 'çäº§è½¦é´', edit: 'text', event: "HWorkShopID" }
			, { field: 'HDayPlanDate', title: 'å·¥åçäº§æ¥æ', width: 200, event: 'HDayPlanDate' }//date
			, { field: 'HRelationQty1', title: 'å¯ç¨éè´æ°é', edit: 'text' }
			, { field: 'HRelationQty1', title: 'å¯ç¨éè´æ°é', edit: 'text', totalRow: true }
			, { field: 'HPOOrderInterID', title: 'éè´è®¢ååç ', edit: 'text' }
			, { field: 'HPOOrderEntryID', title: 'éè´è®¢åååç ', edit: 'text' }
			, { field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', edit: 'text' }
			@@ -348,12 +349,12 @@
			, { field: 'HCloseTypeSub', title: 'æ¯å¦æå·¥å³é', templet: "#HCloseTypeSub" }//ck
			, { field: 'HCloseMan', title: 'è¡å³é', width: 200, edit: 'text' }
			, { field: 'HEntryCloseDate', title: 'è¡å³éæ¥æ', width: 200, event: 'HEntryCloseDate' }//date
			, { field: 'HSendQty', title: 'éè´§åæ°é', edit: 'text' }
			, { field: 'HReciveQty', title: 'æ¶ææ°é', edit: 'text' }
			, { field: 'HSendQty', title: 'éè´§åæ°é', edit: 'text', totalRow: true }
			, { field: 'HReciveQty', title: 'æ¶ææ°é', edit: 'text', totalRow: true }
			, { field: 'HCloseStatus', title: 'å³éç¶æ', templet: "#HCloseStatus" }//ck
			, { field: 'HRemoveQty', title: 'è½¬ç§»æ°é', edit: 'text' }
			, { field: 'HRemoveQty', title: 'è½¬ç§»æ°é', edit: 'text', totalRow: true}
			, { field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', edit: 'text' }
			, { field: 'HUnReciveQty', title: 'æªæ¶ææ°é', edit: 'text' }
			, { field: 'HUnReciveQty', title: 'æªæ¶ææ°é', edit: 'text', totalRow: true}
			, { field: 'HPOOrderBillDate', title: 'éè´è®¢ååæ®æ¥æ', event: "HPOOrderBillDate", width: 200 }//date
			, { field: 'HPOOrderBillDeliveryDate', title: 'éè´è®¢åäº¤è´§æ¥æ', event: "HPOOrderBillDeliveryDate", width: 200 } // date
			, { field: 'HPOOrderBillRemark', title: 'éè´è®¢åæè¦', edit: 'text' }
			@@ -364,7 +365,8 @@

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


			//#endregion

			@@ -606,6 +608,11 @@
			});
			});

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

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			@@ -624,7 +631,9 @@
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HPURCHASEORGID").append(Organization);
			$("#HPURCHASEORGID").val(sessionStorage["OrganizationID"]);
			$("#HSubORGID").append(Organization);
			$("#HSubORGID").val(sessionStorage["OrganizationID"]);
			form.render('select');
			}
			layer.closeAll("loading");
			@@ -647,7 +656,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);
			//ç©æå±æ§
			@@ -701,7 +709,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_SupplierList.html", "yes"]
			, content: ["../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -713,7 +721,7 @@
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			$("#HSupplierID").val(checkStatus.data[0].HItemID);
			$("#HSupplierIDName").val(checkStatus.data[0].HName);
			$("#HSupplierIDName").val(checkStatus.data[0].ä¾åºååç§°);
			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -747,6 +755,109 @@
			})
			}

			//éèåè®¾ç½®
			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",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

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

			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 (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 (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			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 set_GridCellCheck(obj) {
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			@@ -763,7 +874,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_MaterialList.html", "yes"]
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -777,9 +888,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);//å³éå¼¹çª
			}
			@@ -797,7 +908,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_UnitList.html", "yes"]
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -810,7 +921,7 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HUnitID": checkStatus.data[0].HItemID
			, "HUnitIDName": checkStatus.data[0].HName
			, "HUnitIDName": checkStatus.data[0].è®¡éåä½åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -828,7 +939,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -841,7 +952,7 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HWorkShopID": checkStatus.data[0].HItemID
			, "HWorkShopIDName": checkStatus.data[0].HName
			, "HWorkShopIDName": checkStatus.data[0].é¨é¨åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -859,7 +970,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -872,15 +983,16 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HPurchaseDeptID": checkStatus.data[0].HItemID
			, "HPurchaseDeptIDName": checkStatus.data[0].HName
			, "HPurchaseDeptIDName": checkStatus.data[0].é¨é¨åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			obj.event = "";
			return false;
			}

			})
			}

			@@ -900,7 +1012,7 @@
			, "HInterID": d.data[0].hmainid
			, "HSubORGID": d.data[0].å§å¤ç»ç»
			, "HAddress": d.data[0].äº¤è´§å°ç¹
			, "HPURCHASEORGID": d.data[0].ä¸»è¡¨éè´ç»ç»
			, "HPURCHASEORGID": d.data[0].HPURCHASEORGID
			, "HSupplierID": d.data[0].HSupplierID
			, "HSupplierIDName": d.data[0].ä¾åºååç§°
			, "HSettleCurrId": d.data[0].HSettleCurrId