MES-WEB-LayUI.git

			@@ -38,15 +38,7 @@
			<!--å¨ææ¸²æå¹´ä»½-->
			</select>
			</div>
			</div>
			<div class="layui-inline" style="display:none">
			<label class="layui-form-label">è½¦é´</label>
			<div class="layui-input-block" style="width: 190px;">
			<select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
			<!--å¨ææ¸²æé¨é¨-->
			</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: 185px;">
			@@ -71,9 +63,12 @@
			<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" style="width: 85px;">ç©æç¼ç </label>
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æç¼ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
			<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			@@ -182,6 +177,12 @@
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});

			//#region äº§åç¼ç
			form.on('submit(btnHMaterID)', function (data) {
			btnHMaterID();
			});
			//#endregion
			//#endregion

			//#region ç¹å»è¡éä¸é«äº®
			@@ -208,8 +209,7 @@
			//#region æ¤é¡µé¢æææ¹æ³
			// åå§åçé¢
			function set_ClearBill() {
			Year(); //åå§åå¹´
			DeptName();//åå§åè½¦é´
			Year(); //åå§åå¹´
			Get_HProject(); //è·åé¡¹ç®å·
			GetGy_Division();//è·åäºä¸é¨
			set_InitGrid(); //åå§åè¡¨æ ¼
			@@ -321,7 +321,6 @@
			//å¿«éæ¥è¯¢
			function get_FastQuery() {
			var HYear = $("#HYear").val();
			var HDeptName = $("#HDeptName").val();//è½¦é´
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HMaterName = $("#HMaterName").val();//ç©æåç§°
			@@ -329,8 +328,7 @@
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨

			sWhere = {
			HYear: HYear
			, HDeptName: HDeptName
			HYear: HYear
			, HProject: HProject
			, HMaterNumber: HMaterNumber
			, HMaterName: HMaterName
			@@ -345,8 +343,7 @@
			}
			//éç½®å¿«éæ¥è¯¢
			function set_ClearQuery() {
			$("#HYear").val(new Date().getFullYear());
			$("#HDeptName").val("0");
			$("#HYear").val(new Date().getFullYear());
			$("#HProject").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			@@ -476,15 +473,15 @@
			},
			itemStyle: {
			normal: {
			color: '#808080', // ä¿®æ£ä½ç½®ï¼å°é¢è²è®¾ç½®å¨è¿é
			label: {
			show: true, //å¼å¯æ¾ç¤º
			textStyle: { //æ°å¼æ ·å¼
			show: true,
			textStyle: {
			color: 'black',
			fontSize: 16
			}
			}
			},
			color: '#1E90FF' // è®¾ç½®æ±ç¶å¾èè²
			}
			},
			data: HBackWorkQty
			},
			@@ -498,25 +495,25 @@
			tooltip: {
			valueFormatter: function (value) {
			return value;
			}
			}
			},
			itemStyle: {
			normal: {
			color: '#FF0000', // ä¿®æ£ä½ç½®ï¼å°é¢è²è®¾ç½®å¨è¿é
			label: {
			show: true, //å¼å¯æ¾ç¤º
			textStyle: { //æ°å¼æ ·å¼
			show: true,
			textStyle: {
			color: 'black',
			fontSize: 16
			}
			}
			},
			color: '#FFFF00' // è®¾ç½®æ±ç¶å¾é»è²
			}
			},
			data: HWasterQty_Work
			},
			{
			name: 'æåº',
			type: 'bar',
			type: 'bar',
			stack: 'Ad',
			emphasis: {
			focus: 'series'
			@@ -528,21 +525,22 @@
			},
			itemStyle: {
			normal: {
			color: '#FFFF00', // ä¿®æ£ä½ç½®ï¼å°é¢è²è®¾ç½®å¨è¿é
			label: {
			show: true, //å¼å¯æ¾ç¤º
			textStyle: { //æ°å¼æ ·å¼
			show: true,
			textStyle: {
			color: 'black',
			fontSize: 16
			}
			}
			},
			color: '#FF8C00' // è®¾ç½®æ±ç¶å¾æ©è²
			}
			},
			data: HWasterQty_Mater
			},
			{
			name: 'ä¸æ¬¡åæ ¼ç',
			type: 'line',
			yAxisIndex: 1, // ä½¿ç¨ç¬¬äºä¸ª yAxis æ¾ç¤ºç¾åæ¯
			label: {
			show: true,
			formatter: '{c}%'
			@@ -565,6 +563,7 @@
			{
			name: 'ç®æ å¼',
			type: 'line',
			yAxisIndex: 1, // ä½¿ç¨ç¬¬äºä¸ª yAxis æ¾ç¤ºç¾åæ¯
			label: {
			show: true,
			formatter: '{c}%'
			@@ -667,9 +666,10 @@
			series: [
			{
			name: 'å·¥æç',
			type: 'line',
			type: 'line',
			label: {
			show: true
			show: true,
			formatter: '{c}%'
			},
			itemStyle: {
			normal: {
			@@ -685,7 +685,8 @@
			name: 'æåºç',
			type: 'line',
			label: {
			show: true
			show: true,
			formatter: '{c}%'
			},
			itemStyle: {
			normal: {
			@@ -941,6 +942,32 @@
			}
			//#endregion

			//ç©æåè¡¨
			function btnHMaterID() {
			layer.open({
			type: 2 //ç±»å
			, skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç©æåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.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('è¯·éæ©æ°æ®');
			}
			//è·åæ°æ®
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}


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