MES-WEB-LayUI.git

			@@ -11,6 +11,7 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<style>
			/* é²æ¢ä¸ææ¡çä¸æåè¡¨è¢«éè---å¿é¡»è®¾ç½®--- */
			.layui-table-cell {
			@@ -21,6 +22,11 @@
			margin-top: -10px;
			margin-left: -15px;
			margin-right: -15px;
			}

			/ç¨äºæ è®°talbeä¸å¯ä»¥è§¦åè¡ææ½ææçå/
			.drag-column{

			}
			</style>
			</head>
			@@ -119,17 +125,24 @@
			<input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>
			<!--å¤éæ¡ æ¯å¦ç»è®¡è¡-->
			<script type="text/html" id="IsTotalRow">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="IsTotalRow" lay-filter="IsTotalRow" id="IsTotalRow{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			}).use(['index', 'form', 'laydate', 'table',"soulTable", 'element'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, soulTable = layui.soulTable
			, form = layui.form
			, element = layui.element;
			//æ¥è¯¢æ¡ä»¶
			@@ -178,6 +191,19 @@
			}
			});
			});

			//æ¯å¦ç»è®¡
			form.on('checkbox(IsTotalRow)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.IsTotalRow = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});


			//ä¿åæäº¤
			form.on('submit(btnSave)', function (data) {//æäº¤
			@@ -233,12 +259,12 @@
			var colNames = [];//ç¸å¯¹åæ®ä¼ è¿æ¥çåå
			var cols = [];//è¦ä¼ è¿è¡¨æ ¼çæ°æ®
			var dataCol = [];


			if (data1.data.length != 0) {
			//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			dataCol = data1.data[0].HGridString.split(',');
			}


			colNames = colName.split(',');

			if (data1.data.length != 0 && dataCol.length == colNames.length) {
			@@ -250,12 +276,13 @@
			$("#HColumnWidth").val(data1.data[0].HColumnWidth);
			//é»è®¤åé¡µ
			$("#HPageSize").val(data1.data[0].HPageSize);

			//æ¯å¦æåº
			$("#HSortFlag").val(data1.data[0].HSortFlag);
			//è¡¨æ ¼çæ°æ®å¡«å
			for (var i = 0; i < colNames.length; i++) {
			var dataCols = dataCol[i].split('\|');
			var ColumnName_Other = dataCols[4] == dataCols[5] ? "" : dataCols[4];
			cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5] })
			cols.push({ "ColumnName": dataCols[5], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5], "IsTotalRow": dataCols[6] == 1 ? true : false })
			}
			option.data = cols;
			table.render(option);
			@@ -266,6 +293,9 @@
			if (dataCols[1] == 1) {
			$("#IsHide" + (i + 1)).attr("checked", true);
			}
			if (dataCols[6] == 1) {
			$("#IsTotalRow" + (i + 1)).attr("checked", true);
			}
			$('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);
			}
			form.render('checkbox');
			@@ -275,7 +305,7 @@
			var colTitleNames = colTitleName.split(',');
			//é»è®¤ä¸éä¸ æ¾ç¤ºåä½å±å·¦ è¡¨æ ¼çæ°æ®å¡«å
			for (var i = 0; i < colNames.length; i++) {
			cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i] })
			cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i], "IsTotalRow": false })
			}
			option.data = cols;
			table.render(option);
			@@ -283,6 +313,7 @@
			//é»è®¤ä¸éä¸ æ¾ç¤ºåä½å±å·¦ é¡µé¢å¤éæ¡ ä¸ææ¡ éæ°æ¸²æ
			for (var i = 0; i < colNames.length; i++) {
			$('#IsHide' + (i + 1)).prop("checked", false);
			$('#IsTotalRow' + (i + 1)).prop("checked", false);
			$('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);
			}
			form.render('checkbox');
			@@ -299,26 +330,49 @@
			//è¡¨æ ¼æ°æ®
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			id: "mainTable"
			, elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 420
			, cellMinWidth: 90
			, limit: 500
			, cols: [[
			{ field: 'ColumnName', title: 'åå', width: 100 }
			{
			field: 'ColumnName', title: 'åå', width: 100, templet: function (d) {
			return '<div class="drag-column" style="cursor: move; width: 100%; height: 100%;">' + d.ColumnName + '</div>';
			}
			}
			, { file: 'IsHide', title: 'æ¯å¦éè', width: 100, templet: '#IsHide' }
			, { field: 'Alignment', title: 'å¯¹é½æ¹å¼', width: 100, templet: '#Alignment' }
			, { field: 'ColumnWidth', title: 'åå®½', width: 100, edit: 'text' }
			, { field: 'ColumnName_Other', title: 'å«å', width: 120, edit: 'text' }
			, { field: 'ColumnName_real', title: 'å«åå¯¹åºåå', width: 120, edit: 'text',hide:"true" }
			, { field: 'ColumnName_real', title: 'å«åå¯¹åºåå', width: 120, edit: 'text', hide: "true" }
			, { field: 'IsTotalRow', title: 'æ¯å¦ç»è®¡', width: 100, templet:'#IsTotalRow' }
			]]
			, even: true
			, rowDrag: {/trigger: 'row',/
			trigger: '.drag-column' // æå®è§¦åææ½çåç´ éæ©å¨
			,onlyHandle: true // è®¾ä¸ºtrueè¡¨ç¤ºåªætriggeræå®çåç´ æè½è§¦åææ½
			,done: function (obj) {
			// å®ææ¶ï¼æ¾å¼æ¶ï¼è§¦å
			// å¦ææå¨ååæå¨åæ ååï¼åä¸ä¼è§¦åæ¤æ¹æ³
			console.log(obj.row) // å½åè¡æ°æ®
			console.log(obj.cache) // æ¹å¨åå¨è¡¨æ°æ®
			console.log(obj.oldIndex) // åæ¥çæ°æ®ç´¢å¼
			console.log(obj.newIndex) // æ¹å¨åæ°æ®ç´¢å¼
			console.log(table.cache["mainTable"]) // æ¹å¨åæ°æ®ç´¢å¼
			}
			}
			, done: function () {
			soulTable.render(this)
			}
			};
			}

			//ä¿åHMaker
			function set_AddNew(data) {

			var num = [];
			var num = []
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;