MES-WEB-LayUI.git

			@@ -49,6 +49,12 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block">
			<input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="åªæ¾ç¤ºæªå®å·¥">
			</div>
			@@ -58,6 +64,7 @@
			</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>
			</div>
			</div>
			@@ -65,7 +72,8 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<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>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<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>
			</div>
			</script>
			</form>
			@@ -95,6 +103,7 @@
			var sWhere = "";
			var option = [];
			var HModName = "Mes_OrderProcFlowAllReport";
			var ins;
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -112,8 +121,24 @@
			case 'btn-exit': Pub_Close(2);
			break;
			//éèåè®¾ç½®
			case 'HideColumn':
			case 'set_HideColumn':
			get_HideColumn();
			break;
			//å¯¼åºexcel
			case 'get_export':
			var data = option.data
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','ï¼'); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, option.data, "xls");
			break;
			};
			});
			@@ -143,6 +168,8 @@
			//å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();
			//DisPlay_HideColumn();

			//ColFilter();
			}

			//åå§åè¡¨æ ¼
			@@ -194,7 +221,8 @@
			}
			option.cols = [col];
			option.data = data1.data;
			table.render(option);
			ins = table.render(option);
			DisPlay_HideColumn();
			layer.close(wait);
			} else {
			layer.close(wait);
			@@ -211,12 +239,87 @@
			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";
			}
			sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'";
			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 + "'";
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			@@ -226,12 +329,38 @@
			function set_ClearQuery() {
			$("#txtHOrderProcNo").val("");
			$("#txtHMaterNumber").val("");
			$("#txtHDeptName").val("");
			$("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
			form.render();
			$("#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');

			sWhere = " ";
			get_FastQuery();
			}

			//åææ¾ç¤ºä¸ææ¡
			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({
			@@ -261,7 +390,7 @@
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			colName += option.cols[0][i]["field"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			@@ -309,6 +438,7 @@
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {
			@@ -319,7 +449,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			@@ -338,6 +470,14 @@
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":