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;
			@@ -82,8 +83,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>
			@@ -136,9 +137,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>
			</div>
			@@ -164,7 +164,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
			@@ -175,6 +175,7 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable
			//æ¥è¯¢æ¡ä»¶
			var HStartDate = "";
			var HEndDate = "";
			@@ -215,7 +216,6 @@
			//å é¤
			case 'set_DeleteBill': set_DeleteBill();
			break;

			};
			});
			$('.layui-tab-title').on('click', function (title) {
			@@ -295,7 +295,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillList',
			type: "GET",
			data: { "page": 1, "limit": 500, "HStartDate": HStartDate, "HEndDate": HEndDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
			data: { "page": 1, "limit": 50, "HStartDate": HStartDate, "HEndDate": HEndDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
			async: false,
			dataType: "json",//æ°æ®ç±»åå¯ä»¥ä¸º text xml json script jsonp
			success: function (data1) {
			@@ -315,7 +315,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillSumList',
			type: "GET",
			data: { "page": 1, "limit": 500, "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
			data: { "page": 1, "limit": 50, "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
			async: false,
			dataType: "json",//æ°æ®ç±»åå¯ä»¥ä¸º text xml json script jsonp
			success: function (data1) {
			@@ -339,20 +339,24 @@
			cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: 'åè®¡' };
			for (var i = 0; i < data.length; i++) {
			if (data[i].name == 'HItemID') {
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //éèidå
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true, width: 200 }; //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'long':
			case 'Int32':
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
			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, width: 200 };
			break;
			//Decimal
			case 'Decimal':
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200};
			break;
			default:
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200};
			}
			}
			}
			@@ -368,7 +372,7 @@
			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 ä¸ºè¿åçæ°æ®
			@@ -384,6 +388,7 @@
			},
			done: function (res) { //è¿åæ°æ®æ§è¡åè°å½æ°
			layer.close(layer.index); //è¿åæ°æ®å³éloading
			soulTable.render(this);
			}
			});
			}
			@@ -395,20 +400,24 @@
			cols_arr1[0][0] = { checkbox: true, fixed: true, totalRowText: 'åè®¡' };
			for (var i = 0; i < data.length; i++) {
			if (data[i].name == 'HItemID') {
			cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //éèidå
			cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true, width: 200 }; //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'long':
			case 'Int32':
			cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
			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, width: 200};
			break;
			//Decimal
			case 'Decimal':
			cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
			cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
			break;
			default:
			cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
			cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200};
			}
			}
			}
			@@ -417,7 +426,7 @@
			elem: '#layTable1',
			url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillSumList',
			toolbar: '#toolbarDemo1', //å¼å¯å¤´é¨å·¥å·æ ï¼å¹¶ä¸ºå¶ç»å®å·¦ä¾§æ¨¡æ¿
			title: 'å¨å·å³æ¶åºåæ±æ»è¡¨',
			//title: 'å¨å·å³æ¶åºåæ±æ»è¡¨',
			cols: cols_arr1, //å¡«åè¡¨æ ¼å¤´æ°æ®,
			id: 'layTable1', //è¡¨æ ¼id
			where: { "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 }, //æ©å±åæ°,å¯ä»¥ä¼ æ°æ®å°åå°