MES-WEB-LayUI.git

			@@ -42,7 +42,7 @@
			</select>
			</div>
			</div>
			<div class="layui-inline "style="display:none">
			<div class="layui-inline " style="display:none">
			<label class="layui-form-label" style="width: 85px;">å·¥ä½ä¸å¿</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 120px;">
			<select name="HWorkCenter" id="HWorkCenter" lay-verify="HWorkCenter">
			@@ -57,6 +57,18 @@
			<input type="text" class="layui-input" id="HName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</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>
			@@ -69,12 +81,13 @@

			<div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
			</div>
			<div style="width:99%;height:calc(30vh);">
			<div style="width:99%;height:calc(50vh);">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></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>
			@@ -107,6 +120,7 @@
			var option = [];
			var HModName = "Sc_QualityReportBillMonth";
			var HDeptID = 0;
			var ins;
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -161,7 +175,7 @@
			// å¡«åæ°æ®
			for (let i = 0; i < H_X.length; i++) {
			let month = i + 1; // 1å°12çæä»½
			let year = $("#Hyear").val(); // å½åå¹´ä»½
			let year = $("#HYear").val(); // å½åå¹´ä»½

			// å° monthlyTotals ä¸çæ°éå¡«åå° HProcSumNum ä¸
			if (monthlyTotals[year] && monthlyTotals[year][month]) {
			@@ -257,10 +271,7 @@
			yAxis: [
			{
			type: 'value',
			name: 'çäº§æ°é',
			//min: 0,
			//max: 200000,
			//interval: 10000,
			name: 'çäº§æ°é',
			axisLabel: {
			formatter: '{value}'
			}
			@@ -279,24 +290,44 @@
			series: [
			{
			name: 'æ³¨å¡æ°é',
			type: 'bar',
			type: 'bar',
			tooltip: {
			valueFormatter: function (value) {
			return value;
			}
			},
			itemStyle: {
			normal: {
			label: {
			show: true, //å¼å¯æ¾ç¤º
			textStyle: { //æ°å¼æ ·å¼
			color: 'black',
			fontSize: 16
			}
			}
			},
			color: '#0000FF' // è®¾ç½®æ±ç¶å¾é»è²
			},
			data: HProcSumNum
			},
			{
			name: 'æ³¨å¡è¯ç',
			type: 'line',
			yAxisIndex: 1,
			yAxisIndex: 1,
			label: {
			show: true,
			formatter: '{c}%'
			},
			data: HQualifiedNum
			},
			{
			name: 'å¨æ£è¯ç',
			type: 'line',
			yAxisIndex: 1,
			yAxisIndex: 1,
			label: {
			show: true,
			formatter: '{c}%'
			},
			data: HFirstPassRate
			}
			]
			@@ -313,6 +344,10 @@
			//éåº
			case 'btn-exit': Pub_Close(2);
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//éèåè®¾ç½®
			case 'HideColumn':
			get_HideColumn();
			@@ -326,7 +361,7 @@

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			get_FastQuery(2);
			});

			//éåºæé®
			@@ -345,11 +380,12 @@
			//åå§åçé¢
			function set_ClearBill() {
			Year();

			$("#HBeginDate").val(Format(new Date(new Date().setMonth(new Date().getMonth() - 6)), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();
			get_FastQuery(1);

			//å è½½æ±ç¶å¾
			set_Graphics();
			@@ -372,13 +408,12 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: '200px'
			, height: '600px'
			, totalRow: true
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]

			}
			}

			@@ -390,10 +425,10 @@
			type: "GET",
			async: false,
			data: { "sWhere": sWhere ,"user": sessionStorage["HUserName"] },
			success: function (data1) {
			var col = [];
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			@@ -410,28 +445,33 @@
			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].name, 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, totalRow: true, width: 120 });
			}
			}
			}
			//if (data1.data.length>0) {
			// for (let i = 1; i <= 12; i++) {
			// if (data1.data[0][i + "æ"] != 0) {
			// data1.data[3][i + "æ"] = (data1.data[3][i + "æ"]).toFixed(2) + '%'
			// }
			// else {
			// data1.data[3][i + "æ"] = (0.00).toFixed(2) + '%'
			// }
			// }
			// data1.data[3].åè®¡ = (data1.data[3].åè®¡).toFixed(2) + '%'
			//}


			option.cols = [col];
			option.data = data1.data;

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-80'
			, totalRow: true
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			table.render(option);
			ins = table.render(option);
			layer.close(wait);
			} else {
			layer.close(wait);
			@@ -445,17 +485,21 @@
			}

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			function get_FastQuery(number) {
			var HYear = $("#HYear").val(); //å¹´ä»½
			var HWorkCenter = $("#HWorkCenter").val() != null ? '': $("#HWorkCenter").val(); //å·¥ä½ä¸å¿
			var HName = $("#HName").val();//ç©æåç§°

			var HBeginDate = $("#HBeginDate").val(); //å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val(); //ç»ææ¥æ
			sWhere = {
			HYear: HYear
			, HWorkCenter: HWorkCenter
			, HName: HName
			, HBeginDate: HBeginDate
			, HEndDate: HEndDate
			}
			get_Display(JSON.stringify(sWhere));

			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			//å è½½æ±ç¶å¾
			@@ -468,6 +512,28 @@
			get_Display(JSON.stringify(sWhere));
			}

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins.config.id, option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";