MES-WEB-LayUI.git

			@@ -12,6 +12,9 @@
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/HideButton_New.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/common.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -32,10 +35,25 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">å¶åäºº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy" id="HCreateBy">
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			@@ -58,14 +76,7 @@
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			</div>
			<div class="layui-colla-content">
			<div class="layui-row">
			<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			</div>
			<div class="layui-colla-content">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -97,12 +108,12 @@
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" class="ForFilteringSchemes" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -117,19 +128,19 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" 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:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
			<select name="ColName2" id="ColName2" lay-filter="ColName2" class="ForFilteringSchemes" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -144,7 +155,7 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			@@ -152,18 +163,23 @@
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-edit"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>å¯¼å¥</button>
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btnAdd"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btnModify"><i class="layui-icon layui-icon-edit"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btndelete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>å¯¼å¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_UnDelete" id="btn_UnDelete"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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="get_Refresh" id="get_Refresh"><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>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></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>
			</div>
			@@ -203,9 +219,13 @@
			var HModuleType = "3913";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);

			var ins; //ç¨äºå¯¼åºexcel
			var HBillType = "3913";
			var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			//#endregion

			var titleData = ["hmainid", "ç¹æ£é¡¹ç®ID", "è´è´£äººID", "hbilltype", "HMoudType", "hsubid", "åé¨åæ®å·"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "ç¹æ£é¡¹ç®ID", "è´è´£äººID", "hbilltype", "HMoudType", "hsubid", "åé¨åæ®å·", "åå¤æ³¨", "HDotCheckItemClassID","HDotCheckItemMethodID","åæ®ç±»å"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#region ãè¿æ»¤æ¹æ¡ã

			//è¿æ»¤æ¡ä»¶çclassç±»
			@@ -223,8 +243,6 @@
			//#region è¿å¥é¡µé¢å³å è½½
			//åå§åè¡¨æ ¼
			set_ClearBill();
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			//#endregion

			//#region é¡µé¢æé®ç¹æ£äºä»¶è§¦å
			@@ -235,6 +253,9 @@
			break;
			//ç¼è¾æé®
			case 'btnModify': set_ShowBill();
			break;
			//å¤å¶
			case 'set_Copy': set_Copy();
			break;
			//å é¤æé®
			case 'btndelete': set_DeleteBill();
			@@ -254,6 +275,19 @@
			//åå³é
			case 'set_CancelCloseBill': set_CloseBill(2);
			break;
			//ä½åº
			case 'btn_Delete': btn_Delete(1);
			break;
			//åä½åº
			case 'btn_UnDelete': btn_Delete(2);
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			@@ -261,7 +295,7 @@
			case 'get_Exit': Pub_Close(2);
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			break;
			//ä¿åæ¹æ¡
			case 'set_SaveScheme': set_SaveScheme();
			@@ -272,6 +306,13 @@
			};
			});

			//èªå®ä¹äºä»¶
			table.on("tool(mainTable)", function (obj) {
			let data = obj.data;
			switch (obj.event) {
			case "onBillNumberClickHandler": onBillNumberClickHandler(data); break;
			}
			})

			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			@@ -311,17 +352,49 @@
			get_Refresh();
			});

			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#BenginHCreateDate').prop('disabled', true);
			$('#EndHCreateDate').prop('disabled', true);

			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));

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

			//#endregion

			//åå§åè¡¨æ ¼
			function set_ClearBill() {
			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			if (HInitTimeCycle != -1) {
			$('#BenginHCreateDate').prop('disabled', true);
			$('#EndHCreateDate').prop('disabled', true);
			} else {
			$('#BenginHCreateDate').prop('disabled', false);
			$('#EndHCreateDate').prop('disabled', false);
			}
			//åå§åç»ç»
			Organ();
			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			//set_InitGrid();
			set_InitGrid();

			//æ¥è¯¢
			//get_Display(sWhere);
			get_Display(sWhere);
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			}
			@@ -375,6 +448,7 @@
			function get_Display(sWhere) {
			var index = layer.load();
			var ajaxLoad = layer.load();
			sWhere += addSWhereByOpenType();//æ·»å åæ®æ¨¡åéæ©åºç¡èµææ¶çè¿æ»¤æ¡ä»¶ï¼å·²å®¡æ ¸æªå³é
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
			@@ -394,6 +468,13 @@
			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 if (data[i].name == 'åæ®å·') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'onBillNumberClickHandler', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			}
			else {
			switch (data[i].Type) {
			@@ -420,7 +501,7 @@
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 780
			, height: "full-130"
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			@@ -430,16 +511,20 @@
			soulTable.render(this);
			}
			}
			table.render(option);
			//table.render(option);

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

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

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			//å·æ°æé®æ¾ç¤º
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -458,10 +543,11 @@
			var HCreateBy = $("#HCreateBy").val();//å¶åäºº
			var BenginHCreateDate = $("#BenginHCreateDate").val();//å¼å§å¶åæ¶é´
			var EndHCreateDate = $("#EndHCreateDate").val();//ç»æå¶åæ¶é´
			var HOrgID = $("#HOrgID").val();

			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			@@ -527,7 +613,7 @@
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			@@ -543,6 +629,9 @@
			}
			if (EndHCreateDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + EndHCreateDate + "'";
			}
			if (HOrgID) {
			sWhere += " and HUSEORGID = '" + HOrgID + "'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -612,6 +701,29 @@
			}
			}

			//å¤å¶
			function set_Copy() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var linterid = data[0].hmainid.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ°å¢' + HPageTitle
			, shift: 0//å¼¹åºå¨ç»
			, content: '../è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}


			//å é¤
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -650,13 +762,38 @@
			}
			}

			//#region å¯¼åºExecel
			function btn_Export() {
			option.data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//å®¡æ ¸/åå®¡æ ¸
			function set_CheckBill(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			debugger
			if (data.length == 1) {
			layer.confirm("ç¡®è®¤è¦å®¡æ ¸å?", function (index) {
			if (num == 1 && isEmpty(data[0]["å®¡æ ¸äºº"]) === false) {
			layer.alert("å®¡æ ¸å¤±è´¥: åæ®å·²è¢«å®¡æ ¸!", { icon: 5 })
			return
			}
			else if (num == 2 && isEmpty(data[0]["å®¡æ ¸äºº"]) === true) {
			layer.alert("åå®¡æ ¸å¤±è´¥: åæ®æªè¢«å®¡æ ¸!", { icon: 5 })
			return
			}
			layer.confirm("ç¡®è®¤è¦"+ (num == 1 ? "å®¡æ ¸" : "åå®¡æ ¸") +"å?", function (index) {
			var wait = layer.load();
			var HInterID = data[0].hmainid;
			$.ajax({
			@@ -684,23 +821,57 @@
			}

			//å³é/åå³é
			function set_CloseBill(num) {
			//function set_CloseBill(num) {
			// var checkStatus = table.checkStatus('mainTable')
			// , data = checkStatus.data;

			// if (data.length == 1) {
			// layer.confirm("ç¡®è®¤è¦å³éå?", function (index) {
			// var wait = layer.load();
			// var HInterID = data[0].hmainid;
			// $.ajax({
			// url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
			// type: "GET",
			// data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
			// success: function (result) {
			// if (result.count == 1) {
			// get_FastQuery();
			// layer.msg(result.Message, { icon: 1 });
			// layer.close(wait);
			// } else {
			// layer.alert(result.code + result.Message, { icon: 5 });
			// layer.close(wait);
			// }
			// }, error: function () {
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// layer.close(wait);
			// }
			// });
			// })
			// }
			// else {
			// layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
			// }
			//}

			//#region ä½åº/åä½åº
			function btn_Delete(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			if (data.length == 1) {
			layer.confirm("ç¡®è®¤è¦å³éå?", function (index) {
			layer.confirm("ç¡®è®¤è¦ä½åºå?", function (index) {
			var wait = layer.load();
			var HInterID = data[0].hmainid;
			$.ajax({
			url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
			url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/DeleteSb_EquipDotCheckRuleBill',
			type: "GET",
			data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			get_FastQuery();
			layer.msg(result.Message, { icon: 1 });
			layer.close(wait);
			get_FastQuery();
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.close(wait);
			@@ -715,14 +886,17 @@
			else {
			layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
			}
			}
			}
			//#endregion

			//å·æ°
			function get_Refresh() {
			$("#HBillNo").val("");//åæ®å·
			$("#HCreateBy").val("");//å¶åäºº
			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBillNo").val("");//åæ®å·
			$("#HCreateBy").val("");//å¶åäºº
			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			@@ -735,118 +909,7 @@
			form.render('select');
			sWhere = "";
			get_Display(sWhere);
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

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


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			/* var titleData = ["hmainid", "ç¹æ£é¡¹ç®ID", "è´è´£äººID", "hbilltype", "HMoudType","hsubid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±*/

			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);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}

			}

			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			@@ -863,6 +926,74 @@
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion

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

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
			}

			$("#HInitTimeCycle").empty();
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
			form.render('select');

			$("#HInitTimeCycle").val("29");
			}
			//#endregion

			//#region è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			}
			//#endregion

			//#region å¤ææ¯ç´æ¥æå¼é¡µé¢è¿æ¯å¶å®é¡µé¢éè¿éæ©æé®æå¼ï¼å¹¶æ¾ç¤ºç¸åºæ°æ®
			function addSWhereByOpenType() {
			//è·ååæ°
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var addSWhere = "";
			if (typeof (openType) != "undefined") {
			addSWhere = " and isnull(å³éäºº,'') = '' and å®¡æ ¸äºº != ''";
			}
			return addSWhere;
			}
			//#endregion

			@@ -896,6 +1027,24 @@
			$("#" + data[i].è¿æ»¤åæ®µID).find("option[value='" + data[i].è¿æ»¤å¼ + "']").attr("selected", true);
			}
			}

			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#BenginHCreateDate').prop('disabled', true);
			$('#EndHCreateDate').prop('disabled', true);

			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));


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

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			form.render("select");
			@@ -1072,6 +1221,31 @@
			})
			}

			//#region èªå®ä¹äºä»¶çå¬
			function onBillNumberClickHandler(data) {
			var linterid = data.hmainid;
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})

			}
			//#endregion

			//#endregion

			//ä»¥ä¸æ¯layuiæ¨¡å