MES-WEB-LayUI.git

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

			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>ä¾åºåè®¾ç½®</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
			<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/HideButton_New.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<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/PubCustom.js"></script>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -35,49 +37,61 @@
			<div class="layui-inline">
			<label class="layui-form-label">ä¾åºåä»£ç </label>
			<div class="layui-input-block">
			<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">ä¾åºååç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" 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">
			<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-inline">
			<label class="layui-form-label">ä¾åºåä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" 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>

			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
			<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">
			<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" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
			<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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -85,40 +99,110 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" 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" class="ForFilteringSchemes"
			lay-filter="ColName1" style="width:190px;">
			</select>
			</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>
			</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" 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>
			<!--<table class="" id="mainTable" lay-filter="mainTable"> </table>-->

			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-form"></i>æ°å¢</button>
			<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>
			<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-NumAdd" id="btn-NumAdd"><i class="layu i-iconlayuiiconfileb"></i>æµæ°´å·æ°å¢</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btn-Modify"><i class="layui-icon layui-icon-form"></i>ä¿®æ¹</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-form"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btnCopy" id="btn-Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btn-Modify"><i class="layui-icon layui-icon-form"></i>ä¿®æ¹</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></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="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></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_ref"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<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>
			</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(50vh);"></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;">
			@@ -132,18 +216,14 @@
			<div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			<div id="page" style="position: relative; bottom: 0;"></div>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<!--<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/layui/layui1.js"></script>
			<script src="../../../layuiadmin/layui/lay/modules/table.js"></script>-->

			<script>
			var Organization = sessionStorage["Organization"]
			layui.config({
			@@ -165,11 +245,13 @@
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];

			var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			var HModName = "Gy_Supplier";
			var ins; //ç¨äºå¯¼åºexcel
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID", "HCurID", "è´§å¸", "æ±ç", "HSSID", "ç»ç®æ¹å¼", "HAreaID", "å°åº","HPSStyleID","éè´æ¹å¼"];

			var titleData = ["sorderid", "HItemID", "HCurID", "HSSID", "HAreaID", "HPSStyleID"];
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			var params = getUrlVars();
			var Type = params[params[0]];
			var HSupTypeID = 0;
			@@ -201,8 +283,13 @@
			//æ°å¢
			case 'btnAdd': set_AddNew();
			break;
			case 'btnCopy': set_CopyNew();
			break;
			//æ°å¢æµæ°´å·
			case 'btn-NumAdd': set_NumAddNew();
			break;
			//å¯¼å¥
			case 'set_SouceExcel': set_SouceExcel();
			break;
			//ç¼è¾
			case 'btnModify': set_ShowBill();
			@@ -237,13 +324,35 @@
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "Gy_Supplier";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			//å¯¼åºexcel
			case 'get_export': get_Export();
			break;
			};
			});

			// ä»£ç è¶é¾æ¥ç¹å»äºä»¶
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			debugger;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä¾åºååºç¡èµæ'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=3&linterid=' + data.HItemID]
			, resize: false
			})
			})
			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			@@ -251,7 +360,11 @@

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

			//#region éæ°åæ¥æé®
			@@ -260,7 +373,7 @@
			});
			//#endregion

			//#region åå»è¿åæ°æ®
			//#region åå»è¿åæ°æ®
			table.on('rowDouble(mainTable)', function (obj) {
			var data = [];
			data.push(obj.data);
			@@ -298,7 +411,7 @@
			set_InitGrid();

			//æ¥è¯¢
			get_Display(sWhere);
			get_DisplayPage(sWhere);

			//æ ç¶å¾çæ
			get_Display_Tree();
			@@ -310,7 +423,7 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			@@ -326,6 +439,23 @@
			// , { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
			//]]
			};
			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) {
			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();
			}
			}
			}
			laypage.render(optionPage);
			}

			//æ¥è¯¢
			@@ -336,7 +466,7 @@
			$.ajax({
			url: GetWEBURL() + '/Gy_Supplier/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			@@ -348,7 +478,6 @@
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			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å
			}
			@@ -376,12 +505,11 @@
			, limit: 50
			, cellMinWidth: 90
			}
			table.render(option);
			ins = table.render(option);

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			//å·æ°æé®æ¾ç¤º
			var HBillType = "Gy_Supplier";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			@@ -402,6 +530,81 @@
			});
			layer.close(index);
			}

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var ajaxLoad = layer.load();
			sWhere += addSWhereByOpenType();
			$.ajax({
			url: GetWEBURL() + '/Gy_Supplier/page',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size, "Organization": Organization },
			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 });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			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 HH:mm:ss')}}</div>", width: 160 });
			break;
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
			break;
			case 'Int32':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
			}
			}
			}

			columns = col;
			option.cols = [col];
			option.data = data1.data;
			option.totalRow = true;
			ins = table.render(option);
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

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


			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			@@ -431,7 +634,12 @@
			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) {
			@@ -453,13 +661,56 @@
			}
			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 + "%'";
			}
			if (HName) {
			sWhere += " and ä¾åºååç§° like '%" + HName + "%'";
			}
			get_Display(sWhere);

			get_DisplayPage(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			@@ -467,13 +718,18 @@
			function set_ClearQuery() {
			$("#HNumber").val("");
			$("#HName").val("");
			$("#btnSearch").click();
			$("#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 = "";
			$("#btnSearch").click();
			}

			//éæ°åæ¥æé®
			@@ -508,6 +764,11 @@
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			debugger;
			if (data[0].å®¡æ ¸äºº !== '' && data[0].å®¡æ ¸äºº !== null) {
			layer.alert("å·²è¢«å®¡æ ¸çæ°æ®ä¸è½è¢«å é¤!", { icon: 5 });
			return;
			}
			if (checkStatus.data.length === 1) {
			var ModRightNameDelete = "Gy_Supplier_Delete";
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			@@ -517,7 +778,7 @@
			//async: true,
			data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
			success: function (result) {
			if (result.count == 1) {
			if (result.code == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			@@ -577,6 +838,21 @@
			});
			}

			function set_CopyNew() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä¾åºååºç¡èµæ'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=6&linterid=' + checkStatus.data[0].HItemID]
			, resize: false
			})
			}

			//#region æµæ°´å·æ°å¢
			function set_NumAddNew() {
			if (HSupTypeID == 0 \|\| HSupTypeID == null) {
			@@ -594,7 +870,7 @@
			content: '../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=2&linterid=0&HSupTypeID=' + HSupTypeID + '&HSupClsName=' + encodeURIComponent(HSupClsName),
			end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery(table, option);
			get_FastQuery();
			},
			success: function (layero, index) {

			@@ -602,6 +878,30 @@
			});
			}

			}
			//#endregion

			//å¯¼å¥
			function set_SouceExcel() {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä¾åºåå¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: './Gy_Supplier_Excel.html?OperationType=dao&HSouceBillType='
			})
			}

			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			get_DisplayPage(sWhere);
			}
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			@@ -740,7 +1040,7 @@
			HSupClsName = data.title;
			HSupTypeID = data.id;
			}
			get_Display(sql);
			get_DisplayPage(sql);
			}
			});
			}
			@@ -755,11 +1055,11 @@
			subStr += getChildMenu(subMenu.children[j], num);
			if (j + 1 == subMenu.children.length) {
			subStr = subStr.substring(0, subStr.length - 1);
			}1
			} 1
			}
			subStr += ']},';
			} else {
			subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
			subStr += '{"title": "' + subMenu.title + '", "id": "' + subMenu.id + '"},';
			}
			return subStr;
			}
			@@ -769,8 +1069,8 @@
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			@@ -779,7 +1079,7 @@
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

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

			layer.open({
			type: 2
			@@ -801,11 +1101,13 @@
			}

			//#endregion

			//#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) {
			@@ -814,9 +1116,10 @@
			//var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

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

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			@@ -831,12 +1134,6 @@
			} 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;
			@@ -853,8 +1150,39 @@
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			// if (dataCols[4] != null && dataCols[4] != "") {
			// option.cols[0][i + 1]["title"] = dataCols[4];
			// }

			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			option.cols[0][i + 1]["field"] = dataCols[5];
			}

			// éèæå®åç§°çå
			if ((dataCols[4] + dataCols[5]).search('éæ©') !== -1) {
			option.cols[0][i + 1]["hide"] = true;
			}

			option.cols[0][i + 1]["templet"] = ''
			// æ ¼å¼åååä¸å«ææäºè¯æ±çå
			if ((dataCols[4] + dataCols[5]).search('æ¶é´') !== -1) {
			option.cols[0][i + 1]["templet"] =
			option.cols[0][i + 1]["templet"] = "<div>{{d." + option.cols[0][i + 1]["field"] + " ==null ?'':layui.util.toDateString(d." + option.cols[0][i + 1]["field"] + ", 'yyyy-MM-dd HH:mm:ss')}}</div>"
			} else if ((dataCols[4] + dataCols[5]).search('ä¾åºåä»£ç ') !== -1) {
			option.cols[0][i + 1]["templet"] = function (d) {
			return '<span style="color: blue; cursor: pointer;">' + d.ä¾åºåä»£ç + '</span>'
			}
			option.cols[0][i + 1]["event"] = 'ä¾åºåä»£ç '
			}

			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			@@ -874,8 +1202,14 @@
			}
			}
			table.render(option);
			//å·æ°æé®æ¾ç¤º
			var HBillType = "Gy_Supplier";
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			} else {
			table.render(option);
			//å·æ°æé®æ¾ç¤º
			var HBillType = "Gy_Supplier";
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			@@ -884,18 +1218,22 @@
			}
			//#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
			@@ -1119,7 +1457,7 @@
			}
			return vars;
			}
			//#endregion
			//#endregion
			//#region å¤ææ¯ç´æ¥æå¼é¡µé¢è¿æ¯å¶å®é¡µé¢éè¿éæ©æé®æå¼ï¼å¹¶æ¾ç¤ºç¸åºæ°æ®
			function addSWhereByOpenType() {
			//è·ååæ°
			@@ -1130,12 +1468,12 @@
			var addSWhere = "";

			if (openType != undefined && HOrgName != "undefined") {
			addSWhere = " and ç¦ç¨æ è®° = '' ";
			addSWhere = " and ç¦ç¨æ è®° = '' and å®¡æ ¸äºº !='' ";
			Organization = HOrgName.toString();
			}
			return addSWhere;
			}
			//#endregion
			//#endregion

			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			function HFilterScheme(obj) //è¿åè¿æ»¤æ¹æ¡
			@@ -1178,4 +1516,5 @@
			</script>

			</body>

			</html>