MES-WEB-LayUI.git

			@@ -27,6 +27,11 @@
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<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">
			@@ -51,7 +56,90 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now">
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" 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="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" 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>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>

			</div>
			</div>
			</div>
			@@ -108,7 +196,7 @@
			window.HDefaultFilter = "";
			//éæ©çè¿æ»¤æ¹æ¡åç ï¼å¨å±åéï¼
			window.HInterID_Choose = 0;

			var titleData = ["hmainid", "hsubid", "HProcCheckEmpID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#endregion


			@@ -178,6 +266,7 @@
			get_Display(sWhere);
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			ColFilter();
			}
			//#endregion

			@@ -226,6 +315,35 @@
			]]
			};
			}
			//#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: '../æ¥ææ£éªå/QC_Add_Edit_POStockInCheckBillList.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");
			}
			})
			}
			});
			//#endregion

			//var index = layer.load(0, { shade: false });

			@@ -239,6 +357,52 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			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 }); //ä»æ¯ä¸ªå¯¹è±¡ä¸æåæ°æ®
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) { //éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			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 ($.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 });
			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);
			}
			}
			DisPlay_HideColumn();
			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);
			@@ -382,6 +546,81 @@
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var Hmaker = $("#Hmaker").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;
			}
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			@@ -403,10 +642,35 @@
			$("#HBillNo").val("");
			$("#HNumber").val("");
			$("#HName").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			form.render('select');
			sWhere = "";
			}
			//#endregion

			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			@@ -572,6 +836,25 @@
			$("#" + data[i].è¿æ»¤åæ®µID).find("option[value='" + data[i].è¿æ»¤å¼ + "']").attr("selected", true);
			}
			}
			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"));

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

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