MES-WEB-LayUI.git

			@@ -312,6 +312,11 @@
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;
			var allVal;

			//æ¨¡åå
			var HModName = "Fb_StepFoldinBillEdit";
			var titleData = [];

			//åå»è¿åå¨å±åé
			window.OptionData = [];
			//#endregion
			@@ -362,6 +367,9 @@

			// åå§åç
			set_InitGrid();
			DisPlay_HideColumn();


			//è·åæºåç±»å
			HSourceBillType();
			//å¤´å·¥å·æ äºä»¶
			@@ -407,10 +415,10 @@
			//checkRefresh();
			}
			break;
			////åè®¾ç½®
			//case 'set_HideColumn':
			// get_HideColumn();
			// break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});

			@@ -536,6 +544,142 @@
			}
			}
			//#endregion

			//#region åè¡¨1ï¼éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion
			//#region åè¡¨1ï¼æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			async: false,
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			async: false,
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			/var titleData = ["HMaterID", "HUnitID", "ææ£ç", "å®éå«ç¨åä»·", "ç¨é¢", "æ¬ä½å¸ä»·ç¨åè®¡", "åºåºæ°é", "å¼ç¥¨æ°é", "HOrderLevID","è®¢åççº§ä»£ç ","éå®åºåºæ°é","éå®åºåºå®¡æ ¸æ°é","éå®åºåºå®¡æ ¸éé¢","çäº§æ°é","éå®éåºæ°é","éå®éåºå®¡æ ¸æ°é"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/
			//titleData = [];

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (i >= dataCol.length) {
			continue;
			}

			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;
			}
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) > -1) {
			option.cols[0][i + 1]["hide"] = true;
			}

			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			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;
			}

			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}

			//åæ¶å»ç»å
			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
			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³

			//#region å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html	152 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -2221,10 +2221,10 @@
			<publishTime>07/31/2024 13:38:19</publishTime>
			</File>
			<File Include="views/ä»åç®¡ç/ä»åºè°æ¨/Add_Edit_Kf_MoveStockBill.html">
			<publishTime>11/21/2024 08:53:44</publishTime>
			<publishTime>11/21/2024 09:07:08</publishTime>
			</File>
			<File Include="views/ä»åç®¡ç/ä»åºè°æ¨/Add_Edit_Kf_MoveStockBill.html">
			<publishTime>11/21/2024 08:53:44</publishTime>
			<publishTime>11/21/2024 09:07:08</publishTime>
			</File>
			<File Include="views/ä»åç®¡ç/ä»åºè°æ¨/Cc_LookingForBill.html">
			<publishTime>04/11/2023 16:34:43</publishTime>
			@@ -2275,7 +2275,7 @@
			<publishTime>04/11/2023 16:34:43</publishTime>
			</File>
			<File Include="views/ä»åç®¡ç/åæ¥å¼è°å¥å/Fb_StepFoldinBillEdit.html">
			<publishTime>07/31/2024 13:38:19</publishTime>
			<publishTime>11/21/2024 09:07:28</publishTime>
			</File>
			<File Include="views/ä»åç®¡ç/åæ¥å¼è°å¥å/Fb_StepFoldinBillList.html">
			<publishTime>07/31/2024 13:38:19</publishTime>

			@@ -1871,6 +1871,10 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (i >= dataCol.length) {
			continue;
			}

			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {