MES-WEB-LayUI.git

			@@ -38,94 +38,51 @@
			<!--å¨ææ¸²æå¹´ä»½-->
			</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;">
			<select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
			<option value="">è¯·éæ©</option>
			<option value="1">éäº§</option>
			<option value="0">ééäº§</option>
			</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="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
			<!--å¨ææ¸²æç»ç»-->
			</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" style="width: 85px;">ç©æç¼ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
			</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 ForFilteringSchemes" 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>
			<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" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div>
			@@ -243,7 +200,9 @@
			//#region æ¤é¡µé¢æææ¹æ³
			// åå§åçé¢
			function set_ClearBill() {
			Year(); //åå§åå¹´
			Year(); //åå§åå¹´
			Get_HProject(); //è·åé¡¹ç®å·
			GetGy_Division();//è·åäºä¸é¨
			set_InitGrid(); //åå§åè¡¨æ ¼
			get_FastQuery();
			//å è½½æ±ç¶å¾
			@@ -353,105 +312,36 @@
			//å¿«éæ¥è¯¢
			function get_FastQuery() {
			var HYear = $("#HYear").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;
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HMaterName = $("#HMaterName").val();//ç©æåç§°
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨

			sWhere = {
			HYear: HYear
			, HProject: HProject
			, HMaterNumber: HMaterNumber
			, HMaterName: HMaterName
			, HBatchWork: HBatchWork
			, HDivisionName: HDivisionName
			}
			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 = '" + HYear + "'";
			}
			get_Display(sWhere);
			get_Display(JSON.stringify(sWhere));
			//å è½½æ±ç¶å¾,æçº¿å¾
			set_Graphics();
			set_Graphics1();
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å

			}
			//éç½®å¿«éæ¥è¯¢
			function set_ClearQuery() {
			$("#HYear").val(new Date().getFullYear());
			$("#HYear").val(new Date().getFullYear());
			$("#HProject").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HBatchWork").val("");
			$("#HDivisionName").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");
			$("#btnSearch").click();
			form.render('select');

			sWhere = "";
			@@ -574,15 +464,15 @@
			},
			itemStyle: {
			normal: {
			color: '#808080', // ä¿®æ£ä½ç½®ï¼å°é¢è²è®¾ç½®å¨è¿é
			label: {
			show: true, //å¼å¯æ¾ç¤º
			textStyle: { //æ°å¼æ ·å¼
			show: true,
			textStyle: {
			color: 'black',
			fontSize: 16
			}
			}
			},
			color: '#1E90FF' // è®¾ç½®æ±ç¶å¾èè²
			}
			},
			data: HBackWorkQty
			},
			@@ -596,25 +486,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'
			@@ -626,21 +516,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}%'
			@@ -663,6 +554,7 @@
			{
			name: 'ç®æ å¼',
			type: 'line',
			yAxisIndex: 1, // ä½¿ç¨ç¬¬äºä¸ª yAxis æ¾ç¤ºç¾åæ¯
			label: {
			show: true,
			formatter: '{c}%'
			@@ -802,6 +694,83 @@
			}
			//#endregion

			//çäº§è½¦é´
			function DeptName() {
			//è·åè½¦é´å
			var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			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++) {
			if (i == 0)
			HDeptName += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			else
			HDeptName += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';

			}
			$("#HDeptName").append(HDeptName);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

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

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
			@@ -859,6 +828,7 @@
			})
			}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({