MES-WEB-LayUI.git

			@@ -76,6 +76,12 @@
			<input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æID</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaterID" id="HMaterID" style="width:190px;">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -85,6 +91,7 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Detail" id="Detail"><i class="layui-icon layui-icon-search"></i>æ¥çæç»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -104,7 +111,7 @@
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {


			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			@@ -119,26 +126,60 @@
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var columns = "";
			var HModName = "Kf_MaterOutInReport";
			var HModName = "Kf_StockInOutSumQueryReport";
			var titleData = []; //ä¸éè¦æ¾ç¤ºçåæ®µ
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			//è·åé¡µé¢è·³è½¬åæ°
			var params = get_UrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ¥è¯¢
			var HMaterID = params[params[1]]; //ä»åæ°ä¸è·å ç©æid
			if (HMaterID != null) {
			$("#HMaterID").val(HMaterID);
			//è·åå¼å§æ¥æãç»ææ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30 * 6), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			} else {
			//è·åå¼å§æ¥æãç»ææ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			}


			//åå§åçé¢
			set_ClearBill();

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion

			//#region åå§åçé¢
			function set_ClearBill() {
			//è·åå¼å§æ¥æãç»ææ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

			//è·åç»ç»
			Organ();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			get_Display();
			}
			//#endregion

			@@ -304,6 +345,9 @@
			//æ¥è¯¢æé®
			case 'btn_Query': get_Display();
			break;
			//æ¥è¯¢æé®æç»
			case 'btn_Detail': get_Detail();
			break;
			//éåºæé®
			case 'btn_Exit': Pub_Close(2);
			break;
			@@ -330,12 +374,13 @@
			function get_Display() {
			var HBeginDate = $("#HBeginDate").val(); //å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val(); //ç»ææ¥æ
			var HMaterID = $("#HMaterID").val(); //ç©æID
			var HMaterNumber = $("#HMaterNumber").val(); //ç©æç¼ç
			var HMaterName = $("#HMaterName").val(); //ç©æåç§°
			var HWHName = $("#HWHName").val(); //ä»åº
			var HModel = $("#HModel").val(); //è§æ ¼åå·

			sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HWHName + "'" ;
			sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HMaterID + "','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HWHName + "'" ;

			var ajaxLoad = layer.load();
			$.ajax({
			@@ -344,7 +389,7 @@
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.data != null) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -401,8 +446,57 @@
			DisPlay_HideColumn();
			layer.close(ajaxLoad);
			} else {
			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 });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			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 {
			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: 200 });
			break;
			default:
			if (data[i].name == 'æ°é') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			}
			columns = col;

			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			option.cols = [columns];
			option.data = [[]];
			option.totalRow = true;
			table.render(option);
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			/layer.alert(data1.code + data1.Message, { icon: 5 });/
			}
			},
			error: function () {
			@@ -414,6 +508,39 @@
			}
			//#endregion

			//æ¥çæç»
			function get_Detail() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HMaterID = data[0].HMaterID.toString();
			var HMaterName = data[0].ç©æåç§°.toString();
			var HBeginDate = $("#HBeginDate").val();//æ¬ ææ¥æ
			var HEndDate = $("#HEndDate").val();//è³
			var HWHName = data[0].ä»åº.toString();
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çæç»'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: `./Kf_StockInOutEntryByPageReport.html?OperationType=2&HMaterID=${HMaterID}&HMaterName=${HMaterName}&HWHName=${HWHName}&HBeginDate=${HBeginDate}&HEndDate=${HEndDate}`
			, resize: false,
			end: function () {

			}
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æ¥çï¼');
			}
			}

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			@@ -424,6 +551,7 @@
			function set_ClearQuery() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HMaterID").val(""); //ç©æID
			$("#HMaterNumber").val(""); //ç©æç¼ç
			$("#HMaterName").val(""); //ç©æåç§°
			$("#HModel").val(""); //è§æ ¼åå·