MES-WEB-LayUI.git

			@@ -12,6 +12,7 @@
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/modules//tableFilter2.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -347,7 +348,8 @@
			, laydate = layui.laydate
			, excel = layui.excel
			, soulTable = layui.soulTable
			, element = layui.element;
			, element = layui.element
			, tableFilter = layui.tableFilter;
			var ins;
			var sWhere = "";
			var sWhere_ICMO = "";
			@@ -870,7 +872,7 @@
			var oneday = 1000 * 60 * 60 * 24;

			columns.push({ type: 'checkbox', fixed: 'left', sort: true });
			columns.push({ type: 'numbers', title: 'åºå·', sort: true });
			columns.push({ type: 'numbers', field: 'åºå·',title: 'åºå·', sort: true });
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true });
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', sort: true });
			@@ -1087,10 +1089,11 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-120'
			, page: false
			, page: true
			, cellMinWidth: 90
			, cols: [columns]
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, limit: 500//é»è®¤æ¾ç¤ºå¨é¨
			, limits: [500,1000,1500,3000,5000,10000,20000]
			, done: function (res, page, count) {
			soulTable.render(this);
			$('.layui-table thead').on('click', 'th', function () {
			@@ -1132,7 +1135,7 @@

			//for (var i = 0; i < HBackgroundColorIndex.length;i++) {
			// $("tr[data-index='" + i + "']").attr({ "style": "background:#F74848;color:black;" });
			//}
			//}
			}
			}
			}
			@@ -1175,8 +1178,10 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {

			option.data = data1.data;
			ins = table.render(option);

			var HinterID_S = [];
			for (var i = 0; i < data1.data.length; i++) {
			HinterID_S.push(data1.data[i]["hmainid"]);
			@@ -3278,16 +3283,16 @@

			//å é¤åè¡¨æ°æ® ä¼å ç¨æ°ç»çä½ç½®,éè¦éæ°æä¸ä¸é¡ºåº
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) == 0) {
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i] != "") {
			if (parseFloat(option.data[i]["æåæ°é"]) == 0) {
			return layer.msg("ç¬¬" + (i + 1) + "è¡,æäº§æ°éæè¯¯,è¯·éæ°è¾å¥!");
			}
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) - parseFloat(table.cache["mainTable"][i]["æåæ±æ¥æ°é"]) < parseFloat(table.cache["mainTable"][i]["æ¥è®¡åæ°éæ»é"])) { // - å·²æ±æ¥æ°é
			if (parseFloat(option.data[i]["æåæ°é"]) - parseFloat(option.data[i]["æåæ±æ¥æ°é"]) < parseFloat(option.data[i]["æ¥è®¡åæ°éæ»é"])) { // - å·²æ±æ¥æ°é
			return layer.msg("ç¬¬" + (i + 1) + "è¡,æäº§æ°éè¶åºè®¢åæ°é!");
			}
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			num.push(table.cache["mainTable"][i])
			option.data[i].LAY_TABLE_INDEX = i;
			num.push(option.data[i])
			}
			}

			@@ -3803,8 +3808,8 @@
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			@@ -3813,7 +3818,7 @@
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

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

			layer.open({
			type: 2
			@@ -3842,71 +3847,82 @@
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


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

			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol[i]) {
			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;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			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;
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			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 (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = 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];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			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);