MES-WEB-LayUI.git

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

			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>æ¡ç æ¡£æ¡</title>
			@@ -17,6 +18,7 @@
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/MESLanguage.js"></script>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -28,6 +30,7 @@
			} */
			</style>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -38,75 +41,104 @@
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			<span id="BT_GD">æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<label class="layui-form-label" id="BT_HInitTimeCycle">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
			lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<label class="layui-form-label" id="BT_HBeginDate">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
			style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<label class="layui-form-label" id="BT_HEndDate">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
			style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¡ç ç¼å·</label>
			<label class="layui-form-label" id="BT_HBarCode">æ¡ç ç¼å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBarCode" id="HBarCode">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBarCode"
			id="HBarCode">
			</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="HSourceBillNo" id="HSourceBillNo">
			<div class="layui-row" style="margin-top: 5px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label" id="BT_HSourceBillNo">æºååå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes"
			name="HSourceBillNo" id="HSourceBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" id="BT_HMaterName">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterName"
			id="HMaterName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" id="BT_HMaterNumber">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes"
			name="HMaterNumber" id="HMaterNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç»åç§°</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes"
			lay-verify="HUSEORGID">
			<!--å¨ææ¸²æç»ç»-->
			</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 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="HMaterName" id="HMaterName">
			</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="HMaterNumber" id="HMaterNumber">
			</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 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>
			<label class="layui-form-label" id="BT_ColName">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			<select name="ColName" class="ForFilteringSchemes" id="ColName" lay-filter="ColName"
			style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<select name="Comparator" class="ForFilteringSchemes" id="Comparator" 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>
			@@ -114,26 +146,33 @@
			</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: 10px; margin-left: 70px;">
			<div class="layui-row" style=" margin-top: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<label class="layui-form-label" id="BT_ColName1">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			<select class="ForFilteringSchemes" 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;">
			<select name="Comparator1" class="ForFilteringSchemes" 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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -141,26 +180,33 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			<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-row" style=" margin-top: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<label class="layui-form-label" id="BT_ColName2">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			<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;">
			<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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -168,7 +214,8 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			@@ -183,6 +230,9 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print_X" lay-event="btn-print_X"><i class="layui-icon layui-icon-print"></i>ç®±æ¡ç </button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print-zx" lay-event="btn-print-zx"><i class="layui-icon layui-icon-print"></i>ä¸ç®±æ ç¾æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print-zb" lay-event="btn-print-zb"><i class="layui-icon layui-icon-print"></i>æ æ¿ç æå°</button>
			<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>
			@@ -204,7 +254,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			@@ -220,7 +270,7 @@
			var option = [];
			var ins;

			var titleData = ["åæ®ID", "HMaterID", "HDeptID", "HSupID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["åæ®ID", "HMaterID", "HDeptID", "HSupID", "HItemID", "hmainid", "hsubid", "HInterID", "HUnitID", "HAuxPropID", "HSTOCKORGID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -249,7 +299,7 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length == 0 \|\| checkStatus.data.length > 300) {
			layer.msg('è¯·éæ©è¦å é¤çæ°æ®,ä¸éä¸è¡æ°ä¸è½è¶è¿300è¡ï¼');
			layer.msg(get_MessageError('[0000-1-014]è¯·éæ©è¦å é¤çæ°æ®,ä¸éä¸è¡æ°ä¸è½è¶è¿300è¡ï¼', sessionStorage["HTranSlate"]));
			return;
			}
			var mainid = "";
			@@ -265,10 +315,11 @@
			var oData = JSON.stringify(mainid) + ";" + sessionStorage["HUserName"] + ";" + JSON.stringify(BarCode);

			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			layer.confirm(get_MessageError("[0000-1-003]ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", sessionStorage["HTranSlate"]), { title: get_MessageError("[0000-2-009]å é¤ç¡®è®¤", sessionStorage["HTranSlate"]) }, function (index) {
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			data: { "oData": oData },
			success: function (result) {
			if (result.count == 1) {
			@@ -282,10 +333,10 @@
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(get_MessageError(result.code + result.Message, sessionStorage["HTranSlate"]), { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			});
			})
			@@ -293,26 +344,49 @@
			case 'btn-print':
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length > 0) {
			var rows = '';
			for (var i = 0; i < data.length; i++) {
			rows += data[i].HItemID.toString() + ',';
			var ModRightName = 'Gy_BarCodeBillList_Print';
			$.ajax({
			url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillPermission',
			type: "GET",
			async: false,
			data: { "user": sessionStorage["HUserName"] },
			success: function (res) {
			if (res.data == 1) {
			if (checkStatus.data.length > 0) {
			var rows = '';
			for (var i = 0; i < data.length; i++) {
			rows += data[i].HItemID.toString() + ',';
			}
			rows = rows.substring(rows.length - 1, 0);
			layer.open({
			type: 2
			, area: ['40%', '80%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg(get_MessageError('[0000-1-016]è¯·éæ©æ°æ®æå°ï¼', sessionStorage["HTranSlate"]));
			}
			}
			else {
			layer.alert(get_MessageError("æ æå°æé!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			}
			rows = rows.substring(rows.length - 1, 0);
			layer.open({
			type: 2
			, area: ['50%', '50%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg('è¯·éæ©æ°æ®æå°ï¼');
			}
			});
			break;
			case 'btn-print-zx':
			PrintZX();
			break;
			case 'btn-print-zb':
			PrintZB();
			break;
			case 'btn-print_X'://æå°åºç«çæçæ¡ç
			PrintX();
			break;
			//å·æ°
			case 'btn-reload':
			@@ -321,7 +395,7 @@
			$("#HSourceBillNo").val("");
			$("#HMaterNumber").val("");
			sWhere = "";
			get_Display(sWhere);
			get_DisplayPage(sWhere);

			break;
			//ä½åºæé®
			@@ -391,9 +465,9 @@
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			if (page != 1) {
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			}
			}
			sWhere = "";
			get_DisplayPage(sWhere);
			});
			@@ -401,107 +475,10 @@

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBarCode = $("#HBarCode").val();
			var HSourceBillNo = $("#HSourceBillNo").val();
			var HMaterName = $("#HMaterName").val();
			var HMaterNumber = $("#HMaterNumber").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 + "%''";
			break;
			case "8":
			com = "like ''%" + ColContent + "''";
			break;
			case "9":
			com = "like''" + ColContent + "%''";
			break;
			case "10":
			com = "not like ''%" + ColContent + "%''";
			break;
			default:
			com = "" + Comparator + "''" + ColContent + "''";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}

			var com1 = "";
			if (ColName1 != 0 && Comparator1 != 0) {
			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;
			}

			var com2 = "";
			if (ColName2 != 0 && Comparator2 != 0) {
			switch (Comparator) {
			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 (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= ''" + HBeginDate + "''";
			}
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= ''" + HEndDate + "''";
			}
			if (HBarCode) {
			sWhere += " and æ¡ç ç¼å· like ''%" + HBarCode + "%''";
			}
			if (HMaterName) {
			sWhere += " and ç©æåç§° like''%" + HMaterName + "%''";
			}
			if (HMaterNumber) {
			sWhere += " and ç©æä»£ç like''%" + HMaterNumber + "%''";
			}
			if (HSourceBillNo) {
			sWhere += " and æºååå· like ''%" + HSourceBillNo + "%''";
			}

			get_DisplayPage(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			page = 1;
			optionPage.curr = 1;
			get_FastQuery();
			//initFunction(1, HModName, sessionStorage["HTranSlate"]);
			});
			//#endregion

			@@ -524,14 +501,19 @@
			//æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

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

			get_DisplayPageListStruct(" and 1 = 0")
			ColFilter()

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();

			initFunction(1, HModName, sessionStorage["HTranSlate"]);


			}
			function set_InitGrid() {
			option = {
			@@ -597,30 +579,135 @@
			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_DisplayPage("");
			// åè®¾æé®æä¸ä¸ªIDä¸º"myButton"
			get_FastQuery();
			}
			}
			}
			laypage.render(optionPage);
			}

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {

			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBarCode = $("#HBarCode").val();
			var HSourceBillNo = $("#HSourceBillNo").val();
			var HMaterName = $("#HMaterName").val();
			var HMaterNumber = $("#HMaterNumber").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 + "%''";
			break;
			case "8":
			com = "like ''%" + ColContent + "''";
			break;
			case "9":
			com = "like ''" + ColContent + "%''";
			break;
			case "10":
			com = "not like ''%" + ColContent + "%''";
			break;
			default:
			com = "" + Comparator + "''" + ColContent + "''";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}

			var com1 = "";
			if (ColName1 != 0 && Comparator1 != 0) {
			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;
			}

			var com2 = "";
			if (ColName2 != 0 && Comparator2 != 0) {
			switch (Comparator) {
			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 (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= ''" + HBeginDate + "''";
			}
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= ''" + HEndDate + "''";
			}
			if (HBarCode) {
			sWhere += " and æ¡ç ç¼å· like ''%" + HBarCode + "%''";
			}
			if (HMaterName) {
			sWhere += " and ç©æåç§° like ''%" + HMaterName + "%''";
			}
			if (HMaterNumber) {
			sWhere += " and ç©æä»£ç like ''%" + HMaterNumber + "%''";
			}
			if (HSourceBillNo) {
			sWhere += " and æºååå· like ''%" + HSourceBillNo + "%''";
			}

			sWhere += getOrgIDByUser();//ç¨æ·å³èç»ç»æ¥è¯¢è¿æ»¤

			get_DisplayPage(sWhere);

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

			//#region éè¿éå¥ä¸ä¸ªåå¼å¿«éè·åè¡¨ç»æ
			function get_DisplayPageListStruct(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_BarCodeBillList/page',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			@@ -657,28 +744,223 @@
			ins = table.render(option);
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			// if ($("#ColName option").length < 1) {
			// ColFilter();
			// //get_DefaultModule();//å è½½æ¹æ¡
			// }
			//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 });
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			});
			}
			//#endregion

			//#endregion
			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_BarCodeBillList/page',
			type: "GET",
			async: false,
			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);
			//å·æ°è¡¨æ ¼æ°æ®

			layer.close(ajaxLoad);
			// if ($("#ColName option").length < 1) {
			// ColFilter();
			// //get_DefaultModule();//å è½½æ¹æ¡
			// }
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			option.data = [[]]
			table.render(option);
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}, complete: function () {
			DisPlay_HideColumn();
			}
			});
			}
			//#endregion

			//#region ä¸ç®±ç æå°
			function PrintZX() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			var ModRightName = 'Gy_BarCodeBillList_Print';
			$.ajax({
			url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillPermission',
			type: "GET",
			async: false,
			data: { "user": sessionStorage["HUserName"] },
			success: function (res) {
			if (res.data == 1) {
			if (checkStatus.data.length > 0) {
			var rows = '';
			for (var i = 0; i < data.length; i++) {
			rows += data[i].ä¸ç®±ç .toString() + ',';
			}
			rows = rows.substring(rows.length - 1, 0);
			layer.open({
			type: 2
			, area: ['40%', '80%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_MiddleBox', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg(get_MessageError('[0000-1-016]è¯·éæ©æ°æ®æå°ï¼', sessionStorage["HTranSlate"]));
			}
			}
			else {
			layer.alert(get_MessageError("æ æå°æé!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			}
			});
			}
			//#endregion

			//#region æ æ¿ç æå°
			function PrintZB() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			var ModRightName = 'Gy_BarCodeBillList_Print';
			$.ajax({
			url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillPermission',
			type: "GET",
			async: false,
			data: { "user": sessionStorage["HUserName"] },
			success: function (res) {
			if (res.data == 1) {
			if (checkStatus.data.length == 1) {
			var rows = '';
			for (var i = 0; i < data.length; i++) {
			rows += data[i].ä¸ç®±ç .toString() + ',';
			}
			rows = rows.substring(rows.length - 1, 0);

			var sql = "select top 1 HBarCode_Pack from Sc_PackUnionBillsub with(nolock) where HBarCode = '" + rows + "'"
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			data: { "sWhere": sql },
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			rows = data.data[0].rows;
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			}
			})

			layer.open({
			type: 2
			, area: ['40%', '80%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_ZB', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg(get_MessageError('[0000-1-016]è¯·éæ©ä¸æ¡æ°æ®æå°ï¼', sessionStorage["HTranSlate"]));
			}
			}
			else {
			layer.alert(get_MessageError("æ æå°æé!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			}
			});
			}
			//#endregion

			//#region åºç«åçæçç®±ç æå°
			function PrintX() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length > 0) {
			var rows = '';
			for (var i = 0; i < data.length; i++) {
			rows += data[i].HItemID.toString() + ',';
			}
			rows = rows.substring(rows.length - 1, 0);
			layer.open({
			type: 2
			, area: ['40%', '80%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_XBarcode', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg(get_MessageError('[0000-1-016]è¯·éæ©æ°æ®æå°ï¼', sessionStorage["HTranSlate"]));
			}
			}
			//#endregion

			//#endregion
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {
			var index = layer.load(0);
			@@ -687,6 +969,7 @@
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillList',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -744,7 +1027,7 @@
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			});
			DisPlay_HideColumn();
			@@ -761,6 +1044,7 @@
			type: "GET",
			url: GetWEBURL() + "/Gy_BarCodeBillList/DeleteGy_BarCodeBillList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
			async: false,
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -777,93 +1061,25 @@
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(get_MessageError(result.code + result.Message, sessionStorage["HTranSlate"]), { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ä½åºï¼');
			layer.msg(get_MessageError('[0000-1-021]è¯·éæ©ä¸è¡æ°æ®ä½åºï¼', sessionStorage["HTranSlate"]));
			}
			}
			//#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 è¿è¡ç¼ç
			@@ -875,7 +1091,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) {
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -887,93 +1103,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 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 });
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			})
			}
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			@@ -983,15 +1303,16 @@
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			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 });
			layer.alert(get_MessageError("[0000-1-048]å½åæ¨¡åæ²¡æå¯¼åºæé!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			});
			}
			@@ -1014,6 +1335,7 @@
			$("#HInitTimeCycle").val("29");
			}
			//#endregion

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			@@ -1053,6 +1375,56 @@
			}
			//#endregion


			//#region æ ¹æ®ç¨æ·è·åç¨æ·å³èç»ç»çè¿æ»¤æ¡ä»¶
			function getOrgIDByUser() {
			var res = "";
			$.ajax({
			type: "GET",
			async: false,
			url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //æ¹æ³æå¨é¡µé¢åæ¹æ³å ä¼ å ç»ç»å¿é¡»æ¯åè¡¨å¤´é¨æ¥è¯¢çç»ç» ä¸è½ä½¿ç¨ç¨æ·é»è®¤
			data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HUSEORGID").val() },
			success: function (result) {
			if (result.count == 1) {
			if (result.data[0].sWhere == "1") {
			res = " and çæç»ç» = ''" + $("#HUSEORGID").val() + "''";
			} else {
			res = result.data[0].sWhere;
			}
			}
			}, error: function (err) {
			res = " and 1 = 0";
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion

			//#region è·åç»ç»
			function Organ1() {
			//è·åç»å½é¡µç»ç»å
			$.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].Name + '">' + data[i].Name + '</option>';
			}
			$("#HUSEORGID").append(Organization);
			$("#HUSEORGID").val(sessionStorage["Organization"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

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

			//è·åå½åç¨æ·çé»è®¤è¿æ»¤æ¹æ¡
			@@ -1060,6 +1432,7 @@
			$.ajax({
			url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
			type: "GET",
			async: false,
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -1084,6 +1457,8 @@
			}
			}



			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			@@ -1095,12 +1470,11 @@


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			//get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			form.render("select");
			@@ -1109,11 +1483,11 @@
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			////æ§è¡æ¥è¯¢æ¹æ³
			//get_FastQuery()
			//form.render("select");
			get_FastQuery()
			form.render("select");
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			});
			}
			@@ -1167,10 +1541,10 @@
			layer.close(index)
			} else {
			//å½åé¡µé¢å·²æè¿æ»¤æ¹æ¡ï¼ç¨æ·éæ© æ°å¢æèç¼è¾
			layer.confirm('å½åå·²éæ©è¿æ»¤æ¹æ¡ï¼æ¯å¦ä¿®æ¹ï¼è¯·éæ©å¯¹åºæä½', {
			layer.confirm(get_MessageError('[0000-1-049]å½åå·²éæ©è¿æ»¤æ¹æ¡ï¼æ¯å¦ä¿®æ¹ï¼è¯·éæ©å¯¹åºæä½', sessionStorage["HTranSlate"]), {
			title: "æä½æç¤º",
			icon: 0,
			btn: ['æ°å¢æ¹æ¡', 'ä¿åä¿®æ¹å½åæ¹æ¡', 'åæ¶']
			btn: [get_MessageError('[0000-1-052]æ°å¢æ¹æ¡', sessionStorage["HTranSlate"]), get_MessageError('[0000-1-053]ä¿åä¿®æ¹å½åæ¹æ¡', sessionStorage["HTranSlate"]), get_MessageError('[0000-1-054]åæ¶', sessionStorage["HTranSlate"])]
			}, function (index, layero) {
			//æ°å¢
			layer.open({
			@@ -1211,12 +1585,12 @@
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Xt_FastICScheme/save", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			async: false,
			data: { "oMain": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
			layer.msg(get_MessageError(data.Message, sessionStorage["HTranSlate"]), { time: 1 * 1000, icon: 1 });
			}
			else {

			@@ -1290,6 +1664,7 @@
			$.ajax({
			url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
			type: "GET",
			async: false,
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -1311,11 +1686,11 @@

			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			layer.alert(get_MessageError(data1.code + data1.Message, sessionStorage["HTranSlate"]), { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.alert(get_MessageError("[0000-1-002]æ¥å£è¯·æ±å¤±è´¥!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			});
			}
			@@ -1325,4 +1700,5 @@
			</script>

			</body>
			</html>

			</html>