MES-WEB-LayUI.git

			@@ -458,19 +458,19 @@
			if ($.inArray(data[i].name, "") > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			} else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: 'åæ®å·' });
			}
			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 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
			}
			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 HH:mm:ss')}}</div>", width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
			}
			}
			}
			@@ -600,13 +600,13 @@
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'hmainid', title: 'hmainid', sort: false, hide: true }
			, { field: 'ä»»å¡å', title: 'ä»»å¡å', width: 125 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 190 }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', width: 125 }
			, { field: 'HProcID', title: 'HProcID', hide: true }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·', sort: true }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·', sort: false }
			, { field: 'å½åå·¥åºä»£ç ', title: 'å½åå·¥åºä»£ç ', width: 125 }
			, { field: 'å½åå·¥åº', title: 'å½åå·¥åº' }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			@@ -1732,10 +1732,10 @@
			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: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
			}
			}
			}
			@@ -1812,13 +1812,13 @@
			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 HH:mm:ss')}}</div>", width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'æ°é' \|\| data[i].name == 'åºç«æ°é' \|\| data[i].name == 'æ¥åºæ°é' \|\| data[i].name == 'åæ ·æ°é' \|\| data[i].name == 'å·¥æ¶') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
			}
			}
			}