MES-WEB-LayUI.git

			@@ -187,37 +187,92 @@
			<option value="å·²å®æ">å·²å®æ</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:5px">
			<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;">
			<div class="layui-row" style="margin-top:5px">
			<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-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 class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<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" lay-filter="Comparator1" class="ForFilteringSchemes" 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-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">

			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<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" lay-filter="Comparator2" class="ForFilteringSchemes" 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>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			@@ -239,6 +294,11 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPOInStockBackBills" id="btn-PushPOInStockBackBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(éæéç¥å)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>åèµ·å®¡æ¹</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>æ¥çå®¡æ¹è¿åº¦</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>è¡å³é</button>
			@@ -305,8 +365,6 @@

			//#endregion



			//#region è¿å¥é¡µé¢æ¢å è½½
			set_ClearBill();
			//#endregion
			@@ -356,6 +414,21 @@
			break;
			//åå®¡æ ¸
			case 'set_AbandonCheck': set_CheckBill(1);
			break;
			//åèµ·å®¡æ¹
			case 'set_startCheckBill': set_startCheckBill();
			break;
			//æ¥çå®¡æ¹è¿åº¦
			case 'get_CheckFlowInfo': get_CheckFlowInfo();
			break;
			//å¤çº§å®¡æ ¸
			case 'set_CheckBill_Flow': set_CheckBill_Flow(0);
			break;
			//å¤çº§åå®¡æ ¸
			case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
			break;
			//é©³å
			case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
			break;
			//å³éæé® ï¼1:å³éã2:åå³éï¼
			case 'btn-Close':
			@@ -410,6 +483,8 @@
			break;
			};
			});
			//è¡¨æ ¼ç¹å»äºä»¶


			//éæ°åæ¥æé®
			form.on('submit(btnResCnz)', function (data) {
			@@ -421,6 +496,53 @@
			set_ClearQuery();
			});

			table.on('tool(mainTable)' , function (obj) {
			var data = obj.data;
			if (obj.event == 'åæ®å·') {
			var linterid = data.hmainid.toString();
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: './Cg_POOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
			, resize: false,
			end: function () {
			get_FastQuery(table, option);
			}
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			} else if(obj.event == 'å½åå®¡æ ¸é¡¹ç®') {
			var linterid = data.hmainid.toString();
			layer.open({
			type: 2
			, area: ['70%', '70%']
			, title: 'åæ®å®¡æ¹è¿åº¦'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../ç³»ç»ç®¡ç/å¤çº§å®¡æ¹/å®¡æ¹è¿åº¦/Xt_CheckFlowProgressList.html?linterid=' + linterid + '&HSouceBillType=' + HBillType
			, resize: false,
			end: function () {
			////ä¿®æ¹ä¸ºååå·æ°çé¢
			//if (get_needClose_Bar == 0) {
			// $("#btnSearch").trigger('click');
			//} else if (get_needClose_Bar == 1) {
			// $("#get_needClose").trigger('click');
			//}
			}
			, cancel: function () {
			}
			})
			}
			});
			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			@@ -504,7 +626,7 @@
			$('#HEndDate').prop('disabled', false);
			}
			});

			//#endregion

			//#region æ¤é¡µé¢æææ¹æ³
			function set_ClearBill() {
			@@ -530,7 +652,7 @@
			//å è½½ä¸å¡å
			//get_HEmpName();
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			/DisPlay_HideColumn();/

			//ä»»æåæ®µè¿æ»¤ä¸ææ¡åå§å
			ColFilter();
			@@ -553,7 +675,7 @@
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150}
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150, }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 100, sort: true }
			, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
			, { field: 'è¡ç¶æ', title: 'è¡ç¶æ', width: 125, sort: true }
			@@ -660,6 +782,7 @@
			// m["width"] = colWidth[x];
			// });
			//}

			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			@@ -670,7 +793,7 @@
			data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = ["æ°é", "å³èæ°é", "æªå³èæ°é", "æå°æ¡ç æ°é", "æªæå°æ¡ç æ°é","å®æ¶æ°é","éé¢"];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -684,9 +807,21 @@
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) {
			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 });
			} else {
			} else if (data[i].name == 'åæ®å·') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			} else if (data[i].name == 'å½åå®¡æ ¸é¡¹ç®') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'å½åå®¡æ ¸é¡¹ç®', templet: function (d) {
			return '<span style="color: blue;">' + d.å½åå®¡æ ¸é¡¹ç® + '</span>'
			}, style: 'cursor: pointer;'
			});
			}else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			@@ -1167,6 +1302,153 @@
			}
			//#endregion

			//#region åèµ·å®¡æ¹
			function set_startCheckBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cg_POOrderBill/StartCheckFlow_POOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			if (get_needClose_Bar == 0) {
			$("#btnSearch").trigger('click');
			} else if (get_needClose_Bar == 1) {
			$("#get_needClose").trigger('click');
			}
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion

			//#region æ¥çå®¡æ¹è¿åº¦
			function get_CheckFlowInfo() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var hID = data[0].hmainid.toString();
			layer.open({
			type: 2
			, area: ['70%', '70%']
			, title: 'åæ®å®¡æ¹è¿åº¦'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../ç³»ç»ç®¡ç/å¤çº§å®¡æ¹/å®¡æ¹è¿åº¦/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
			, resize: false,
			end: function () {
			////ä¿®æ¹ä¸ºååå·æ°çé¢
			//if (get_needClose_Bar == 0) {
			// $("#btnSearch").trigger('click');
			//} else if (get_needClose_Bar == 1) {
			// $("#get_needClose").trigger('click');
			//}
			}
			, cancel: function () {

			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æ¥çï¼');
			}
			}
			//#endregion

			//#region å¤çº§ åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill_Flow(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cg_POOrderBill/AuditCg_POOrderBill_Flow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion

			//#region é©³å
			function set_RejectCheck_Flow(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cg_POOrderBill/RejectCheckFlow_POOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			});
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion

			//#region åå³é/å³éæ°æ®
			function set_CloseBill(num) {
			@@ -1355,7 +1637,7 @@
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			if (colName != "" && colName != null) {
			arr.push(200); //é»è®¤å®½åº¦200
			arr.push(300); //é»è®¤å®½åº¦200
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			@@ -1650,6 +1932,15 @@
			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) {
			@@ -1671,6 +1962,51 @@
			}
			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 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (number == 1) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			@@ -1753,6 +2089,15 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");

			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");

			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");

			$("select[name='HFeedback']").val("");
			form.render('select');
			sWhere = "";
			@@ -1829,7 +2174,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -1840,6 +2185,7 @@
			})
			}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			@@ -1851,59 +2197,72 @@

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HBillType", "HSupID", "ä¸å¡ç¶æ", "HUnitID", "ä¾åºåä»£ç ", "ä¸å¡åä»£ç ", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			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 - 1; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			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[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			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[4]) {
			//éèå
			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;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			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;
			}
			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);
			@@ -1975,6 +2334,12 @@
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			form.render('select');
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion

			@@ -2019,8 +2384,8 @@
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			////æ§è¡æ¥è¯¢æ¹æ³
			//get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);