MES-WEB-LayUI.git

			@@ -228,10 +228,7 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//å è½½æ°æ®å°ç½æ ¼
			//get_FastQuery();
			//DisPlay_HideColumn();
			table.render(option)
			//ColFilter();
			get_FastQuery();
			}

			//åå§åè¡¨æ ¼
			@@ -264,18 +261,20 @@
			function get_Display(sWhere) {
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
			url: GetWEBURL() + '/Cg_PoOrderInStockSumReport/Cg_PoOrderInStockSumReportList',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			var col = [];
			if (data1.count == 1) {
			var totalArray = ["å¼å¸¸è¯å®¡æ¬¡æ°", "è®¡åæ°é", "æ¥åå·¥åºæ°é1", "æ±æ¥å·¥åºæ°é1", "æ±æ¥ä¸åæ ¼å·¥åºæ°é1", "æ¥æ¶å·¥åºæ°é2", "æ±æ¥å·¥åºæ°é2", "æ±æ¥ä¸åæ ¼å·¥åºæ°é2", "æ¥æ¶å·¥åºæ°é3", "æ±æ¥å·¥åºæ°é3", "æ±æ¥ä¸åæ ¼å·¥åºæ°é3", "æ¥æ¶å·¥åºæ°é4","æ±æ¥å·¥åºæ°é4","æ±æ¥ä¸åæ ¼å·¥åºæ°é4","æ¥æ¶å·¥åºæ°é5","æ±æ¥å·¥åºæ°é5","æ±æ¥ä¸åæ ¼å·¥åºæ°é5","æ¥æ¶å·¥åºæ°é6","æ±æ¥å·¥åºæ°é6","æ±æ¥ä¸åæ ¼å·¥åºæ°é6","æ¥æ¶å·¥åºæ°é7","æ±æ¥å·¥åºæ°é7","æ±æ¥ä¸åæ ¼å·¥åºæ°é7"];
			var totalArray = [];
			var data = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å åºå·å
			col.push({ type: 'numbers', fixed: 'left', field: 'åºå·', title:'åºå·' });
			//å¤ææ¯å¦æ¯çº¯è±æ
			var patrn = new RegExp("[\u4E00-\u9FA5]+");
			for (var i = 0; i < data.length; i++) {
			@@ -313,89 +312,12 @@

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var txtHOrderProcNo = $("#txtHOrderProcNo").val();//è®¢åè·è¸ªå·
			var txtHMaterNumber = $("#txtHMaterNumber").val(); //ç©æ
			var txtHDeptName = $("#txtHDeptName").val(); //ç©æ
			var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//å¤éæ¡
			var check = "";
			if (chkHShowUnFinish) {
			check = "Y";
			}
			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;
			}

			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;
			}
			sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
			var HBeginDate = $("#HBeginDate").val();
			var HEndDate = $("#HEndDate").val();
			var HPriceType = $("#HPriceType").val();
			var HSupID = $("#HSupID").val();
			var HWHID = $("#HWHID").val();
			sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HPriceType + "'" + ",'" + HSupID + "'," + HWHID;
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			@@ -403,19 +325,13 @@

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#txtHOrderProcNo").val("");
			$("#txtHMaterNumber").val("");
			$("#txtHDeptName").val("");
			$("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HSupID").val("0");
			$("#HSupName").val("");
			$("#HWHID").val("0");
			$("#HWHName").val("");
			form.render('select');

			sWhere = " ";
			@@ -504,7 +420,7 @@
			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}

			@@ -563,7 +479,7 @@

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {