MES-WEB-LayUI.git

			@@ -18,7 +18,7 @@
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>

			<script src="../../../layuiadmin/SetColumn.js"></script>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -61,6 +61,13 @@
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">é¡¹ç®ç¼å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			@@ -190,6 +197,7 @@
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div id="page"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			@@ -258,13 +266,17 @@
			, util = layui.util
			, soulTable = layui.soulTable
			//æ¥è¯¢æ¡ä»¶
			var Organization = sessionStorage["Organization"];
			var sWhere = "";
			var option = [];

			var HModName = "Xs_SeOrderBillList";
			var HBillType = "1401";


			var ins; //ç¨äºå¯¼åºexcel


			//è®°å½è¿æ»¤æ¡ä»¶ç¨äºæåºæ¶è·åæ°æ®
			var sWhere_Bak = "";
			var get_needClose_Bar = 0;
			@@ -303,7 +315,17 @@
			form.on('submit(btnSearch)', function (data) {
			//æ è®°å½åæ°æ®ä¸º æ¥è¯¢æ°æ®
			get_needClose_Bar = 0;
			optionPage.curr = 1;
			get_FastQuery(table, option);

			});
			//#endregion

			//#endregion è¾å¥æ¡åè½¦çå¬
			$('input[type="text"]').on('keydown', function (event) {
			if (event.keyCode == 13) {
			$("#btnSearch").click();
			}
			});
			//#endregion

			@@ -311,6 +333,10 @@
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();

			optionPage.curr = 1;
			get_FastQuery(table, option);

			});
			//#endregion

			@@ -450,45 +476,20 @@
			});
			//#endregion

			//#region çå¬æåºäºä»¶
			table.on('sort(mainTable)', function (obj) {
			// è·åæåºåæ®µåç±»å
			var field = obj.field;
			var type = obj.type;
			//è®°å½è¿æ»¤æ¡ä»¶
			var temp = sWhere_Bak;

			//ä¸ºè¿æ»¤æ¡ä»¶å¢å æåº
			sWhere_Bak += " order by " + field + " " + (type == "null" ? "" : type) + " ";

			//è·åæåºåçæ°æ®å¹¶éæ°æ¸²æ
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Xs_SeOrderBill/sortList',
			async: false,
			type: "GET",
			data: { "sWhere": sWhere_Bak, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {

			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			ColFilter();
			}
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			//#region æåºåéæ©
			table.on('sort(mainTable)', function (obj) { //æ³¨ï¼sort æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			table.reload('mainTable', {
			initSort: obj //è®°å½åå§æåºï¼å¦æä¸è®¾çè¯ï¼å°æ æ³æ è®°è¡¨å¤´çæåºç¶æã layui 2.1.1 æ°å¢åæ°
			, where: { //è¯·æ±åæ°ï¼æ³¨æï¼è¿éé¢çåæ°å¯ä»»æå®ä¹ï¼å¹¶éä¸é¢åºå®çæ ¼å¼ï¼
			field: obj.field //æåºåæ®µ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			, order: obj.type //æåºæ¹å¼ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			}
			});

			sWhere_Bak = temp;
			option.data = layui.table.cache["mainTable"];
			table.render(option);
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			});
			//#endregion

			@@ -597,7 +598,10 @@
			set_InitGrid();
			//æ¥è¯¢
			//get_FastQuery();
			get_Display(" and 1=0 ");
			//get_Display(" and 1=0 ");
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			get_DisplayPage(" and 1=0 ");

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			@@ -610,12 +614,12 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, height: 'full-80'
			, page: false
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			//, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			@@ -720,9 +724,38 @@
			//});
			}
			};

			optionPage = {
			elem: 'page', //æ³¨æï¼è¿éç page æ¯ IDï¼ä¸ç¨å # å·
			count: 10000, //æ°æ®æ»æ°ï¼ä»æå¡ç«¯å¾å°
			limit: 50,
			limits: [50, 500, 5000, 50000],
			layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			jump: function (obj, first) {
			//console.log(obj)
			//objåå«äºå½ååé¡µçææåæ°ï¼æ¯å¦ï¼
			//console.log(obj.curr); //å¾å°å½åé¡µï¼ä»¥ä¾¿åæå¡ç«¯è¯·æ±å¯¹åºé¡µçæ°æ®ã
			//console.log(obj.limit); //å¾å°æ¯é¡µæ¾ç¤ºçæ¡æ°

			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			console.log(obj)

			if (get_needClose_Bar == 0) {
			get_FastQuery();
			} else if (get_needClose_Bar == 1) {
			get_needClose();
			}

			}
			}
			}
			laypage.render(optionPage);
			}
			//#endregion
			//#endregion çå¬ç½æ ¼è¡¨ä½äºä»¶

			//#region çå¬ç½æ ¼è¡¨ä½äºä»¶
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;

			@@ -751,6 +784,7 @@
			}
			});
			//#endregion

			//#region è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			@@ -760,7 +794,7 @@
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count != 0) {
			if (data1.data.length == 0) {
			var data = [];//ååæ®µæ°æ®
			var col = [];
			@@ -902,11 +936,105 @@
			}
			//#endregion

			//#region æ¥è¯¢-åé¡µ
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Xs_SeOrderBill/list_ByPage',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
			success: function (data1) {
			option.limit = optionPage.limit;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code == 1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {//å¾ªåºéåæ°ç»
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//ä»æ¯ä¸ªå¯¹è±¡ä¸æåæ°æ®
			}
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			for (var i = 0; i < option.cols[0].length; i++) {
			colList.push(option.cols[0][i].field);
			}
			for (var i = 0; i < data.length; i++) {//éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1 \|\| (data[i].Type == "Decimal" \|\| data[i].Type == "int")) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·'
			, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			} else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			option.cols = [col];
			option.data = data1.data;
			//è®¾ç½®æ°æ®
			var result = data1.data;
			var temp = "";
			for (var i = 0; i < result.length; i++) {
			if (temp != result[i]["hmainid"]) {
			temp = result[i]["hmainid"];
			} else {
			var initIndex = $.inArray("hmainid", colList);
			var lastIndex = $.inArray("hsubid", colList);
			for (var j = initIndex + 1; j < lastIndex; j++) {
			var fieldName = colList[j];
			result[i][fieldName] = "";
			}
			}
			}


			option.data = result;
			ins = table.render(option);
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HProjectNumber = $("#HProjectNumber").val(); //é¡¹ç®ç¼å·
			var HCusID = $("#HCusID").val();
			var HMaterNumber = $("#HMaterNumber").val();
			var HMaterName = $("#HMaterName").val();
			@@ -927,19 +1055,19 @@
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			com = "like ''%" + ColContent + "%''";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			com = "like ''%" + ColContent + "''";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			com = "like ''" + ColContent + "%''";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			com = "not like ''%" + ColContent + "%''";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			com = "" + Comparator + "''" + ColContent + "''";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			@@ -949,19 +1077,19 @@
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			com1 = "like ''%" + ColContent1 + "%''";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			com1 = "like ''%" + ColContent1 + "''";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			com1 = "like ''" + ColContent1 + "%''";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			com1 = "not like ''%" + ColContent1 + "%''";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			com1 = "" + Comparator1 + "''" + ColContent1 + "''";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			@@ -971,41 +1099,44 @@
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			com2 = "like ''%" + ColContent2 + "%''";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			com2 = "like ''%" + ColContent2 + "''";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			com2 = "like ''" + ColContent2 + "%''";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			com2 = "not like ''%" + ColContent2 + "%''";
			break;
			default:
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			com2 = "" + Comparator2 + "''" + ColContent2 + "''";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= ''" + HDate + "''";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= ''" + HDate1 + "''";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			sWhere += " and åæ®å· like ''%" + HBillNo + "%''";
			}
			if (HProjectNumber) {
			sWhere += " and é¡¹ç®ç¼ç like ''%" + HProjectNumber + "%''";
			}
			if (HCusID) {
			sWhere += " and å®¢æ· like '%" + HCusID + "%'";
			sWhere += " and å®¢æ· like ''%" + HCusID + "%''";
			}
			if (HMaterNumber) {
			sWhere += " and ç©æä»£ç like '%" + HMaterNumber + "%'";
			sWhere += " and ç©æä»£ç like ''%" + HMaterNumber + "%''";
			}
			if (HMaterName) {
			sWhere += " and ç©æåç§° like '%" + HMaterName + "%'";
			sWhere += " and ç©æåç§° like ''%" + HMaterName + "%''";
			}
			if (GetDataCols != "") {
			sWhere += GetDataCols;
			@@ -1018,7 +1149,12 @@

			sWhere_Bak = sWhere;

			get_Display(sWhere);
			//æ®éæ¥è¯¢
			//get_Display(sWhere);

			//åé¡µæ¥è¯¢
			get_DisplayPage(sWhere);

			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			GetDataCols = "";
			}
			@@ -1030,6 +1166,7 @@
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HBillNo").val("");//
			$("#HProjectNumber").val("");
			$("#HCusID").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			@@ -1586,27 +1723,83 @@
			function get_needClose() {
			//è®°å½è¿æ»¤æ¡ä»¶
			var temp = sWhere_Bak;

			if (get_needClose_Bar == 0) {
			//è®¾ç½®é¡µæ°ä¸º1
			optionPage.curr = 1;
			}

			//æ è®°å½åæ°æ®ä¸º å¾å³éé¡¹
			get_needClose_Bar = 1;

			//ä¸ºè¿æ»¤æ¡ä»¶å¢å æåº
			sWhere_Bak += " and å©ä½è®¢é>0 and å©ä½è®¢é<=1000 and å³éäºº='' and è¡å³éäºº='' and ç¶æ = 'å·²å®¡æ ¸' and HCusID <> 166351 order by åæ®å· desc";
			//sWhere_Bak += " and å©ä½è®¢é>0 and å©ä½è®¢é<=1000 and å³éäºº='' and è¡å³éäºº='' and ç¶æ = 'å·²å®¡æ ¸' and HCusID <> 166351 order by åæ®å· desc";

			//è·åæåºåçæ°æ®å¹¶éæ°æ¸²æ
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Xs_SeOrderBill/sortList',
			url: GetWEBURL() + '/Xs_SeOrderBill/sortList__ByPage',
			async: false,
			type: "GET",
			data: { "sWhere": sWhere_Bak, "user": sessionStorage["HUserName"] },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
			success: function (data1) {
			if (data1.count == 1) {

			option.limit = optionPage.limit;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.count != 0) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {//å¾ªåºéåæ°ç»
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//ä»æ¯ä¸ªå¯¹è±¡ä¸æåæ°æ®
			}
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			for (var i = 0; i < option.cols[0].length; i++) {
			colList.push(option.cols[0][i].field);
			}
			for (var i = 0; i < data.length; i++) {//éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1 \|\| (data[i].Type == "Decimal" \|\| data[i].Type == "int")) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·'
			, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			} else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 800
			//, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}
			//è®¾ç½®æ°æ®
			var result = data1.data;
			@@ -1626,15 +1819,21 @@


			option.data = result;
			table.render(option);
			layer.close(ajaxLoad);
			ins = table.render(option);
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			option.data = [];
			table.render(option);
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			/layer.alert(data1.code + data1.Message, { icon: 5 });/
			}
			}, error: function () {
			layer.close(ajaxLoad);
			@@ -2060,8 +2259,10 @@
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery()
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			@@ -2084,6 +2285,10 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if (i >= dataCol.length)
			{
			continue;
			}
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			@@ -2140,6 +2345,15 @@
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			//è®¾ç½®åæåº
			for (var i = 1; i < option.cols[0].length; i++) {
			if (data1.data[0].HSortFlag == "æ¯") {
			option.cols[0][i]["sort"] = true;
			}
			else {
			option.cols[0][i]["sort"] = false;
			}
			}
			table.render(option);

			//å·æ°æé®æ¾ç¤º
			@@ -2184,6 +2398,7 @@
			$.ajax({
			url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
			type: "GET",
			async:false,
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -2492,8 +2707,8 @@

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©", "è¿åå¹´", "è¿ä¸å¹´"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {
			@@ -2528,6 +2743,7 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			res = res.replace(/'/g, "''");
			return res;
			}
			//#endregion
			@@ -2577,7 +2793,7 @@
			var addSWhere = "";

			if (openType == 2) {
			addSWhere = " and ç¶æ = 'å·²å®¡æ ¸' and è¡ç¶æ = '' and HOrgID = " + HOrgID;
			addSWhere = " and ç¶æ = ''å·²å®¡æ ¸'' and è¡ç¶æ = '''' and HOrgID = " + HOrgID;
			}
			return addSWhere;
			}