MES-WEB-LayUI.git

			@@ -34,10 +34,11 @@
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">æ¥è¯¢</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jl" id="Jl">å«æ</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">çææ£æå</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">ä¸è¯åéç³è¯·æ</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">ä¸è¯åéæç³è¯·å</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">ä½ééæç³è¯·å</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">æ¥åºéæç³è¯·å</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">çæéæå</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px;margin-top:5px;" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">éèåè®¾ç½®</button>
			</div>
			<div class="layui-collapse">
			<div class="layui-colla-item">
			@@ -129,17 +130,15 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¼å§æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
			<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;text-align:center;">â</label>
			<div class="layui-input-block" style="margin-left: 118px;">
			<input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 90px;">
			<input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="ä»æ¾ç¤ºæªå®å¨éé">
			@@ -154,7 +153,6 @@
			<div class="layui-form-item" style="padding-top: 10px;">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>

			</div>
			</div>
			</form>
			@@ -180,6 +178,7 @@
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var HModName = "JIT_ComplementGoodBill";
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -251,6 +250,11 @@
			getXc();
			})

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

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			@@ -264,6 +268,7 @@
			//æ¶é´åå§å
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			DisPlay_HideColumn();
			}
			//è·åç»ç»
			function Organ() {
			@@ -295,8 +300,8 @@
			, cellMinWidth: 90
			, limit: 500
			, cols: [[
			//{ type: 'checkbox', fixed: 'left' }
			{ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·',width: 150 }
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·',width: 150 }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 170}
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 170 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 260, }
			@@ -314,13 +319,15 @@
			, { field: 'éæåå ', title: 'éæåå ', width: 160, edit: 'text'}
			, { field: 'å·²å«ææ°é', title: 'å·²å«ææ°é', width: 160}
			, { field: 'å·²ééæ°é', title: 'å·²ééæ°é', width: 160 }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160, edit: 'text', event: 'Warehouse' }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160, edit: 'text', event: 'OutWarehouse' }
			, { field: 'è°åºä»åºid', title: 'è°åºä»åºid', width: 160, hide: true }
			, { field: 'è°å¥ä»åº', title: 'è°å¥ä»åº', width: 160, edit: 'text', event: 'InWarehouse' }
			, { field: 'è°å¥ä»åºid', title: 'è°å¥ä»åºid', width: 160, hide: true }
			, { field: 'åºåæ°é', title: 'åºåæ°é', width: 160 }
			, { field: 'è°åºä»åºåºåæ°é', title: 'è°åºä»åºåºåæ°é', width: 160 }
			, { field: 'è°åºä»åºå¯ç¨åºåæ°é', title: 'è°åºä»åºå¯ç¨åºåæ°é', width: 160 }
			, { field: 'å¯ç¨åºå', title: 'å¯ç¨åºå', width: 160 }
			, { field: 'åºåç»ç»', title: 'åºåç»ç»', width: 160}
			, { field: 'è°åºç»ç»', title: 'è°åºç»ç»', width: 160}
			, { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 160 }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 160 }
			@@ -488,7 +495,7 @@
			function set_GridCellCheck(obj) {
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			if (obj.event == "Warehouse") {
			if (obj.event == "OutWarehouse") {
			//æå¼ç»´ä¿®é¡¹ç®å°çªä½
			layer.open({
			type: 2
			@@ -513,7 +520,36 @@
			"è°åºä»åº": checkStatus.data[0].HName
			, "è°åºä»åºid": checkStatus.data[0].HItemID
			})
			console.log(checkStatus.data[0].HItemID)
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			if (obj.event == "InWarehouse") {
			//æå¼ç»´ä¿®é¡¹ç®å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "ä»åºåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_WarehouseList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"è°å¥ä»åº": checkStatus.data[0].HName
			, "è°å¥ä»åºid": checkStatus.data[0].HItemID
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -524,17 +560,18 @@

			//æ°å¢å«æå
			function set_AddNew_Jl() {

			if (table.cache['mainTable'].length == 0) {
			var data = table.cache['mainTable'];
			if (data.length == 0) {
			return layer.msg("æ æ°æ®,æ æ³å«æ!");
			}
			else {

			var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]

			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "Sc_ComplementGoodBill/InsertCallGoodsBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Sc_ComplementGoodBill/InsertCallGoodsBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr },
			dataType: "json",
			@@ -679,7 +716,7 @@
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_JL_ICStockTuiBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Sc_ComplementGoodBill/Insert_JL_ICStockTuiBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr },
			dataType: "json",
			@@ -761,10 +798,114 @@
			, area: ['80%', '80%']
			, title: 'å«ææ£æä¿¡æ¯æ¥è¯¢'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../çäº§å«æå¹³å°/JIT_HlpBillList.html?HSourceInterID=' + HSouceInterID + '&HSourceEntryID=' + HSourceEntryID
			, content: '../çäº§å«æå¹³å°/JIT_HlpBillList.html?HSourceInterID=' + HSouceInterID + '&HSourceEntryID=' + HSourceEntryID + '&Type=1'
			})
			}
			}

			//éèåè®¾ç½®
			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 = ["è°åºä»åºid", "è°å¥ä»åºid", "HDeptID", "HDeptNumber", "HMaterialID", "HWHID", "HOutOrgID", "HSouceInterID", "HSourceEntryID", "HSourceBillNo", "HICMOInterID", "HICMOEntryID","HSTOCKID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			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]["field"], 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 });
			}
			})
			}

			//#endregion

			});