MES-WEB-LayUI.git

			@@ -61,6 +61,14 @@
			</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="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" style="margin-left: 120px; width: 185px;">
			<select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
			@@ -69,24 +77,46 @@
			</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">
			</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="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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<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-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-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>
			</div>
			</div>
			<div>
			@@ -176,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 ç¹å»è¡éä¸é«äº®
			@@ -203,6 +265,7 @@
			// åå§åçé¢
			function set_ClearBill() {
			Year(); //åå§åå¹´
			Get_HProject(); //è·åé¡¹ç®å·
			GetGy_Division();//è·åäºä¸é¨
			set_InitGrid(); //åå§åè¡¨æ ¼
			get_FastQuery();
			@@ -261,6 +324,31 @@
			})
			}
			//#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) {
			@@ -342,16 +430,23 @@
			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 HMaterName = $("#HMaterName").val();
			var HDeptID = $("#HDeptID").val();


			sWhere = {
			HYear: HYear
			, HMonth: HMonth
			, HDivisionName: HDivisionName
			, HProcName: HProcName
			, HMaterName: HMaterName
			, HProject: HProject
			, HBatchWork: HBatchWork
			, HDeptID: HDeptID
			}
			get_Display(JSON.stringify(sWhere));
			//å è½½æ±ç¶å¾
			@@ -367,7 +462,8 @@
			$("#HProcName").val("");
			$("#HMaterName").val("");
			$("#HDivisionName").val("");
			$("#btnSearch").click();
			$("#HProject").val("");
			$("#HBatchWork").val("");
			form.render('select');

			sWhere = "";
			@@ -427,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].æ¥æ);
			@@ -442,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 = {
			@@ -472,7 +574,7 @@

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