MES-WEB-LayUI.git

			@@ -9,6 +9,7 @@
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -75,8 +76,8 @@
			<table class="" id="layTable" lay-filter="layTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" ><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" ><i class="layui-icon layui-icon-return"></i>éåº</button>

			</div>
			</script>
			@@ -123,8 +124,8 @@
			<table class="" id="layTable1" lay-filter="layTable1"></table>
			<script type="text/html" id="toolbarDemo1">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1" style="display:none;"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1" ><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1" ><i class="layui-icon layui-icon-return"></i>éåº</button>

			</div>
			</script>
			@@ -151,7 +152,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			// #region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			@@ -162,6 +163,7 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable
			//æ¥è¯¢æ¡ä»¶
			var HDate = "";
			var HNumber = "";
			@@ -238,8 +240,6 @@
			laydate.render({
			elem: '#HDate'
			});
			}
			function set_InitFrom() {
			laydate.render({
			elem: '#HDate1'
			});
			@@ -248,6 +248,8 @@

			// #region åå§åçé¢
			function set_ClearBill(HDate, HNumber, HBarCode, HSupName) {
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			resultTableHead = []; //æ¸ç©ºè¡¨å¤´åï¼é²æ¢éå¤æ¸²æ
			//åå§æ¥è¯¢
			get_Display(HDate, HNumber, HBarCode, HSupName);
			@@ -269,7 +271,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillList',
			type: "GET",
			data: { "page": 1, "limit": 500, "HDate": HDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
			data: { "page": 1, "limit": 50, "HDate": HDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
			async: false,
			dataType: "json",//æ°æ®ç±»åå¯ä»¥ä¸º text xml json script jsonp
			success: function (data1) {
			@@ -289,7 +291,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_MESReportFrom/ReportMouldStockBillSumList',
			type: "GET",
			data: { "page": 1, "limit": 500, "HDate": HDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
			data: { "page": 1, "limit": 50, "HDate": HDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
			async: false,
			dataType: "json",//æ°æ®ç±»åå¯ä»¥ä¸º text xml json script jsonp
			success: function (data1) {
			@@ -318,7 +320,11 @@
			else {
			switch (data[i].Type) {
			//int
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
			break;
			//Decimal
			@@ -342,14 +348,22 @@
			page: true, //å¼å¯åé¡µ
			totalRow: true, //å¼å¯åè®¡
			limit: 50, //ä¸é¡µè½å¤æ¾ç¤ºçæå¤§æ°ç®
			limits: [50, 100, 300, 500, 1000, 5000], //æ§å¶å¤å°è¡ä¸é¡µï¼é»è®¤äºæ¡ä¸é¡µï¼
			limits: [50, 500, 5000, 20000], //æ§å¶å¤å°è¡ä¸é¡µï¼é»è®¤äºæ¡ä¸é¡µï¼
			method: 'get', //æäº¤æ¹å¼
			layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			parseData: function (res) { //res ä¸ºè¿åçæ°æ®
			if (res.code == "0") {
			return {
			"msg": res.Message
			}
			}
			},
			response: {
			statusCode: 1 //éæ°è§å®æåçç¶æç ä¸º 1ï¼table ç»ä»¶é»è®¤ä¸º 0
			},
			done: function (res) { //è¿åæ°æ®æ§è¡åè°å½æ°
			layer.close(layer.index); //è¿åæ°æ®å³éloading
			soulTable.render(this);
			}
			});
			}
			@@ -366,7 +380,11 @@
			else {
			switch (data[i].Type) {
			//int
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
			break;
			//Decimal
			@@ -393,6 +411,13 @@
			limits: [50,100, 300, 500, 1000, 5000], //æ§å¶å¤å°è¡ä¸é¡µï¼é»è®¤äºæ¡ä¸é¡µï¼
			method: 'get', //æäº¤æ¹å¼
			layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			parseData: function (res) { //res ä¸ºè¿åçæ°æ®
			if (res.code == "0") {
			return {
			"msg": res.Message
			}
			}
			},
			response: {
			statusCode: 1 //éæ°è§å®æåçç¶æç ä¸º 1ï¼table ç»ä»¶é»è®¤ä¸º 0
			},