MES-WEB-LayUI.git

			@@ -148,11 +148,6 @@
			get_FastQuery();
			});

			//ç©æ
			form.on('submit(btnHMaterID)', function (data) {//éæ©ä»ä½
			get_btnHMaterID();
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			@@ -168,10 +163,7 @@

			table.render(option);
			//å è½½æ°æ®å°ç½æ ¼
			//get_FastQuery();
			//DisPlay_HideColumn();

			//ColFilter();
			get_FastQuery();
			}

			//åå§åè¡¨æ ¼
			@@ -204,18 +196,20 @@
			function get_Display(sWhere) {
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
			url: GetWEBURL() + '/Xs_SeOrderOutStockSumReport/Xs_SeOrderOutStockSumReportList',
			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++) {
			@@ -253,89 +247,11 @@

			//å¿«éè¿æ»¤
			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(); //ç©æ

			sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HPriceType + "'";
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			@@ -343,92 +259,18 @@

			//éç½®è¿æ»¤æ¡ä»¶
			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");
			form.render('select');

			//æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			sWhere = " ";
			get_FastQuery();
			}
			//éå®è®¢åä¸ææ¡
			function HOrderBillNo() {
			//è·åç»å½é¡µç»ç»å
			var HOrderBillNo = '<option style="color:blue;" value=""></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Mes_OrderProcFlowAllReport/getHSeOrderBillNo",
			async: false,
			data: { "sWhere": "", "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HOrderBillNo += '<option style="color:blue;" value="' + data[i]["HSeOrderBillNo"] + '">' + data[i]["HSeOrderBillNo"] + '</option>';
			}

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

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization); $("#ColName1").empty();
			$("#ColName1").append(Organization); $("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion
			//ç©æ
			function get_btnHMaterID() {
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'ç©æ'
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.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('è¯·éæ©æ°æ®');
			}
			$("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			})
			}

			//éèåè®¾ç½®
			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"] + ",";
			}

			@@ -487,7 +329,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) {