MES-WEB-LayUI.git

			@@ -14,6 +14,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/grwebapp.js"></script>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -90,7 +91,89 @@

			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row">

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select 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;">
			<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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<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;">
			<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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -98,6 +181,8 @@
			<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="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>-->
			</div>
			@@ -109,6 +194,7 @@
			</div>

			<script>
			var OptionData = [];
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			@@ -128,6 +214,7 @@
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var ins;//åå¨æ°æ® å¯¼åºåè½éè¦ç¨å°çåæ°
			var HModName = "Sc_ProdOrderPickingStatusReport";
			//#endregion

			@@ -148,6 +235,12 @@
			//éèåè®¾ç½®
			case 'HideColumn':
			get_HideColumn();
			break;
			//å¯¼åºæé®
			case 'btn_Export': get_Export();
			break;
			//æå°
			case 'btn-print': get_PrintReport();
			break;
			};
			});
			@@ -180,6 +273,7 @@
			//å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();
			//DisPlay_HideColumn();
			ColFilter();
			}

			//åå§åè¡¨æ ¼
			@@ -188,6 +282,7 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, totalRow: true
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, height: 'full-70'
			};
			@@ -226,6 +321,13 @@
			case 'DateTime':
			col.push({ field: data[i].name, 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;
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
			break;
			default:
			col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
			}
			@@ -234,7 +336,10 @@
			option.cols = [col];
			option.data = data1.data;
			table.render(option);
			ins = table.render(option);

			layer.close(wait);

			} else {
			layer.close(wait);
			layer.alert(data1.Message, { icon: 5 });
			@@ -255,6 +360,79 @@
			var HMaterNumber = $("#HMaterNumber").val();
			var HMaterName = $("#HMaterName").val();
			var HMaterModel = $("#HMaterModel").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;
			}

			sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HICMOBillNo + "','" + HMaterNumber + "','" + HMaterName + "','" + HMaterModel + "','" + HDeptName + "'"

			@@ -272,8 +450,83 @@
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HMaterModel").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			sWhere = " ";
			get_FastQuery();
			}

			//åææ¾ç¤ºä¸ææ¡
			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');
			}
			//å¯¼åºExecel
			function get_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}

			//æå°
			function get_PrintReport() {

			var data = table.cache['mainTable']
			if (data.length > 0) {
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Sc_ProdOrderPickingStatusReport', 'yes']
			, resize: false
			, end: function () {
			if (OptionData.length > 0) {
			var GrfName = OptionData[0].HName;

			var dataPrint = [];
			for (var i = 0; i < data.length; i++) {
			dataPrint.push(data[i])
			}

			var Customer = {
			"Table": dataPrint
			}

			var args = {
			type: "preview",
			//showOptionDlg: false, //å¦æä¸æ¾ç¤ºæå°å¯¹è¯æ¡èç´æ¥æå°ï¼å°æ¤è¡æ³¨éå»æå³å¯
			report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
			data: Customer
			};

			webapp_ws_ajax_run(args);
			OptionData = [];
			}

			}
			})
			} else {
			layer.msg("æ æ°æ®,æ æ³æå°!");
			}

			}

			//ç©æ
			@@ -285,7 +538,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -295,9 +548,9 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HMaterModel").val(checkStatus.data[0].HModel);
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterModel").val(checkStatus.data[0].è§æ ¼åå·);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			})
			@@ -410,6 +663,10 @@

			//#endregion
			});
			//åå»è¿åçäº§èµæº
			function ReportPrint(data) {
			OptionData = data
			}
			</script>
			</body>
			</html>