MES-WEB-LayUI.git

			@@ -14,6 +14,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>


			</head>
			@@ -28,6 +29,25 @@
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</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">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -304,6 +324,24 @@
			get_FastQuery(2);
			});
			//#endregion
			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);

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

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

			//#endregion

			@@ -311,6 +349,23 @@

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}

			//æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
			$("#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();

			@@ -346,6 +401,33 @@
			//#endregion


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

			//åæ®å·è¶é¾æ¥
			if (obj.event == 'åæ®å·') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.HInterID.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: '../../è½¦é´ç®¡ç/å¯å¨ç¹æ£å/Gy_WorkBeginDotCheckListBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼
			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			});

			//#region æ¥è¯¢
			function get_Display(sWhere) {
			@@ -357,6 +439,7 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 1) {
			var totalArray = [];
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -368,7 +451,11 @@
			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 ($.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
			@@ -416,7 +503,8 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {

			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProNumber = $("#HProNumber").val();//ç©æä»£ç
			var HName = $("#HName").val();//ç©æåç§°
			@@ -428,6 +516,8 @@
			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) {
			@@ -486,10 +576,16 @@
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			@@ -508,6 +604,9 @@

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HBillNo").val("");
			$("#HProNumber").val("");
			$("#HName").val("");
			@@ -527,7 +626,23 @@
			sWhere = "";
			}
			//#endregion
			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelistæ°ç»åå«ä¸æ¶é´ç¸å³çæ´æ°å¼
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"]; //itilelistä¸valuelistå¼ç¸å¯¹äºçè¡¨ï¼ä¸ä½ä¸ºä¸ææ¡ææ¬æ¾ç¤º

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';//å®ä¹åç¬¦ä¸²HInitTimeCycle_ArrayList ä½ç¨äºä¸æåçhtmlåå®¹ åå«optionåç´ ï¼å¼ä¸ºâ1ï¼ä¸å¨ä¸ææ¡æ¾ç¤ºä»»æé´é
			for (var i = 0; i < valueList.length; i++) { // éåvalueList æ°ç» ä½¿æ¯ä¸ä¸ªå¼çæä¸ä¸ªå¯¹åºoptionåç´
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// æçæçoptionåç´ æ·»å å¥HInitTimeCycle_ArrayListåç¬¦ä¸²ä¸
			}

			$("#HInitTimeCycle").empty(); //ä½¿ç¨jqueryçemptyæ¹æ³æ¸ç©ºHInitTimeCycle_ArrayList <select>åç´ çå¼
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //ä½¿ç¨appendæ¹æ³æå»ºä¹åHInitTimeCycle_ArrayListåç¬¦ä¸² çåå®¹ä¼ å¥HInitTimeCycle
			form.render('select'); //è°ç¨ éæ°æ¸²æselectåç´

			$("#HInitTimeCycle").val("29"); //ä½¿ç¨jQueryçval()æ¹æ³å°ä¸æåè¡¨çéä¸å¼è®¾ç½®ä¸º"29 ï¼ä¸æ¾ç¤ºãè¿ä¸æå¤©ã
			}
			//#endregion
			//#region æ°å¢
			function set_AddNew() {
			layer.open({
			@@ -765,7 +880,7 @@

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			//var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HSourceID", "HProcID", "HCheckNoteItemID", "HCheckPostID"];
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {