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>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -58,7 +59,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="display: inline-block;" >
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="display: inline-block;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -82,7 +83,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="display: inline-block;" >
			<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="display: inline-block;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -92,6 +93,90 @@
			</div>
			</div>
			</div>
			<hr />
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -99,6 +184,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			</div>
			</script>
			</form>
			@@ -116,7 +202,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			@@ -129,6 +215,7 @@
			, util = layui.util
			, tree = layui.tree
			, util = layui.util
			, soulTable = layui.soulTable
			var sWhere = "";
			var option = [];
			var HMainICMOEntryID = -1;//ä¸»çäº§è®¢åååç
			@@ -136,12 +223,13 @@
			var HICMOInterID = -1;//æ¥è®¡åè®¢åä¸»åç
			var HModName = "JIT_CompleteDetailList";
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var ins = "";
			//#endregion

			//#region åå§åçé¢

			var params = getUrlVars();
			var OperationType = params[params[0]];
			var OperationType = params[params[0]];

			//å¤ææ¯å¦æåæ°ä¼ é
			if (!isNaN(OperationType)) {
			@@ -151,7 +239,7 @@
			}

			set_ClearBill();



			//#endregion

			@@ -172,6 +260,10 @@
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			};
			});
			@@ -206,7 +298,9 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			get_FastQuery();

			ColFilter();
			}
			//#endregion

			@@ -218,43 +312,47 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'HinterId', title: 'HinterId', hide: true }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·' }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·' }
			, { field: 'æ¥è®¡åå·¥åå·', title: 'æ¥è®¡åå·¥åå·' }
			, { field: 'æ¥è®¡åè®¢åååç ', title: 'æ¥è®¡åè®¢åååç ', hide: true }
			, { field: 'æ¥è®¡åè®¢åä¸»åç ', title: 'æ¥è®¡åè®¢åä¸»åç ', hide: true }
			, { field: 'ä¸»çäº§è®¢åååç ', title: 'ä¸»çäº§è®¢åååç ', hide: true }
			, { field: 'ä¸»çäº§è®¢åä¸»åç ', title: 'ä¸»çäº§è®¢åä¸»åç ', hide: true }
			, { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ', templet: "<div>{{d.æ¥è®¡åæ¥æ =='' ?'':layui.util.toDateString(d.æ¥è®¡åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ç©æID', title: 'ç©æID', hide: true }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº' }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é' }
			, { field: 'é½å¥ç¶æ', title: 'é½å¥ç¶æ' }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é' }
			, { field: 'ç¼ºææ°é', title: 'ç¼ºææ°é' }
			, { field: 'é¢æå ç¨æ°é', title: 'é¢æå ç¨æ°é' }
			, { field: 'å¯ç¨æ°é', title: 'å¯ç¨æ°é' }
			, { field: 'å ç¨æ°é', title: 'å ç¨æ°é' }
			, { field: 'åä½ç¨é', title: 'åä½ç¨é' }
			, { field: 'é½å¥åæè®¡ç®æ¶é´', title: 'é½å¥åæè®¡ç®æ¶é´' }
			, { field: 'çäº§è½¦é´ID', title: 'çäº§è½¦é´ID', hide: true }
			, { field: 'çäº§è½¦é´ç¼ç ', title: 'çäº§è½¦é´ç¼ç ' }
			, { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°' }
			, { field: 'ä»åºID', title: 'ä»åºID', hide: true }
			, { field: 'ä»åºç¼ç ', title: 'ä»åºç¼ç ' }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 120 }
			, { field: 'ä»ä½ID', title: 'ä»ä½ID', hide: true }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°' }
			, { field: 'æ¹å·', title: 'æ¹å·' ,width:120}
			, { field: 'HinterId', title: 'HinterId', hide: true, sort: true }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', sort: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true }
			, { field: 'æ¥è®¡åå·¥åå·', title: 'æ¥è®¡åå·¥åå·', sort: true }
			, { field: 'æ¥è®¡åè®¢åååç ', title: 'æ¥è®¡åè®¢åååç ', hide: true, sort: true }
			, { field: 'æ¥è®¡åè®¢åä¸»åç ', title: 'æ¥è®¡åè®¢åä¸»åç ', hide: true, sort: true }
			, { field: 'ä¸»çäº§è®¢åååç ', title: 'ä¸»çäº§è®¢åååç ', hide: true, sort: true }
			, { field: 'ä¸»çäº§è®¢åä¸»åç ', title: 'ä¸»çäº§è®¢åä¸»åç ', hide: true, sort: true }
			, { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ', templet: "<div>{{d.æ¥è®¡åæ¥æ =='' ?'':layui.util.toDateString(d.æ¥è®¡åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'ç©æID', title: 'ç©æID', hide: true, sort: true }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº', sort: true }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é', sort: true, totalRow: true }
			, { field: 'é½å¥ç¶æ', title: 'é½å¥ç¶æ', sort: true }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é', sort: true, totalRow: true }
			, { field: 'ç¼ºææ°é', title: 'ç¼ºææ°é', sort: true, totalRow: true }
			, { field: 'éè´å¨é', title: 'éè´å¨é', totalRow: true }
			, { field: 'çäº§æªå¥åº', title: 'çäº§æªå¥åº', totalRow: true }
			, { field: 'é¢æå ç¨æ°é', title: 'é¢æå ç¨æ°é', sort: true, totalRow: true }
			, { field: 'å¯ç¨æ°é', title: 'å¯ç¨æ°é', sort: true, totalRow: true }
			, { field: 'å ç¨æ°é', title: 'å ç¨æ°é', sort: true, totalRow: true}
			, { field: 'åä½ç¨é', title: 'åä½ç¨é', sort: true, totalRow: true }
			, { field: 'é½å¥åæè®¡ç®æ¶é´', title: 'é½å¥åæè®¡ç®æ¶é´', sort: true }
			, { field: 'çäº§è½¦é´ID', title: 'çäº§è½¦é´ID', hide: true, sort: true }
			, { field: 'çäº§è½¦é´ç¼ç ', title: 'çäº§è½¦é´ç¼ç ', sort: true }
			, { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°', sort: true }
			, { field: 'ä»åºID', title: 'ä»åºID', hide: true, sort: true }
			, { field: 'ä»åºç¼ç ', title: 'ä»åºç¼ç ', sort: true }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 120, sort: true }
			, { field: 'ä»ä½ID', title: 'ä»ä½ID', hide: true, sort: true }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', sort: true }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 120, sort: true }
			]]
			, done: function (res, curr, count) {
			soulTable.render(this);
			for (var i in res.data) {
			var item = res.data[i];

			@@ -273,11 +371,11 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_Complete/JIT_CompleteDetailList',
			type: "GET",
			data: { "sWhere": sWhere, "HMainICMOEntryID": HMainICMOEntryID, "HMainICMOInterID": HMainICMOInterID, "HICMOInterID": HICMOInterID },
			data: { "sWhere": sWhere, "HMainICMOEntryID": HMainICMOEntryID, "HMainICMOInterID": HMainICMOInterID, "HICMOInterID": HICMOInterID,"user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			option.data = result.data;
			table.render(option);
			ins = table.render(option);
			layer.close(ajaxLoad);

			DisPlay_HideColumn();
			@@ -296,6 +394,26 @@

			//#endregion

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion
			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HMaterID = $("#HMaterID").val();
			@@ -305,7 +423,80 @@
			var HComplete = $("#HComplete").val();
			var HPlanDate = $("#HPlanDate").val();
			var HICMOBillNo = $("#HICMOBillNo").val();

			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}

			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HMaterID!="0") {
			sWhere += " and ç©æID = '" + HMaterID + "'";
			}
			@@ -340,6 +531,15 @@
			$("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
			$("#HMaterName").val("");
			$("#HMaterModel").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			sWhere = "";
			}
			@@ -353,7 +553,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç©æåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -363,9 +563,9 @@
			}
			//è·åæ°æ®
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterModel").val(checkStatus.data[0].HModel);
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterModel").val(checkStatus.data[0].è§æ ¼åå·);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			@@ -373,12 +573,28 @@

			}

			function get_Export() {
			var data = option.data;
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});
			table.exportFile(ins.config.id, data, "xls");
			}


			//éèåè®¾ç½®
			function get_HideColumn(value) {
			var colName = "";

			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}

			var contentUrl = "";
			@@ -389,7 +605,7 @@
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			@@ -419,72 +635,89 @@
			async: false,
			success: function (data1) {
			if (data1.data.length != 0) {

			titleData = [];
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®

			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 - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			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 (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			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;
			}
			}

			//åæ¶å»ç»å
			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);
			console.log(option)
			} else {
			table.render(option);
			console.log(option)
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			@@ -492,6 +725,24 @@
			})
			}


			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);

			form.render('select');
			}
			//è·ååæ°
			function getUrlVars() {
			var vars = [], hash;