MES-WEB-LayUI.git

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>ç½å¯åå¸æç»æ¥è¡¨</title>
			<title>æåæç»æ¥è¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			@@ -167,6 +167,7 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			</div>
			@@ -200,6 +201,8 @@
			var HModName = "ProdProcessEntryReport_DyeColor";

			var detailBar = 0; //ç¨äºæ±æ»æ¥è¡¨æ¥çæç»æ¥è¡¨ï¼å½ä¸º0æ¶æ¾ç¤ºæç»æ±æ»æ¥è¡¨å¯¹åºæç»æ¥è¡¨ã

			var ins; //ç¨äºå¯¼åºexcel
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -213,6 +216,10 @@
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			break;
			@@ -344,7 +351,7 @@
			success: function (data1) {

			if (data1.count == 1) {

			var totalArray = ["çäº§ä»»å¡åæ°é", "ç½å¯åå¸"];
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -357,6 +364,9 @@
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, "") > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			}
			else if (data[i].ColName == 'ç½å¯åå¸') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			@@ -382,7 +392,7 @@
			, cols: [col]
			, data: data1.data
			};
			table.render(option);
			ins = table.render(option);
			} else {
			option = {
			elem: '#mainTable'
			@@ -400,14 +410,14 @@
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 160 }
			, { field: 'å®¢æ·', title: 'å®¢æ·', width: 160 }
			, { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§ä»»å¡åæ°é', width: 200 }
			, { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§ä»»å¡åæ°é', totalRow: true,width: 200 }
			, { field: 'ç½å¯åå¸', title: 'ç½å¯åå¸', width: 160, totalRow: true }
			, { field: 'æ¯å¦ä¸æ¨çææµè½¬å¡', title: 'æ¯å¦ä¸æ¨çææµè½¬å¡', width: 160 }
			]]
			, done: function (res) {
			}
			};
			table.render(option);
			ins = table.render(option);
			}
			},
			error: function (err) {
			@@ -459,7 +469,7 @@
			}
			}

			option.data = data1.data;
			ins = table.render(option);
			//var num = 0;
			//for (let i = 0; i < data1.data.length; i++) {
			// for (let j = i + 1; j < data1.data.length; j++) {
			@@ -472,7 +482,7 @@
			// }
			// }
			//}
			table.render(option);
			ins = table.render(option);

			//è®¡ç®åè®¡å¬æ¤æ°
			var sumHMaterOutQty = 0;
			@@ -640,6 +650,27 @@
			sWhere = "";
			}

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Kf_ProdProcessEntryReport_DyeColor_ExportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins.config.id, option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {