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 {
			@@ -54,10 +59,11 @@
			</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>

			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<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>
			@@ -73,9 +79,11 @@
			<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 ForFilteringSchemes" 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>
			@@ -87,12 +95,12 @@
			<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 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">
			<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>
			@@ -108,6 +116,60 @@
			</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: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>
			@@ -135,26 +197,27 @@
			</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="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></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-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="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="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-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-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></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="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="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="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>
			@@ -171,11 +234,11 @@
			</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 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"></div>
			<div id="page" style="position:relative;bottom:0;"></div>
			</div>
			</div>
			</div>
			@@ -201,10 +264,12 @@
			, laydate = layui.laydate
			, tree = layui.tree
			, carousel = layui.carousel
			var sWhere = "";
			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","éæ©","sorderid"];
			@@ -260,6 +325,9 @@
			//æ°å¢æµæ°´å·æé®
			case 'btn-NumAdd': set_NumAddNew();
			break;
			//å¯¼å¥
			case 'set_SouceExcel': set_SouceExcel();
			break;
			case 'btn-NumAdd':
			set_NumAddNew();
			break;
			@@ -311,11 +379,15 @@
			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;
			};
			});
			@@ -324,6 +396,11 @@
			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery();
			}

			//$("#btnSearch").click();
			});
			@@ -331,7 +408,11 @@

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

			@@ -348,7 +429,6 @@
			get_FastQuery();
			}
			});


			//#region éæ°åæ¥æé®
			form.on('submit(btnResCnz)', function (data) {
			@@ -383,6 +463,26 @@
			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 ç¹å»è¡éä¸é«äº®
			@@ -424,6 +524,7 @@
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			OrganName();

			//æ ç¶å¾æ¥è¯¢
			get_Display_Tree();
			@@ -433,6 +534,7 @@
			Carousel.reload({ autoplay: false })
			//è·åé¡¹ç®å·
			Get_HProject();
			get_FastQuery()
			//è¿æ»¤æ¹æ¡
			get_DefaultModule()
			}
			@@ -443,7 +545,7 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-80'
			, height: 'full-150'
			, page: false
			, limit: 50
			, done: function (res, curr, count) {
			@@ -489,16 +591,46 @@
			//#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 = "";
			}
			@@ -539,18 +671,18 @@
			}
			}


			option.cols = [col];
			option.data = data1.data;
			ins = table.render(option);

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

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			@@ -566,7 +698,7 @@

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			//var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_Material/page',
			@@ -574,7 +706,7 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.count != 0) {
			if (data1.code==1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];
			var col = [];
			@@ -588,6 +720,13 @@
			// 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) {
			@@ -604,21 +743,24 @@

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

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


			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);
			//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);
			@@ -631,50 +773,101 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {
			sWhere = "";
			//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) {
			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;
			}
			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 + "%''";
			sWhere += " and ç©æä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and ç©æåç§° like ''%" + HName + "%''";
			sWhere += " and ç©æåç§° like '%" + HName + "%'";
			}
			if (HModel) {
			sWhere += " and è§æ ¼åå· like ''%" + HModel + "%''";
			sWhere += " and è§æ ¼åå· like '%" + HModel + "%'";
			}
			if (HOrgName) {
			sWhere += " and ç»ç»åç§° like ''%" + HOrgName + "%''";
			if (HOrgID) {
			sWhere += " and HUSEORGID = '" + HOrgID + "'";
			}
			if (HProject) {
			sWhere += " and é¡¹ç®å· like ''%" + HProject + "%''";
			sWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}

			if (GetDataCols != "") {
			@@ -739,7 +932,16 @@
			});
			}
			//#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')
			@@ -1015,6 +1217,7 @@
			$.ajax({
			url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeListByLevel',
			type: "GET",
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(ajaxLoad);
			@@ -1055,6 +1258,7 @@
			tree.render({
			elem: '#TreeTable' //é»è®¤æ¯ç¹å»èç¹å¯è¿è¡æ¶ç¼©
			, data: treeTable
			, onlyIconControl: true
			, click: function (obj) {
			//é«äº®åè²
			$(".layui-tree-set").removeClass('layui-tree-set-active');
			@@ -1068,7 +1272,7 @@
			sql = "";
			HMaterTypeID = 0;
			} else {
			sql = " and HMaterTypeID=''" + data.id + "'' ";
			sql = " and HMaterTypeID='" + data.id + "' ";
			HMaterTypeID = data.id;
			}
			get_FastQuery()
			@@ -1147,41 +1351,7 @@
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			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 è¿è¡ç¼ç

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

			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);//å³éå¼¹çª
			}
			})
			}
			//#endregion


			//é«çº§è¿æ»¤
			function set_QueryCondition() {
			@@ -1239,100 +1409,7 @@
			})
			}

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			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[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = 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;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}

			//åæ¶å»ç»å
			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>';
			@@ -1343,6 +1420,10 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion
			@@ -1386,8 +1467,14 @@
			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);
			}
			}