MES-WEB-LayUI.git

			@@ -1,4 +1,4 @@
			ï»¿<!DOCTYPE html>
			ï»¿ <!DOCTYPE html>
			<html>
			<head>
			<meta charset="utf-8" />
			@@ -12,6 +12,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>


			<style type="text/css">
			@@ -57,11 +58,11 @@
			<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">
			<!--<div class="layui-inline">
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
			</div>
			</div>-->
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			@@ -99,6 +100,90 @@
			<input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<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>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -114,6 +199,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -127,7 +213,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			@@ -138,14 +224,27 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];

			var HModName = "sc_Gy_ICBomBillMainList";
			//#endregion

			//#region åå§åçé¢
			set_ClearBill();
			DisPlay_HideColumn();
			//#endregion

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			};
			});

			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			@@ -161,7 +260,18 @@
			get_FastQuery();
			});

			//#region åå»è¿åæ°æ®
			table.on('rowDouble(mainTable)', function (obj) {
			var data = [];
			data.push(obj.data);
			parent.GetICBomValue(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			//#endregion

			//#endregion


			//#region æ¤é¡µé¢ææçæ¹æ³
			// åå§åçé¢
			@@ -170,6 +280,8 @@
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);

			ColFilter();
			//åå§åæ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			@@ -181,38 +293,42 @@
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'åæ®å·', title: 'åæ®å·', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'æºååå·', title: 'æºååå·', width: 160 }
			, { field: 'ä»åº', title: 'ä»åº', width: 160 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 115 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 115 }
			, { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 115 }
			, { field: 'ç¨é', title: 'ç¨é', width: 200 }
			, { field: 'åç¨é', title: 'åç¨é', width: 200 }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 125 }
			, { field: 'å·¥åº', title: 'å·¥åº', width: 125 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 125 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 125 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 125 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 200, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 125 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 125 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 160, sort: true }
			, { field: 'ä»åº', title: 'ä»åº', width: 160, sort: true }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true, sort: true }
			, { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 115, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 115, sort: true }
			, { field: 'hunitid', title: 'hunitid', width: 200, hide: true, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 115, sort: true }
			, { field: 'ç¨é', title: 'ç¨é', width: 200, sort: true, totalRow: true}
			, { field: 'åç¨é', title: 'åç¨é', width: 200, sort: true, totalRow: true}
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 125, sort: true }
			, { field: 'å·¥åº', title: 'å·¥åº', width: 125, sort: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 125, sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 125, sort: true }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 125, sort: true }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 200, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 125, sort: true }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 125, sort: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }

			]]
			};
			@@ -253,6 +369,80 @@
			var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
			var Warehouse = $("#Warehouse").val();//ä»åº
			var Hmaker = $("#Hmaker").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;
			}

			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 (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			@@ -301,7 +491,15 @@
			$("#HSourceBillNo").val("");//æºååå·
			$("#Warehouse").val("");//ä»åº
			$("#Hmaker").val("");//å¶åäºº

			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			sWhere = "";
			}

			@@ -406,6 +604,141 @@
			}
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "åæ®å·", "hsubid", "hmaterid", "hunitid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

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

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}

			//åææ¾ç¤ºä¸ææ¡
			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].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);

			form.render('select');
			}

			//#endregion
			});