MES-WEB-LayUI.git

			@@ -88,12 +88,12 @@
			<h1 style="text-align:center;margin-bottom:7px;margin-top:7px;"><b>å·¥èºè·¯çº¿æ¥è¯¢</b></h1>
			<div class="layui-tab layui-tab-card" lay-filter="table">
			<ul class="layui-tab-title">
			<li class="layui-this">æåå»ºç</li>
			<li>éè¦æå®¡æ ¸ç</li>
			<li>æåå»ºç</li>
			<li class="layui-this">éè¦æå®¡æ ¸ç</li>
			<li>æå·²å®¡æ ¸ç</li>
			</ul>
			<div class="layui-tab-content" style="">
			<div class="layui-tab-item layui-show">
			<div class="layui-tab-item ">
			<script type="text/html" id="toolbarDemoSend">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			@@ -108,7 +108,7 @@
			</script>
			<table class="" id="mainTableSend" lay-filter="mainTableSend"></table>
			</div>
			<div class="layui-tab-item ">
			<div class="layui-tab-item layui-show">
			<script type="text/html" id="toolbarDemoNeedCheck">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			@@ -176,7 +176,7 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(1);
			get_Display(2);
			//get_Display(2);
			//get_Display(3);
			//#endregion
			@@ -493,7 +493,7 @@
			var url = "";
			var user = sessionStorage["HUserName"];
			if (type == 1) {
			var sWhere = "and å¶åäºº = '" + user + "'"
			var sWhere = "and å¶åäºº = '" + user + "'" + " and å·¥åºä»£ç != '9999' and HBillSubType<>'SUB'" + "and å®¡æ ¸äºº = ''"
			url = '/LEMS/MES_Gy_RoutingBillList_Json';
			userData = { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3301" };

			@@ -533,15 +533,11 @@
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			} else if (data[i].name == 'å®¡æ¹é¡¹ç®åç§°') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', width: 120, fixed: 'left', sort: true
			});
			}else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " =='' ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			case 'long':
			case 'Int32':
			@@ -560,6 +556,7 @@
			optionChecked.cols = [col];

			if (type == 1) {
			HModName = "Gy_RoutingBillCheckQueryIMake";
			optionSend.data = data1.data;
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			@@ -586,6 +583,7 @@
			table.render(optionSend);
			option = optionSend;
			} else if (type == 2) {
			HModName = "Gy_RoutingBillCheckQuery";
			optionNeedCheck.data = data1.data;
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			@@ -613,7 +611,8 @@
			option = optionNeedCheck;
			}
			else if (type == 3) {
			optionChecked.data = data1.data;
			HModName = "Gy_RoutingBillCheckQuery";
			optionChecked.data = data1.data;//è·åå1000
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			@@ -673,7 +672,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -690,78 +689,92 @@
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			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 - 1; 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;
			}
			//ç»è®¡å
			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];
			}
			}

			//åæ¶å»ç»å
			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);

			ins=table.render(option);
			} else {
			table.render(option);

			ins=table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			@@ -769,6 +782,7 @@
			})
			}
			//#endregion


			//#region ç¼è¾
			function get_ShowBill(tableName) {
			@@ -887,13 +901,14 @@
			function set_CheckBill_Flow(num, tableName) {
			var checkStatus = table.checkStatus(tableName)
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			if (checkStatus.data.length != 0) {
			var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//å°å¯¹è±¡æ°ç»idæåå»é
			var queryString = uniqueIds.join(",");//å°idsåææ°ç»
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_Routing/AuditFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
			url: GetWEBURL() + "/Gy_Routing/CheckAllFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterIDS": queryString, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -920,7 +935,7 @@
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			layer.msg('è¯·éæ©è³å°ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion
			@@ -929,13 +944,14 @@
			function set_RejectCheck_Flow(tableName) {
			var checkStatus = table.checkStatus(tableName)
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			if (checkStatus.data.length !=0 ) {
			var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//å°å¯¹è±¡æ°ç»idæåå»é
			var queryString = uniqueIds.join(",");//å°idsåææ°ç»
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
			url: GetWEBURL() + "/Gy_Routing/RejectAllCheckFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterIDS": queryString, "CurUserID": sessionStorage["Czybm"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {