MES-WEB-LayUI.git

			@@ -61,104 +61,59 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
			<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>
			<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>
			<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>
			<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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<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:5px">
			<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 class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</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 class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
			</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 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>
			@@ -207,7 +162,7 @@
			var option = [];
			var HModName = "Sc_StationOutBil_HProc";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["å¹´", "æ", "å·¥åºåç§°"];
			var titleData = ["å¹´", "æ", "å·¥åºåç§°","æ³¨å¡äºä¸é¨","ç©æåç§°"];


			var ins; //ç¨äºå¯¼åºexcel
			@@ -251,6 +206,38 @@
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});
			//#region éæ©é¨é¨æé®
			form.on('submit(btnHDept)', function () {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "é¨é¨åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index]; //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å³éå¼¹çª å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function () {
			//å·æ°åè¡¨
			get_FastQuery();
			}
			})
			});
			//#endregion
			//#endregion

			//#region ç¹å»è¡éä¸é«äº®
			@@ -278,6 +265,8 @@
			// åå§åçé¢
			function set_ClearBill() {
			Year(); //åå§åå¹´
			Get_HProject(); //è·åé¡¹ç®å·
			GetGy_Division();//è·åäºä¸é¨
			set_InitGrid(); //åå§åè¡¨æ ¼
			get_FastQuery();
			//å è½½æ±ç¶å¾
			@@ -297,6 +286,7 @@

			};
			}

			//å¹´
			function Year() {
			var yyyy = new Date().getFullYear();
			@@ -309,6 +299,57 @@
			$("#HMonth").val(new Date().getMonth() + 1);
			form.render('select');
			}

			//#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

			//#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

			//æ¥è¯¢
			function get_Display(sWhere) {
			var index = layer.load(0, { shade: false });
			@@ -346,35 +387,19 @@
			}
			}
			}
			if ($("#HMaterName").val() != "" && $("#HProcName").val() != "") {
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-80'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			ins = table.render(option);
			} else {
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: []
			, height: 'full-80'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			ins = table.render(option);
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-80'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			ins = table.render(option);

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			@@ -400,120 +425,45 @@
			});
			layer.close(index);
			}

			//å¿«éæ¥è¯¢
			function get_FastQuery() {
			var HYear = $("#HYear").val();
			var HMonth = $("#HMonth").val();
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨
			var HProcName = $("#HProcName").val();
			var HMaterName = $("#HMaterName").val();
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var HDeptID = $("#HDeptID").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;
			sWhere = {
			HYear: HYear
			, HMonth: HMonth
			, HDivisionName: HDivisionName
			, HProcName: HProcName
			, HMaterName: HMaterName
			, HProject: HProject
			, HBatchWork: HBatchWork
			, HDeptID: HDeptID
			}
			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 (HYear) {
			sWhere += " and å¹´ = '" + HYear + "'";
			}
			if (HMonth) {
			sWhere += " and æ = '" + HMonth + "'";
			}
			if (HProcName) {
			sWhere += " and å·¥åºåç§° like '%" + HProcName + "%'";
			}
			if (HMaterName) {
			sWhere += " and ç©æåç§° like '%" + HMaterName + "%'";
			}
			get_Display(sWhere);
			get_Display(JSON.stringify(sWhere));
			//å è½½æ±ç¶å¾
			set_Graphics();
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å

			}

			//éç½®å¿«éæ¥è¯¢
			function set_ClearQuery() {
			$("#HYear").val(new Date().getFullYear());
			$("#HMonth").val(new Date().getMonth() + 1);
			$("#HProcName").val("");
			$("#HMaterName").val("");
			$("#btnSearch").click();
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#HDivisionName").val("");
			$("#HProject").val("");
			$("#HBatchWork").val("");
			form.render('select');

			sWhere = "";
			@@ -573,8 +523,14 @@
			var HBadCount = [];//ä¸è¯æ°é
			var HBackWorkQty = [];//è¿å·¥æ°
			var FistPass = [];//ä¸æ¬¡åæ ¼
			var HProcTarGetVal = [];//åå·¥åºç®æ å¼
			var Pass = [];//åæ ¼
			var HTitle = "åå·¥åºè¶å¿å¾";//å¾å½¢æ é¢
			var HTitle = "";//å¾å½¢æ é¢
			if ($("#HProcName").val() == "") {
			HTitle = "åå·¥åºè¶å¿å¾";
			} else {
			HTitle = $("#HProcName").val() + "è¶å¿å¾";
			}
			if (option.data.length > 0) {
			for (let i = 0; i < option.data.length; i++) {
			H_X.push(option.data[i].æ¥æ);
			@@ -588,7 +544,7 @@
			HBackWorkQty.push(option.data[i].è¿å·¥æ°);
			FistPass.push((option.data[i].ä¸æ¬¡åæ ¼ç == null ? '0.00%' : option.data[i].ä¸æ¬¡åæ ¼ç ).replace('%', ''));
			Pass.push((option.data[i].åæ ¼ç == null ? '0.00%' : option.data[i].åæ ¼ç).replace('%', ''))

			HProcTarGetVal.push(option.data[i].åå·¥åºç®æ å¼);
			}
			}
			option_ZZT = {
			@@ -618,7 +574,7 @@

			},
			legend: {
			data: ['çäº§æ»æ°', 'è¯åæ°', 'ä¸è¯æ°','è¿å·¥æ°','ä¸æ¬¡åæ ¼ç','åæ ¼ç'],
			data: ['çäº§æ»æ°', 'è¯åæ°', 'ä¸è¯æ°', 'è¿å·¥æ°', 'ä¸æ¬¡åæ ¼ç', 'åæ ¼ç','åå·¥åºç®æ å¼'],
			top: 'bottom', // å°å¾ä¾æ¾ç½®å¨å¾è¡¨çä¸æ¹
			left: 'center' // æè 'right'ï¼æ ¹æ®éè¦è°æ´æ°´å¹³ä½ç½®
			},
			@@ -787,6 +743,19 @@
			lineStyle: {
			color: '#1E90FF' // è®¾ç½®æçº¿å¾èè²
			}
			},
			{
			name: 'åå·¥åºç®æ å¼',
			type: 'line',
			yAxisIndex: 1, // ä½¿ç¨ç¬¬äºä¸ª yAxis æ¾ç¤ºç¾åæ¯
			data: HProcTarGetVal,
			label: {
			show: true,
			formatter: '{c}%'
			},
			lineStyle: {
			color: '#FF0000' // è®¾ç½®æçº¿å¾èè²
			}
			}
			]
			};