MES-WEB-LayUI.git

			@@ -1,5 +1,6 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">

			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>ç©ææ¹æ¹</title>
			@@ -16,6 +17,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -32,119 +34,86 @@
			<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 ForFilteringSchemes" name="HNumber" id="HNumber">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
			id="HNumber">
			</div>
			</div>
			<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 ForFilteringSchemes" name="HName" id="HName">
			<input type="text" class="layui-input ForFilteringSchemes" name="HName"
			id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID"
			class="ForFilteringSchemes">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
			id="HFilterScheme_Now"></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" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
			<div id="filter-group">
			<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" lay-filter="ColName"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator"
			style="width:190px;" class="ForFilteringSchemes">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<=< <option value="<">
			<< <option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
			<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;">
			<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 class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent" id="ColContent">
			</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>
			<!-- TODO: å¨ææ·»å è¿æ»¤å¨ï¼é»è®¤è¿æ»¤å¨ä¸ªæ°: 1 -->
			<button type="button" class="layui-btn layui-btn-sm"
			style="margin: 8px 0 8px 380px;width: 190px;" id="btnAddFilter"
			lay-filter="btnAddFilter">
			<i class="layui-icon layui-icon-addition"></i>
			</button>
			</div>

			<div class="layui-row" style=" margin-top: 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" 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>
			<div class="table-wrapper"></div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div class="layui-col-md6">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>

			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>å¯¼å¥</button>
			@@ -166,6 +135,38 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			<script type="text/html" id="filterUnit">
			<div class="layui-row" style=" margin-top: 10px;">
			<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>
			<button id="btn-remove-filter" type="button" class="layui-btn layui-btn-xs layui-btn-danger layui-btn-radius">
			<i class="layui-icon layui-icon-subtraction"></i>
			</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			@@ -178,7 +179,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'laytpl'], function () {

			//#region å¬ç¨åé
			var $ = layui.$
			@@ -190,6 +191,7 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable
			, laytpl = layui.laytpl
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			@@ -197,7 +199,11 @@
			var HBillType = "Gy_Source";
			var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID","HParentID"];
			var titleData = ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID"];
			// æ£åè¡¨è¾¾å¼
			var colNameReg = new RegExp(/^ColName.*/)
			var comparatorReg = new RegExp(/^Comparator.*/)
			var colContentReg = new RegExp(/^ColContent.*/)
			//#endregion

			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -213,7 +219,7 @@

			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			//#region è¿å¥é¡µé¢å³å è½½
			var Htype = "";
			//è·åé¡µé¢è·³è½¬åæ°
			var params = get_UrlVars();
			@@ -226,17 +232,17 @@
			//åå§åçé¢
			set_ClearBill();

			//#endregion
			//#endregion


			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼å¥
			case 'set_SouceExcel': set_SouceExcel();
			break;
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			@@ -255,28 +261,28 @@
			break;
			//å é¤
			case 'set_DeleteBill': set_DeleteBill();
			break;
			break;
			//æµè§
			case 'get_PrintReport': get_PrintReport();
			break;
			break;
			//å®¡æ ¸æé®
			case 'btn-Audit':set_CheckBill(0);
			case 'btn-Audit': set_CheckBill(0);
			break;
			//åå®¡æ ¸æé®
			case 'btn-DeAudit':set_CheckBill(1);
			case 'btn-DeAudit': set_CheckBill(1);
			break;
			//ç¦ç¨æé®
			case 'btn-Stop':set_De_Stop(0);
			case 'btn-Stop': set_De_Stop(0);
			break;
			//åç¦ç¨æé®
			case 'btn-DeStop':set_De_Stop(1);
			case 'btn-DeStop': set_De_Stop(1);
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			break;
			//ä¿åæ¹æ¡
			case 'set_SaveScheme': set_SaveScheme();
			break;
			@@ -318,8 +324,25 @@
			//åå¨æ¡ä»¶
			get_WriteConfigFile();
			get_FastQuery(2);


			});
			//#endregion

			//#region è¿æ»¤å¨ç» åºå å é¤äºä»¶å¤ç
			$('#filter-group').on('click', function (e) {
			// å¹éç¦»äºä»¶è§¦åæè¿çbuttonåç´
			var $btn = $(e.target).closest('button')
			switch ($btn[0].id) {
			case 'btnAddFilter':
			console.log("æ·»å è¿æ»¤å¨");
			add_Filter();
			break;
			case 'btn-remove-filter':
			console.log("å é¤è¿æ»¤å¨");
			remove_filter($btn[0])
			; break;
			}
			})
			//#endregion

			//ä»£ç åè½¦æ¹æ³
			@@ -347,23 +370,23 @@
			btnrowDouble(obj);
			})

			//#endregion
			//#endregion



			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åç»ç»
			Organ();
			Organ();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_FastQuery(1);

			get_DefaultModule();//å è½½æ¹æ¡


			}
			//#endregion

			@@ -433,7 +456,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../çäº§åºç¡èµæ/Add_Edit_Gy_Source.html?OperationType=3&linterid='+linterid+'&HSouceBillType=' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼
			, content: '../çäº§åºç¡èµæ/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼
			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			@@ -444,7 +467,7 @@
			})
			}
			});
			//#endregion
			//#endregion
			//#region æ¥è¯¢
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			@@ -453,7 +476,7 @@
			url: GetWEBURL() + '/Gy_Source/list',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			@@ -531,7 +554,7 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}

			});
			});
			}
			//#endregion

			@@ -573,8 +596,43 @@
			localStorage.setItem("Gy_SouceList", JSON.stringify(data));
			}

			//#region åé¡µé¢ä¸æ·»å æ°çè¿æ»¤å¨
			function add_Filter() {
			var filterGroup = $('#filter-group');
			var filterUnit = $('#filterUnit').clone(true, true);
			var count = filterGroup.length;

			// ä¿®æ¹æ°æ·»å çè¿æ»¤å¨ä¸çidå¼ï¼é²æ¢ç¢°æ
			Array.from(filterUnit.find('select')).forEach(d => {
			if (colNameReg.test(d.id)) {
			d.id = d.id + '-' + count;
			d.name = d.name + '-' + count;
			} else if (comparatorReg.test(d.id)) {
			d.id = d.id + '-' + count;
			d.name = d.name + '-' + count;
			}
			})

			Array.from(filterUnit.find('input')).forEach(d => {
			if (colContentReg.test(d.id)) {
			d.id = d.id + '-' + count;
			d.name = d.name + '-' + count;
			}
			})

			filterUnit = filterUnit.html();
			$('#btnAddFilter').before(filterUnit);
			ColFilter()
			}
			//#endregion

			//#region ä»é¡µé¢ä¸ç§»é¤è¿æ»¤å¨
			function remove_filter(e) {
			var parent = $(e).closest('div')
			var temp = parent[0]
			temp.remove();
			}
			//#endregion
			//è¯»åéç½®æä»¶
			function get_ReadConfigFile() {
			//è·åæ¬å°åå¨çæ°æ®
			@@ -593,12 +651,12 @@
			}





			function btnrowDouble(obj) {
			var data = [];
			data.push(obj.data);
			//è¿åæ¹æ³
			//è¿åæ¹æ³
			parent.GetGySource(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			@@ -606,84 +664,57 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {


			var HNumber = $("#HNumber").val();
			var HName = $("#HName").val();
			var HOrgID = "";
			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;
			var filterGroup = $("#filter-group")

			var colNameList = []
			var comparatorList = []
			var colContentList = []

			Array.from(filterGroup.find('select'))
			.forEach(d => {
			if (colNameReg.test(d.id)) {
			colNameList.push(d.value)
			} else if (comparatorReg.test(d.id)) {
			comparatorList.push(d.value)
			}
			})

			Array.from(filterGroup.find('input'))
			.forEach(d => {
			if (colContentReg.test(d.id)) {
			colContentList.push(d.value)
			}
			})

			comparatorList.forEach((Comparator, index) => {
			if (colNameList[index] != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + colContentList[index] + "%'";
			break;
			case "8":
			com = "like'%" + colContentList[index] + "'";
			break;
			case "9":
			com = "like'" + colContentList[index] + "%'";
			break;
			case "10":
			com = "not like'%" + colContentList[index] + "%'";
			break;
			default:
			com = "" + Comparator + "'" + colContentList[index] + "'";
			break;
			}
			sWhere += " and " + colNameList[index] + " " + com;
			}
			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"];
			}
			@@ -705,7 +736,7 @@
			}
			if (HName) {
			sWhere += " and çäº§èµæºåç§° like '%" + HName + "%'";
			}
			}
			sWhere += addSWhereByOpenType();
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -713,26 +744,33 @@
			//#endregion

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			function set_ClearQuery() {

			$("#HNumber").val("");
			$("#HName").val("");
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			// $("#ColContent").val("");
			// $("#ColName").val("0");
			// $("#Comparator").val("0");

			var filterGroup = $('#filter-group')
			Array.from(filterGroup.find('select')).forEach(d => {
			if (colNameReg.test(d.id) \|\| comparatorReg.test(d.id)) {
			d.value = "0"
			}
			})
			Array.from(filterGroup.find('input')).forEach(d => {
			if (colContentReg.test(d.id)) {
			d.value = ""
			}
			})

			form.render('select');
			sWhere = "";
			$("#btnSearch").click();
			}
			//#endregion


			//#region æ°å¢
			function set_AddNew() {
			layer.open({
			@@ -897,7 +935,7 @@
			get_FastQuery(2);
			}
			//#endregion



			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill(num) {
			@@ -971,7 +1009,7 @@
			}
			//#endregion



			//#region å¤ææ¯ç´æ¥æå¼é¡µé¢è¿æ¯å¶å®é¡µé¢éè¿éæ©æé®æå¼ï¼å¹¶æ¾ç¤ºç¸åºæ°æ®
			function addSWhereByOpenType() {
			//è·ååæ°
			@@ -1006,12 +1044,16 @@
			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);
			// $("#ColName").empty();
			// $("#ColName").append(Organization);

			var filterGroup = $('#filter-group')
			Array.from(filterGroup.find('select')).forEach(d => {
			if (colNameReg.test(d.id)) {
			$(d).empty();
			$(d).append(Organization);
			}
			})
			form.render('select');
			}
			//#endregion
			@@ -1222,9 +1264,9 @@
			}
			})
			}

			//#endregion
			//ä»¥ä¸æ¯layuiæ¨¡å
			//ä»¥ä¸æ¯layuiæ¨¡å

			});
			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			function HFilterScheme(obj) //è¿åè¿æ»¤æ¹æ¡
			@@ -1264,10 +1306,9 @@
			});
			}
			//#endregion



			</script>

			</body>
			</html>

			</html>