MES-WEB-LayUI.git

			@@ -45,66 +45,65 @@
			<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>ä¿®æ¹</button>
			<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			</div>

			<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
			<div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
			</div>
			<div class="layui-col-xs12 layui-inline">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			</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>
			</div>
			<div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			</div>
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>

			<div class="layui-row layui-form-item">
			<!--<div class="layui-inline">
			<div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
			</div>-->
			<!--<div class="" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨ä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			</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" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			</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>
			</div>
			</div>-->
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row layui-form-item">

			</div>
			</div>
			</div>
			<!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			@@ -146,7 +145,11 @@
			, util = layui.util
			, tree = layui.tree
			var sWhere = "";
			var option = [];
			let that = this;
			var HModName = "Gy_CheckItem";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID","ParentID"];
			//tree.render({
			// elem: '#treeCheckItem',
			// data: getData(sWhere),
			@@ -194,53 +197,166 @@
			// }
			//});

			//#region è¿å¥é¡µé¢æ¢å è½½
			//åå§åçé¢
			set_ClearBill();
			//#endregion

			var option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'radio', fixed: 'left' }
			, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
			, { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
			, { field: 'ä»£ç ', title: 'ä»£ç ' }
			, { field: 'åç§°', title: 'åç§°' }
			, { field: 'ççº§', title: 'ççº§' }
			, { field: 'æç»æ è®°', title: 'æç»æ è®°' }
			, { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨' }
			, { field: 'ä½¿ç¨æ è®°', title: 'ä½¿ç¨æ è®°' }
			, { field: 'æ£éªé¡¹ç®ç±»å«ID', title: 'æ£éªé¡¹ç®ç±»å«ID', hide: true }
			, { field: 'æ£éªé¡¹ç®ç±»å«', title: 'æ£éªé¡¹ç®ç±»å«' }
			]]
			};

			var index = layer.load(0, { shade: false });
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Gy_CheckItem/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			};
			});
			//#endregion

			// åå§åçé¢
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			}

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			//, cols: [[
			// { type: 'radio', fixed: 'left' }
			// , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
			// , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
			// , { field: 'ä»£ç ', title: 'ä»£ç ' }
			// , { field: 'åç§°', title: 'åç§°' }
			// , { field: 'ççº§', title: 'ççº§' }
			// , { field: 'æç»æ è®°', title: 'æç»æ è®°' }
			// , { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
			// , { field: 'å¤æ³¨', title: 'å¤æ³¨' }
			// , { field: 'ä½¿ç¨æ è®°', title: 'ä½¿ç¨æ è®°' }
			// , { field: 'æ£éªé¡¹ç®ç±»å«ID', title: 'æ£éªé¡¹ç®ç±»å«ID', hide: true }
			// , { field: 'æ£éªé¡¹ç®ç±»å«', title: 'æ£éªé¡¹ç®ç±»å«' }
			//]]
			};
			}

			//æ¥è¯¢
			function get_Display(sWhere) {
			var index = layer.load(0, { shade: false });
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Gy_CheckItem/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-120'
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			}
			table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			layer.close(index);
			}

			//å¿«éæ¥è¯¢
			function get_FastQuery() {
			var HNumber = $("#HNumber").val();
			var HName = $("#HName").val();
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").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 (HNumber) {
			sWhere += " and ä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and åç§° like '%" + HName + "%'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			//æ°å¢
			form.on('submit(btnAdd)', function (obj) {
			@@ -347,34 +463,25 @@

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			var HNumber = $("#HNumber").val();
			var HName = $("#HName").val();
			if (HNumber) {
			sWhere += " and ä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and åç§° like '%" + HName + "%'";
			}
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Gy_CheckItem/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			get_FastQuery();
			});
			// éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});

			//éç½®å¿«éæ¥è¯¢
			function set_ClearQuery() {
			$("#HNumber").val("");
			$("#HName").val("");
			$("#btnSearch").click();
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');

			sWhere = "";
			}

			//ä¿®æ¹æé®
			form.on('submit(btnModify)', function (data) {
			@@ -432,6 +539,138 @@
			});


			//#region éèåè®¾ç½®
			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);//å³éå¼¹çª
			}
			})
			}
			//#endregion
			//#region æ¾ç¤ºåæ°æ®
			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 = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			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 });
			}
			})
			}
			//#endregion

			//#region åææ¾ç¤ºä¸ææ¡
			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);
			form.render('select');
			}
			//#endregion

			//laydate.render({
			// elem: '#HDate'
			// , type: 'datetime'