MES-WEB-LayUI.git

			@@ -26,11 +26,7 @@
			<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" style="width: 85px;">å¹´</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 85px;">
			@@ -65,10 +61,10 @@
			<!--å¨ææ¸²æå¹´ä»½-->
			</select>
			</div>
			</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: 125px;">
			<div class="layui-input-block" style="margin-left: 120px; width: 140px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æå¹´ä»½-->
			</select>
			@@ -78,90 +74,55 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">

			</div>
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<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>
			<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<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="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
			<option value="">è¯·éæ©</option>
			<option value="1">éäº§</option>
			<option value="0">ééäº§</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: 10px;">
			<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>
			<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="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
			<!--å¨ææ¸²æç»ç»-->
			</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;">
			<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>
			<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="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</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="HResult" id="HResult" lay-verify="HResult">
			<option value="">è¯·éæ©</option>
			<option value="æ¥åº">æ¥åº</option>
			<option value="è¿å·¥">è¿å·¥</option>
			<option value="ç¹é">ç¹é</option>
			<option value="æ¾è¡">æ¾è¡</option>
			<option value="å·¥åº">å·¥åº</option>
			<option value="æåº">æåº</option>
			<option value="æ ·ä»¶ä¿ç">æ ·ä»¶ä¿ç</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å·¥åºåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			</div>
			@@ -177,6 +138,7 @@
			</div>
			<script type="text/html" id="toolbarDemo1">
			<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-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			@@ -206,6 +168,7 @@
			, soulTable = layui.soulTable
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "QC_QualityStatisticsDailyReport";
			var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			@@ -227,6 +190,9 @@
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			};
			});
			@@ -250,7 +216,8 @@
			Year();
			DeptName();
			Organ();
			//set_InitGrid();
			Get_HProject(); //è·åé¡¹ç®å·
			GetGy_Division();//è·åäºä¸é¨
			//æ¥è¯¢
			get_FastQuery();
			}
			@@ -267,6 +234,12 @@
			$("#HMonth").val(new Date().getMonth()+1);
			form.render('select');
			}

			//#region å¯¼åºExecel
			function btn_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//çäº§è½¦é´
			function DeptName() {
			@@ -318,6 +291,43 @@
			}
			})
			}

			//å·¥åº
			form.on('submit(btnHProc)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å·¥åºåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HProcName").val(checkStatus.data[0].å·¥åºåç§°);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});

			function set_InitGrid() {

			@@ -371,7 +381,7 @@

			option.data=data1.data
			table.render(option);

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

			@@ -397,87 +407,21 @@
			var HMonth = $("#HMonth").val();
			var HDeptName = $("#HDeptName").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();
			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 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}


			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨
			var HResult = $("#HResult").val();//å¤å®ç»æ
			var HProcName = $("#HProcName").val();//å·¥åºåç§°
			sWhere = {
			HYear: HYear
			, HMonth: HMonth
			, HDeptName: HDeptName
			, HOrgID: HOrgID
			, HProject: HProject
			, HBatchWork: HBatchWork
			, HDivisionName: HDivisionName
			, HResult: HResult
			, HProcName: HProcName
			}
			set_InitGrid();
			get_Display(JSON.stringify(sWhere));
			@@ -488,15 +432,11 @@
			$("#HICMOBillNo").val("");
			$("#HBardCode").val("");
			$("#HProcExchBillNo").val("");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#HProject").val("");
			$("#HBatchWork").val("0");
			$("#HDivisionName").val("0");
			$("#HBatchWork").val("");
			$("#HDivisionName").val("");
			form.render('select');

			sWhere = "";
			@@ -636,6 +576,56 @@
			}
			//#endregion

			//#region è·åé¡¹ç®å·
			function Get_HProject() {
			//è·åé¡¹ç®å·
			var HProjectList = '<option value="" style="color:red;" selected></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_HProject",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			}
			$("#HProject").append(HProjectList);
			form.render('select');

			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region è·åäºä¸é¨
			function GetGy_Division() {
			//è·åäºä¸é¨
			var HDivisionList = '<option value="" style="color:red;" selected></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			}
			$("#HDivisionName").append(HDivisionList);
			form.render('select');

			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//ä»¥ä¸æ¯layuiæ¨¡å
			});