MES-WEB-LayUI.git

			@@ -14,6 +14,11 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/layui/layui1.js"></script>
			<script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
			<script src="../../../layuiadmin/HideButton_New.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<style>
			/æ ç¶å¾ç¹å»é«äº®åè²/
			.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
			@@ -37,51 +42,65 @@
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" 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">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<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="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<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>

			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<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>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç»åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HOrgName" id="HOrgName">
			</div>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" class=" ForFilteringSchemes" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			<input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
			</div>
			</div>
			<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;">
			<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;">
			<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>
			@@ -96,43 +115,132 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<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="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
			</div>
			</div>
			<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="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row" style="padding:10px 0">
			<!--æ¾å¨formæ ç¾å½ä¸ä¼å½±åè½®æå¾ç®å¤´çä½¿ç¨ï¼æä»¥ç§»å°formæ ç¾å¤é¢-->
			<!--<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box"></div>
			<div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(50vh);"></div>
			<div style="width:99.5%;height:calc(35vh);position: relative;">-->
			<!--//è½®æå¾-->
			<!--<div class="layui-carousel" id="test1" style="position:absolute;">-->
			<!--éæåº¦ opacity: 0.2-->
			<!--<div carousel-item id="file">

			</div>
			</div>
			</div>
			</div>
			<div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
			<div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			</div>
			</div>
			</div>-->
			<!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<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="btn-getCheckData"><i class="layuiiconlayuiicontips"></i>é¢è§</button>-->
			<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>
			<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>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-copy" id="btn-copy"><i class="layuiiconlayuiiconform"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-copy" id="btn-copy"><i class="layuiiconlayuiiconform"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layu i-iconlayuiiconfileb"></i>æµæ°´å·æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>é«çº§è¿æ»¤</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><iclass="layuiiconlayuiicon-circle"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
			<div style="width:99.5%;height:calc(35vh);position: relative;">
			<!--//è½®æå¾-->
			<div class="layui-carousel" id="test1" style="position:absolute;">
			<!--éæåº¦ opacity: 0.2-->
			<div carousel-item id="file">

			</div>
			</div>
			</div>
			</div>
			<div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
			<div >
			<table class="" id="mainTable" lay-filter="mainTable" ></table>
			</div>
			<div id="page" style="position:relative;bottom:0;"></div>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -144,7 +252,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree', 'carousel'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			@@ -155,15 +263,49 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, tree = layui.tree
			var sWhere = "";
			, carousel = layui.carousel
			var sWhere = " and 1=0";
			var sql = "";
			var option = [];
			var Organization = sessionStorage["Organization"];
			var set_HideButton_ID = "toolbarDemo_ButtonSet"; //éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			var HBillType = "Gy_Material";
			var HModName = "Gy_Material";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID","HUnitID","HParentID", "HUSEORGID","HMinPickQty","HEndFlag","HStopFlag"];
			var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag","éæ©","sorderid"];

			var ins; //ç¨äºå¯¼åºexcel
			var HMaterTypeID = 0; //ç©æåç±»èç¹id
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			//è·ååæ°
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			//#endregion

			//#region ãè¿æ»¤æ¹æ¡ã

			//è¿æ»¤æ¡ä»¶çclassç±»
			var HClassTag = "ForFilteringSchemes";
			//æ¨¡ååç§°ï¼ä¸æçï¼ æ¯ä¸ªæ¨¡åé¡µé¢é½éè¦ä¿®æ¹
			window.HModuleName = "ç©æåè¡¨ç»´æ¤";
			//æ¯å¦å·²ç»éæ©äºè¿æ»¤æ¹æ¡ï¼å¨å±åéï¼
			window.HDefaultFilter = "";
			//éæ©çè¿æ»¤æ¹æ¡åç ï¼å¨å±åéï¼
			window.HInterID_Choose = 0;

			//#endregion
			//#region è¿å¥é¡µé¢å³å è½½
			// è½®æå¾
			var Carousel = carousel.render({
			elem: '#test1'
			, width: '100%' //è®¾ç½®å®¹å¨å®½åº¦
			, height: '100%' //è®¾ç½®å®¹å¨é«åº¦
			, arrow: 'always' //å§ç»æ¾ç¤ºç®å¤´
			, indicator: 'inside' //æç¤ºå¨ä¸æ¾ç¤º
			, autoplay: false //æå¨ææ¾
			, interval: 3000 //ææ¾éåº¦
			});

			//åå§åçé¢
			set_ClearBill();
			@@ -180,8 +322,17 @@
			case 'btn-Add':
			set_AddNew();
			break;
			//æ°å¢æµæ°´å·æé®
			case 'btn-NumAdd': set_NumAddNew();
			break;
			//å¯¼å¥
			case 'set_SouceExcel': set_SouceExcel();
			break;
			case 'btn-NumAdd':
			set_NumAddNew();
			break;
			case 'btn-Edit':
			set_ShowBill();
			set_ShowBill();
			break;
			case 'btn-copy':
			set_copy();
			@@ -205,6 +356,10 @@
			case 'btn-DeStop':
			set_De_Stop(1);
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			@@ -216,13 +371,23 @@
			case 'btn-Close':
			parent.layui.admin.events.closeThisTabs();
			break;
			//ä¿åæ¹æ¡
			case 'set_SaveScheme': set_SaveScheme();
			break;
			//è¯»åæ¹æ¡
			case 'set_ReadScheme': set_ReadScheme();
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
			break;
			//é«çº§è¿æ»¤
			case 'set_QueryCondition':
			set_QueryCondition();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			@@ -231,15 +396,39 @@
			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery();
			}

			//$("#btnSearch").click();
			});
			//#endregion

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery();
			}
			});
			//#endregion

			//ä»£ç åè½¦æ¹æ³
			$('#HNumber').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});

			//åç§°åè½¦æ¹æ³
			$('#HName').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});

			//#region éæ°åæ¥æé®
			form.on('submit(btnResCnz)', function (data) {
			@@ -251,6 +440,15 @@
			table.on('rowDouble(mainTable)', function (obj) {
			btnrowDouble(obj);
			})

			function btnrowDouble(obj) {
			var index = parent.layer.getFrameIndex(window.name);
			var data = obj.data;
			//è¿åæ¹æ³
			parent.GetGyMaterial(data);
			parent.layer.close(index);
			}



			table.on('sort(mainTable)', function (obj) { //æ³¨ï¼sort æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			@@ -264,6 +462,28 @@
			option.data = layui.table.cache["mainTable"];
			table.render(option);
			});

			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event == 'ç©æä»£ç ') {
			var hID = data.HItemID.toString();
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾ç©æè®¾ç½®'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Material.html?hID=' + hID + "&OperationType=3"
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			});


			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			@@ -283,12 +503,20 @@
			l.LAY_CHECKED = flag;
			}
			});

			getFileList_loaded(obj.data.ç©æä»£ç );
			})
			//#endregion




			//#region åå»è¿åæ°æ®
			//table.on('rowDouble(mainTable)', function (obj) {
			// var data = [];
			// data.push(obj.data);
			// parent.GetMaterValue(data);
			// var index = parent.layer.getFrameIndex(window.name);
			// parent.layer.close(index);
			// });
			//#endregion

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

			@@ -296,24 +524,19 @@
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			//æ ¹æ®é¡µé¢çæå¼æ¹å¼ï¼å¤æè¿æ»¤æ¡ä»¶sWhereæ¯å¦éè¦è¿è¡é¢å¤çæ·»å
			//è·ååæ°
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			OrganName();

			addSWhereByOpenType();
			//æ ç¶å¾æ¥è¯¢
			get_Display_Tree();

			//if (openType == 2) {
			// addSWhereByOpenType();
			// //get_Display(sWhere);
			// get_Display_Tree();
			//} else {
			// addSWhereByOpenType();
			// get_Display(sWhere);
			// get_Display_Tree();
			//}
			//ç©æå¾çä½ç½®é»è®¤ä¸ºç©º
			var html2 = '<h1 style="text-align:center;line-height:290px;color:red;font-weight:bolder;"></h1>';
			$("#file").append(html2);
			Carousel.reload({ autoplay: false })
			//è·åé¡¹ç®å·
			Get_HProject();
			get_FastQuery()
			//è¿æ»¤æ¹æ¡
			get_DefaultModule()
			}
			//#endregion

			@@ -322,28 +545,9 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 500
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			//, cols: [[
			// { type: 'checkbox', fixed: 'left' }
			// , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
			// , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			// , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			// , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			// , { field: 'HUnitID', title: 'HUnitID', hide: true }
			// , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
			// , { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°' }
			// , { field: 'HMinPickQty', title: 'HMinPickQty', hide: true }
			// , { field: 'æç»æ è®°', title: 'æç»æ è®°' }
			// , { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
			// , { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°' }
			// , { field: 'HEndFlag', title: 'HEndFlag', hide: true }
			// , { field: 'HStopFlag', title: 'HStopFlag', hide: true }
			// , { field: 'HParentID', title: 'HParentID', hide: true }
			// , { field: 'HUSEORGID', title: 'HUSEORGID', hide: true }
			//]]
			, height: 'full-150'
			, page: false
			, limit: 50
			, done: function (res, curr, count) {
			var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
			var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
			@@ -361,19 +565,72 @@
			}
			}
			};
			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
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();
			}
			}
			}
			laypage.render(optionPage);
			}
			//#endregion


			//#region è·åç»ç»
			function OrganName() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			var Organization = "";
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HOrgID").append(Organization);
			$("#HOrgID").val(sessionStorage["OrganizationID"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HNumber").val("");
			$("#HName").val("");
			$("#HProject").val("");
			$("#HModel").val("");
			$("#HOrgName").val("");
			$("#HOrgID").val("0");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			form.render('select');
			sWhere = "";
			}
			@@ -381,14 +638,14 @@
			//#region æ¥è¯¢
			function get_Display(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			var ajaxLoad = layer.load();
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Gy_Material/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count != 0) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -414,27 +671,18 @@
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-80'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			table.render(option);
			option.cols = [col];
			option.data = data1.data;
			ins = table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			@@ -448,25 +696,100 @@
			}
			//#endregion

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			//var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_Material/page',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code==1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			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' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			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':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
			}
			}
			}

			function btnrowDouble(obj) {
			var index = parent.layer.getFrameIndex(window.name);
			var data = obj.data;
			//è¿åæ¹æ³
			parent.GetGyMaterial(data);
			parent.layer.close(index);

			option.cols = [col];
			option.data = data1.data;
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);

			ins = table.render(option);
			laypage.render(optionPage);


			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			//option.data = [[]]
			//table.render(option);
			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() {
			sWhere = "";
			function get_FastQuery(number) {
			//sWhere = "";
			var HNumber = $("#HNumber").val();
			var HName = $("#HName").val();
			var HProject = $("#HProject").val();
			var HModel = $("#HModel").val();
			var HOrgName = $("#HOrgName").val();
			var HOrgID = $("#HOrgID").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) {
			@@ -488,6 +811,49 @@
			}
			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 (HNumber) {
			sWhere += " and ç©æä»£ç like '%" + HNumber + "%'";
			}
			@@ -497,13 +863,21 @@
			if (HModel) {
			sWhere += " and è§æ ¼åå· like '%" + HModel + "%'";
			}
			if (HOrgName) {
			sWhere += " and ç»ç»åç§° like '%" + HOrgName + "%'";
			if (HOrgID) {
			sWhere += " and HUSEORGID = '" + HOrgID + "'";
			}
			if (HProject) {
			sWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}

			if (GetDataCols != "") {
			sWhere += GetDataCols;
			}
			get_Display(sWhere);
			if (sql != "") {
			sWhere += sql;
			}
			addSWhereByOpenType();
			get_DisplayPage(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			GetDataCols = "";
			}
			@@ -537,6 +911,37 @@
			});
			}

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Gy_Material_ExportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins.config.id, option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion
			//å¯¼å¥
			function set_SouceExcel() {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å·¥åºèµæå¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: './Gy_Material_Excel.html?OperationType=dao&HSouceBillType='
			})
			}
			//#region å é¤
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -675,6 +1080,34 @@
			}
			//#endregion

			//#region æµæ°´å·æ°å¢
			function set_NumAddNew() {
			if (HMaterTypeID == 0 \|\| HMaterTypeID == null) {
			layer.msg('è¯·éæ©å·ä½ç©æåç±»ï¼');
			}
			else {
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ°å¢ç©æ',
			closeBtn: 1,
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Material.html?hID=0&OperationType=4&HMaterTypeID=' + HMaterTypeID,
			end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery(table, option);
			},
			success: function (layero, index) {

			}
			});
			}

			}
			//#endregion

			//#region ç¼è¾åæ®
			function set_ShowBill() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -752,13 +1185,39 @@
			}
			//#endregion

			//#region è·åé¡¹ç®å·
			function Get_HProject() {
			//è·åé¡¹ç®å·
			var HProjectList = '<option value="" style="color:red;" selected></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_HProject",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			}
			$("#HProject").append(HProjectList);
			form.render('select');

			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion


			// æ ç¶å¾æ¥è¯¢
			function get_Display_Tree() {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeList',
			url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeListByLevel',
			type: "GET",
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(ajaxLoad);
			@@ -799,21 +1258,24 @@
			tree.render({
			elem: '#TreeTable' //é»è®¤æ¯ç¹å»èç¹å¯è¿è¡æ¶ç¼©
			, data: treeTable
			, onlyIconControl: true
			, click: function (obj) {
			//é«äº®åè²
			$(".layui-tree-set").removeClass('layui-tree-set-active');
			obj.elem.addClass('layui-tree-set-active');

			var data = obj.data; //è·åå½åç¹å»çèç¹æ°æ®
			var sql = "";
			if (data.id == "100") {
			sql = " and HMaterTypeID=0 ";
			HMaterTypeID = 0;
			} else if (data.id == "0") {
			sql = "";
			HMaterTypeID = 0;
			} else {
			sql = " and HMaterTypeID='" + data.id + "' ";
			HMaterTypeID = data.id;
			}
			get_Display(sql);
			get_FastQuery()
			}
			});
			}
			@@ -837,41 +1299,59 @@
			return subStr;
			}

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			//#region ç¹å»ç©ææ¶,è·åå·²ä¸ä¼ çæä»¶åè¡¨
			function getFileList_loaded(HMaterNumber) {
			$("#file").html("");
			$(".layui-carousel-ind").html("");

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
			var HBillNo = HMaterNumber;
			if (HBillNo != null && HBillNo != undefined) {
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
			async: false,
			type: "GET",
			data: { "HBillNo": HBillNo },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.data[0]) {
			HInterID = data1.data[0].HInterID
			}
			option.data = data1.data;
			//table.render(option);

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			for (let i = 0; i < data1.data.length; i++) {
			var html = '';
			if (data1.data[i].HFileType == '.jpeg' \|\| data1.data[i].HFileType == '.jpg') {
			html += '<div><img onclick=\"previewImg(this)\" src=../../..' + data1.data[i].HFilePath + ' alt="" style="width:100%;height:100%"></div>'
			$("#file").append(html);
			}
			if (data1.data[i].HFileType == '.pdf') {
			html += '<div><embed src="../../..' + data1.data[i].HFilePath + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
			$("#file").append(html);
			}
			}

			if (data1.data.length == 0) {
			var html2 = '<h1 style="text-align:center;line-height:290px;color:red;font-weight:bolder;">ææªä¸ä¼ æä»¶</h1>';
			$("#file").append(html2);
			}
			Carousel.reload({ autoplay: false })
			layer.close(wait);
			} else {
			layer.close(wait);
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			}
			//#endregion
			//#endregion



			//é«çº§è¿æ»¤
			function set_QueryCondition() {
			@@ -899,7 +1379,7 @@
			, title: "é«çº§è¿æ»¤" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "80%"] //çªä½å¤§å°
			, area: ["50%", "70%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			@@ -929,101 +1409,21 @@
			})
			}

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			/* var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±*/

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol[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;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//#region åææ¾ç¤ºä¸ææ¡
			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>';
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion
			@@ -1050,7 +1450,7 @@
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			//Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			if (data[i].ID == HOrgID) {
			Organization = data[i].Name;
			break;
			@@ -1067,12 +1467,224 @@
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var HOrgID = params[params[1]];
			if (openType == 2) {
			sWhere += " and ç¦ç¨æ è®° = '' ";
			var openType2 = params[params[2]];//ä¹ä¸ä½¿ç¨èªå¶å¤è´è¿æ»¤
			if (typeof (openType) != "undefined") {
			sWhere += " and ç¦ç¨æ è®° = ''";
			if (openType2 == "POOrder") {
			sWhere += " and ç©æå±æ§='å¤è´' "
			} else if (openType2 == "SeOrder") {
			sWhere += " and ç©æå±æ§='èªå¶' "
			}
			Organ(HOrgID);
			}
			}
			//#endregion
			//#region ãè¿æ»¤æ¹æ¡ã

			//è·åå½åç¨æ·çé»è®¤è¿æ»¤æ¹æ¡
			function get_DefaultModule() {
			$.ajax({
			url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
			type: "GET",
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
			success: function (data1) {
			if (data1.count == 1) {
			//å½åç¨æ·è®¾ç½®æé»è®¤çè¿æ»¤æ¹æ¡
			var data = data1.data;
			//å½åéæ©çè¿æ»¤æ¹æ¡
			HInterID_Choose = data[0].hmainid;
			//è¿æ»¤æ¹æ¡åç
			HInterID = data[0].hmainid
			//è¿æ»¤æ¹æ¡åç§°
			HDefaultFilter = data[0].æ¹æ¡åç§°
			//è¿æ»¤æ¹æ¡çå¤æ³¨ï¼æ¹æ¡ä¿¡æ¯æè¿°ï¼
			var HRemark = data[0].å¤æ³¨
			//æ¾ç¤ºåºå½åçé»è®¤è¿æ»¤æ¹æ¡
			document.getElementById("HFilterScheme_Now").style.display = "block";
			document.getElementById('HFilterScheme_Now').innerHTML = "å½åè¿æ»¤æ¹æ¡ï¼" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
			//æè¿æ»¤æ¡ä»¶å¼ååå°é¡µé¢ä¸
			for (let i = 0; i < data.length; i++) {
			$("#" + data[i].è¿æ»¤åæ®µID).val(data[i].è¿æ»¤å¼);
			if (data[i].è¿æ»¤æ ç¾ç±»å == 'SELECT') {
			$("#" + data[i].è¿æ»¤åæ®µID).find("option[value='" + data[i].è¿æ»¤å¼ + "']").attr("selected", true);
			}
			}
			get_FastQuery();
			form.render("select");
			} else {
			//å½åç¨æ·æ²¡æè®¾ç½®é»è®¤çè¿æ»¤æ¹æ¡
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			//æ¥è¯¢
			get_FastQuery();
			form.render("select");
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//ä¿åæ¹æ¡
			function set_SaveScheme() {
			var index = layer.open()
			//å¤æç¨æ·æ¯å¦ç¹å»äºå³ä¸è§çâåå·âå³éå¼¹çªé¡µé¢
			var HIsClose_Manual = false;
			//è·åæ¬é¡µææè¿æ»¤æ¡ä»¶å¯¹è±¡(classä¸åå«"ForFilteringSchemes"çåç´ )
			var Filter = document.getElementsByClassName(HClassTag);

			var HFilterIdList = "";//è¿æ»¤æ¡ä»¶
			var HFilterIdLists = "";//æ¼æ¥å¤ä¸ªè¿æ»¤æ¡ä»¶
			var HValue = "";//è¿æ»¤å¼
			var HElement_type = "";//è¿æ»¤æ ç¾ç±»å

			for (var i = 0; i < Filter.length; i++) {
			HFilterIdList = Filter[i].id; //è¿æ»¤æ¡ä»¶ID
			HFilterIdLists += Filter[i].id + ","; //è¿æ»¤æ¡ä»¶ID(æ¼æ¥)
			HValue += $("#" + HFilterIdList).val() + ","; //è¿æ»¤æ¡ä»¶ä¸è¾å¥çå¼
			HElement_type += document.getElementById(HFilterIdList).tagName + ",";//éè¿æ ç¾idè·åæ ç¾ç±»å
			}

			//å»é¤æ«å°¾éå·
			HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
			HValue = HValue.substring(0, HValue.length - 1);
			HElement_type = HElement_type.substring(0, HElement_type.length - 1);

			//å½åé¡µé¢ä¸æ²¡æéæ©è¿æ»¤æ¹æ¡ï¼è¿å¥æ°å¢æ¹æ³
			if (HDefaultFilter == "") {
			layer.open({
			type: 2
			, area: ['40%', '80%']
			, title: 'è¿æ»¤æ¹æ¡'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../ç³»ç»ç®¡ç/è¿æ»¤æ¹æ¡è®¾ç½®/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
			, cancel: function () {
			// å³ä¸è§å³éäºä»¶çé»è¾
			HIsClose_Manual = true;
			}
			, end: function () {
			if (HIsClose_Manual != true) {
			get_FastQuery();
			//æ¾ç¤ºå½åçè¿æ»¤æ¹æ¡
			document.getElementById("HFilterScheme_Now").style.display = "block";
			document.getElementById('HFilterScheme_Now').innerHTML = "å½åè¿æ»¤æ¹æ¡ï¼" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
			}
			}
			})
			layer.close(index)
			} else {
			//å½åé¡µé¢å·²æè¿æ»¤æ¹æ¡ï¼ç¨æ·éæ© æ°å¢æèç¼è¾
			layer.confirm('å½åå·²éæ©è¿æ»¤æ¹æ¡ï¼æ¯å¦ä¿®æ¹ï¼è¯·éæ©å¯¹åºæä½', {
			title: "æä½æç¤º",
			icon: 0,
			btn: ['æ°å¢æ¹æ¡', 'ä¿åä¿®æ¹å½åæ¹æ¡', 'åæ¶']
			}, function (index, layero) {
			//æ°å¢
			layer.open({
			type: 2
			, area: ['40%', '80%']
			, title: 'è¿æ»¤æ¹æ¡'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../ç³»ç»ç®¡ç/è¿æ»¤æ¹æ¡è®¾ç½®/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
			, end: function () {
			get_FastQuery()
			//æ¾ç¤ºå½åçè¿æ»¤æ¹æ¡
			document.getElementById("HFilterScheme_Now").style.display = "block";
			document.getElementById('HFilterScheme_Now').innerHTML = "å½åè¿æ»¤æ¹æ¡ï¼" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
			}
			})
			layer.close(index)
			}, function (index) {
			//ç¼è¾
			var Filter_Edit = document.getElementsByClassName(HClassTag); //è·åæ¬é¡µææè¿æ»¤æ¡ä»¶å¯¹è±¡(classä¸åå«"ForFilteringSchemes"çåç´ )
			HFilterIdList = "";
			HFilterIdLists = "";
			HValue = "";
			HElement_type = "";
			for (var i = 0; i < Filter_Edit.length; i++) {
			HFilterIdList = Filter_Edit[i].id; //è¿æ»¤æ¡ä»¶ID
			HFilterIdLists += Filter_Edit[i].id + ","; //è¿æ»¤æ¡ä»¶ID(æ¼æ¥)
			HValue += $("#" + HFilterIdList).val() + ","; //è¿æ»¤æ¡ä»¶ä¸è¾å¥çå¼
			HElement_type += document.getElementById(HFilterIdList).tagName + ",";//éè¿æ ç¾idè·åæ ç¾ç±»å
			}
			//å»é¤æ«å°¾éå·
			HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
			HValue = HValue.substring(0, HValue.length - 1);
			HElement_type = HElement_type.substring(0, HElement_type.length - 1);

			var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;

			//ä¿®æ¹
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Xt_FastICScheme/save", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
			}
			else {

			}
			layer.closeAll("loading");
			},
			error: function (err) {


			}
			});
			layer.close(index)
			}, function (index) {
			//åæ¶
			layer.alert('åæ¶')
			layer.close(index)
			});
			}

			}

			//è¯»åæ¹æ¡
			function set_ReadScheme() {
			var HIsClose_Manual = false;
			var Filter = document.getElementsByClassName(HClassTag); //è·åæ¬é¡µææè¿æ»¤æ¡ä»¶å¯¹è±¡(classä¸åå«"ForFilteringSchemes"çåç´ )

			var HFilterIdList = "";
			var HFilterIdLists = "";
			var HValue = "";
			var HElement_type = "";
			for (var i = 0; i < Filter.length; i++) {
			HFilterIdList = Filter[i].id; //è¿æ»¤æ¡ä»¶ID
			HFilterIdLists += Filter[i].id + ","; //è¿æ»¤æ¡ä»¶ID(æ¼æ¥)
			HValue += $("#" + HFilterIdList).val() + ","; //è¿æ»¤æ¡ä»¶ä¸è¾å¥çå¼
			HElement_type += document.getElementById(HFilterIdList).tagName + ",";//éè¿æ ç¾idè·åæ ç¾ç±»å
			}
			//å»é¤æ«å°¾éå·
			HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
			HValue = HValue.substring(0, HValue.length - 1);
			HElement_type = HElement_type.substring(0, HElement_type.length - 1);

			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'è¿æ»¤æ¹æ¡åè¡¨'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../ç³»ç»ç®¡ç/è¿æ»¤æ¹æ¡è®¾ç½®/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
			, cancel: function () {
			// å³ä¸è§å³éäºä»¶çé»è¾
			HIsClose_Manual = true;
			}
			, end: function () {
			if (HIsClose_Manual != true) {
			get_FastQuery()
			form.render("select");
			}
			}
			})
			}

			//#endregion
			});
			//#endregion
			@@ -1080,6 +1692,66 @@
			function GetDataCol(data) {
			GetDataCols = data;
			}

			function previewImg(obj) {
			var img = new Image();
			img.src = obj.src;
			var height = img.height + 500; //è·åå¾çé«åº¦
			var width = img.width + 500; //è·åå¾çå®½åº¦
			var imgHtml = "<img src='" + obj.src + "' width='100%' height='100%'/>";
			//å¼¹åºå±
			layer.open({
			type: 1,
			shade: 0.8,
			offset: 'auto',
			area: ['100%', '100%'],
			shadeClose: true,
			scrollbar: false,
			title: "å¾çé¢è§", //ä¸æ¾ç¤ºæ é¢
			content: imgHtml, //æè·çåç´ ï¼æ³¨æï¼æå¥½è¯¥æå®çåç´ è¦åæ¾å¨bodyæå¤å±ï¼å¦åå¯è½è¢«å¶å®çç¸å¯¹åç´ æå½±å
			cancel: function () {
			//layer.msg('æè·å°±æ¯ä»é¡µé¢å·²ç»åå¨çåç´ ä¸ï¼åè£¹layerçç»æ', { time: 5000, icon: 6 });
			}
			});
			}
			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			function HFilterScheme(obj) //è¿åè¿æ»¤æ¹æ¡
			{
			var HInterID = obj[0].hmainid;
			HInterID_Choose = obj[0].hmainid;
			$.ajax({
			url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
			type: "GET",
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
			success: function (data1) {
			if (data1.count == 1) {
			var data = data1.data;
			//èµå¼è¿æ»¤æ¹æ¡åç§°
			HDefaultFilter = data[0].æ¹æ¡åç§°
			var HRemark = data[0].å¤æ³¨
			//æ¾ç¤ºå½åçè¿æ»¤æ¹æ¡
			document.getElementById("HFilterScheme_Now").style.display = "block";
			document.getElementById('HFilterScheme_Now').innerHTML = "å½åè¿æ»¤æ¹æ¡ï¼" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
			HInterID = data[0].hmainid
			//æ ¹æ®éæ©çè¿æ»¤æ¹æ¡åå¡«æ°æ®å°åè¡¨è¿æ»¤æ¡ä»¶
			for (let i = 0; i < data.length; i++) {
			$("#" + data[i].è¿æ»¤åæ®µID).val(data[i].è¿æ»¤å¼);
			if (data[i].è¿æ»¤æ ç¾ç±»å == 'SELECT') {
			$("#" + data[i].è¿æ»¤åæ®µID).find("option[value='" + data[i].è¿æ»¤å¼ + "']").attr("selected", true);
			}
			}

			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion
			</script>

			</body>