MES-WEB-LayUI.git

			@@ -90,8 +90,6 @@
			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<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-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -146,7 +144,6 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -174,10 +171,12 @@
			<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>

			<div id="page" style="position:relative;bottom:0;"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			@@ -187,7 +186,7 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" id="btn-exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			@@ -220,8 +219,10 @@
			var sWhere = "";
			var option = [];
			var ins;
			var titleData = ["åæ®ID", "HMaterID", "HDeptID", "HSupID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var titleData = ["åæ®ID", "HMaterID", "HDeptID", "HSupID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			//#region ãè¿æ»¤æ¹æ¡ã

			//è¿æ»¤æ¡ä»¶çclassç±»
			@@ -300,7 +301,7 @@
			rows = rows.substring(rows.length - 1, 0);
			layer.open({
			type: 2
			, area: ['50%', '50%']
			, area: ['40%', '80%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			@@ -320,7 +321,8 @@
			$("#HSourceBillNo").val("");
			$("#HMaterNumber").val("");
			sWhere = "";
			get_Display(sWhere);
			get_DisplayPage(sWhere);

			break;
			//ä½åºæé®
			case 'set_Drop': set_DropBill(0);
			@@ -389,8 +391,11 @@
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			}
			sWhere = "";
			get_Display(sWhere);
			get_DisplayPage(sWhere);
			});
			//#endregion

			@@ -415,91 +420,95 @@
			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;
			}

			var com1 = "";
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			com1 = "like ''%" + ColContent1 + "%''";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			com1 = "like ''%" + ColContent1 + "''";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			com1 = "like''" + ColContent1 + "%''";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			com1 = "not like''%" + ColContent1 + "%''";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			com1 = "" + Comparator1 + "''" + ColContent1 + "''";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}

			var com2 = "";
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			com2 = "like ''%" + ColContent2 + "%''";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			com2 = "like''%" + ColContent2 + "''";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			com2 = "like ''" + ColContent2 + "%''";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			com2 = "not like ''%" + ColContent2 + "%''";
			break;
			default:
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			com2 = "" + Comparator2 + "''" + ColContent2 + "''";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= ''" + HBeginDate + "''";
			}
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= ''" + HEndDate + "''";
			}
			if (HBarCode) {
			sWhere += " and æ¡ç ç¼å· like '%" + HBarCode + "%'";
			sWhere += " and æ¡ç ç¼å· like ''%" + HBarCode + "%''";
			}
			if (HMaterName) {
			sWhere += " and ç©æåç§° like'%" + HMaterName + "%'";
			sWhere += " and ç©æåç§° like''%" + HMaterName + "%''";
			}
			if (HMaterNumber) {
			sWhere += " and ç©æä»£ç like'%" + HMaterNumber + "%'";
			sWhere += " and ç©æä»£ç like''%" + HMaterNumber + "%''";
			}
			if (HSourceBillNo) {
			sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
			sWhere += " and æºååå· like ''%" + HSourceBillNo + "%''";
			}

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

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			@@ -515,10 +524,9 @@
			//æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();

			//æ¥è¯¢
			get_Display(sWhere);
			get_DisplayPage(sWhere);
			//ä»»æåæ®µè¿æ»¤ä¸ææ¡åå§å
			ColFilter();

			@@ -526,95 +534,151 @@
			get_DefaultModule();
			}
			function set_InitGrid() {
			option = {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limits: [50, 500, 5000, 20000]
			, limit: 50
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true, sort: true }
			, { field: 'æ¡ç ç±»å', title: 'æ¡ç ç±»å', width: 160, sort: true }
			, { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·', width: 160, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 250, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 250, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 200, sort: true }
			, { field: 'çå·', title: 'çå·', width: 200, sort: true }
			, { field: 'é¢å·å·', title: 'é¢å·å·', width: 200, sort: true }
			, { field: 'æ¡ç ç¶æ', title: 'æ¡ç ç¶æ', width: 200, sort: true }
			, { field: 'åå', title: 'åå', width: 200, sort: true }
			, { field: 'æåå·', title: 'æåå·', width: 200, sort: true }
			, { field: 'çäº§æ¥æ', title: 'çäº§æ¥æ', width: 200, templet: "<div>{{d.çäº§æ¥æ ==null ?'':layui.util.toDateString(d.çäº§æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'ä¿è´¨æè³', title: 'ä¿è´¨æè³', width: 200, templet: "<div>{{d.ä¿è´¨æè³ ==null ?'':layui.util.toDateString(d.ä¿è´¨æè³, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
			, { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 160, sort: true }
			, { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 160, sort: true }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 160, sort: true }
			, { field: 'æ°é', title: 'æ°é', width: 200, sort: true, totalRow: true}
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 200, sort: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200, sort: true }
			, { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 200, sort: true }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 200, sort: true }
			, { field: 'è¿ææ¥æ', title: 'è¿ææ¥æ', width: 200, sort: true }
			, { field: 'è¿ææ¥æå¨', title: 'è¿ææ¥æå¨', width: 115, sort: true }
			, { field: 'å®¢æ·åå·', title: 'å®¢æ·åå·', width: 115, sort: true }
			, { field: 'å¾æ¥åä½', title: 'å¾æ¥åä½', width: 200, sort: true }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
			, { field: 'è½¦é´', title: 'è½¦é´', width: 115, sort: true }
			, { field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ', width: 200, sort: true }
			, { field: 'æå·', title: 'æå·', width: 200, sort: true }
			, { field: 'æ»ææ°', title: 'æ»ææ°', width: 200, sort: true, totalRow: true }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200, sort: true }
			, { field: 'å¶ä½äºº', title: 'å¶ä½äºº', width: 115, sort: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°', width: 200, sort: true }
			, { field: 'ä½åºæ è®°', title: 'ä½åºæ è®°', width: 200, sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 115, sort: true }
			, { field: 'çäº§å¥åºæ¥æ', title: 'çäº§å¥åºæ¥æ', width: 200, templet: "<div>{{d.çäº§å¥åºæ¥æ ==null ?'':layui.util.toDateString(d.çäº§å¥åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'éå®åºåºæ¥æ', title: 'éå®åºåºæ¥æ', width: 200, templet: "<div>{{d.éå®åºåºæ¥æ ==null ?'':layui.util.toDateString(d.éå®åºåºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			]]
			, height: 'full-150'
			, page: false
			, limit: 50
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true, sort: true }
			, { field: 'æ¡ç ç±»å', title: 'æ¡ç ç±»å', width: 160, sort: true }
			, { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·', width: 160, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 250, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 250, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 200, sort: true }
			, { field: 'çå·', title: 'çå·', width: 200, sort: true }
			, { field: 'é¢å·å·', title: 'é¢å·å·', width: 200, sort: true }
			, { field: 'æ¡ç ç¶æ', title: 'æ¡ç ç¶æ', width: 200, sort: true }
			, { field: 'åå', title: 'åå', width: 200, sort: true }
			, { field: 'æåå·', title: 'æåå·', width: 200, sort: true }
			, { field: 'çäº§æ¥æ', title: 'çäº§æ¥æ', width: 200, templet: "<div>{{d.çäº§æ¥æ ==null ?'':layui.util.toDateString(d.çäº§æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'ä¿è´¨æè³', title: 'ä¿è´¨æè³', width: 200, templet: "<div>{{d.ä¿è´¨æè³ ==null ?'':layui.util.toDateString(d.ä¿è´¨æè³, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
			, { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 160, sort: true }
			, { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 160, sort: true }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 160, sort: true }
			, { field: 'æ°é', title: 'æ°é', width: 200, sort: true, totalRow: true }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 200, sort: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200, sort: true }
			, { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 200, sort: true }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 200, sort: true }
			, { field: 'è¿ææ¥æ', title: 'è¿ææ¥æ', width: 200, sort: true }
			, { field: 'è¿ææ¥æå¨', title: 'è¿ææ¥æå¨', width: 115, sort: true }
			, { field: 'å®¢æ·åå·', title: 'å®¢æ·åå·', width: 115, sort: true }
			, { field: 'å¾æ¥åä½', title: 'å¾æ¥åä½', width: 200, sort: true }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
			, { field: 'è½¦é´', title: 'è½¦é´', width: 115, sort: true }
			, { field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ', width: 200, sort: true }
			, { field: 'æå·', title: 'æå·', width: 200, sort: true }
			, { field: 'æ»ææ°', title: 'æ»ææ°', width: 200, sort: true, totalRow: true }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200, sort: true }
			, { field: 'å¶ä½äºº', title: 'å¶ä½äºº', width: 115, sort: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°', width: 200, sort: true }
			, { field: 'ä½åºæ è®°', title: 'ä½åºæ è®°', width: 200, sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 115, sort: true }
			, { field: 'çäº§å¥åºæ¥æ', title: 'çäº§å¥åºæ¥æ', width: 200, templet: "<div>{{d.çäº§å¥åºæ¥æ ==null ?'':layui.util.toDateString(d.çäº§å¥åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'éå®åºåºæ¥æ', title: 'éå®åºåºæ¥æ', width: 200, templet: "<div>{{d.éå®åºåºæ¥æ ==null ?'':layui.util.toDateString(d.éå®åºåºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			]]
			};
			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); //å¾å°æ¯é¡µæ¾ç¤ºçæ¡æ°

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

			//åæ®å·è¶é¾æ¥
			if (obj.event == 'åæ®å·') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'ç¼è¾' //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1//æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			page = obj.curr;
			size = obj.limit;
			// åè®¾æé®æä¸ä¸ªIDä¸º"myButton"
			$("#btnSearch").trigger("click");
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			}
			});
			laypage.render(optionPage);
			}

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_BarCodeBillList/page',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "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 {
			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 });
			}
			}
			}


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

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

			//#endregion
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {
			@@ -629,11 +693,16 @@
			if (data1.count == 1) {
			var data = [];//ååæ®µæ°æ®
			var col = [];

			var totalArray = [];

			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {//å¾ªåºéåæ°ç»
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//ä»æ¯ä¸ªå¯¹è±¡ä¸æåæ°æ®
			}

			//å¤ææ¯å¦æ¯çº¯è±æ
			var patrn = new RegExp("[\u4E00-\u9FA5]+");
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {//éådataæ°ç»éçæ°æ®
			@@ -641,42 +710,29 @@
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if (!patrn.test(data[i].name)) {
			col.push({ field: data[i].name, title: data[i].name, hide: true }); //éèå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			} else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			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: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 800
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}

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

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			ColFilter();
			}
			//å·æ°æé®æ¾ç¤º
			@@ -735,11 +791,80 @@
			}
			//#endregion

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_BarCodeBillList/page',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "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 {
			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 });
			}
			}
			}


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

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "æ¡ç ä¸»æ¡£";
			Display_HideButton(btns, 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

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			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"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			@@ -751,7 +876,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -763,93 +888,197 @@
			}

			//æ¾ç¤ºåæ°æ®
			//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 = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®


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

			// for (var i = 0; i < option.cols[0].length - 2; 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);
			// }

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

			// }, error: function () {
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// })
			//}

			//#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", "HMaterID", "HDeptID", "HSupID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; 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;
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			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 (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			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];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			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);

			}

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

			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			@@ -916,7 +1145,7 @@
			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();