MES-WEB-LayUI.git

			@@ -15,6 +15,8 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -23,8 +25,8 @@
			/* .layui-table-cell {
			height: auto;
			white-space: normal;
			} */
			</style>
			} */
			</style>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -90,13 +92,13 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<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-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="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<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-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>

			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			</div>
			</script>
			</form>
			@@ -109,7 +111,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			@@ -119,6 +121,7 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			@@ -134,40 +137,50 @@
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			case 'btn-Delete':
			case 'btn-Delete':
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});
			if (checkStatus.data.length == 0 \|\| checkStatus.data.length > 300) {
			layer.msg('è¯·éæ©è¦å é¤çæ°æ®,ä¸éä¸è¡æ°ä¸è½è¶è¿300è¡ï¼');
			return;
			}
			var mainid = "";
			var BarCode = "";
			for (i = 0; i < data.length; i++) {
			mainid += data[i].hmainid.toString() + ",";
			BarCode += data[i].æ¡ç ç¼å·.toString() + ",";
			}

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			mainid = mainid.substring(0, mainid.length - 1)
			BarCode = BarCode.substring(0, BarCode.length - 1)

			var oData = JSON.stringify(mainid) + ";" + sessionStorage["HUserName"] + ";" + JSON.stringify(BarCode);

			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "oData": oData },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			});
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			})
			break;
			case 'btn-print':
			var checkStatus = table.checkStatus('mainTable')
			@@ -202,6 +215,12 @@
			break;
			//éåºæé®
			case 'btn-exit': Pub_Close(2);
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "æ¡ç ä¸»æ¡£";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			@@ -274,47 +293,57 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, limits: [50, 500, 5000, 20000]
			, limit: 50
			, limits: [50, 500, 5000, 20000,50000]
			, limit: 50
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			,{ field: 'hmainid', title: 'åæ®ID', hide: true }
			, { field: 'æ¡ç ç±»å', title: 'æ¡ç ç±»å', width: 160 }
			, { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·', width: 160 }
			, { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 250 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 250 }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 200 }
			, { field: 'HAuxPropID', title: 'HAuxPropID', width: 200 }
			, { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 160 }
			, { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 160 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 160 }
			, { field: 'æ°é', title: 'æ°é', width: 200 }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 200 }
			, { field: 'æºååå·', title: 'æºååå·', width: 200 }
			, { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 200 }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 200 }
			, { field: 'è¿ææ¥æ', title: 'è¿ææ¥æ', width: 200 }
			, { field: 'è¿ææ¥æå¨', title: 'è¿ææ¥æå¨', width: 115 }
			, { field: 'å®¢æ·åå·', title: 'å®¢æ·åå·', width: 115 }
			, { field: 'å¾æ¥åä½', title: 'å¾æ¥åä½', width: 200 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			, { field: 'è½¦é´', title: 'è½¦é´', width: 115 }
			, { field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ', width: 200 }
			, { field: 'æå·', title: 'æå·', width: 200 }
			, { field: 'æ»ææ°', title: 'æ»ææ°', width: 200 }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200 }
			, { field: 'å¶ä½äºº', title: 'å¶ä½äºº', width: 115 }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°', width: 200 }
			, { field: 'ä½åºæ è®°', title: 'ä½åºæ è®°', width: 200 }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 115 }
			, { field: 'çäº§å¥åºæ¥æ', title: 'çäº§å¥åºæ¥æ', width: 200, templet: "<div>{{d.çäº§å¥åºæ¥æ ==null ?'':layui.util.toDateString(d.çäº§å¥åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'éå®åºåºæ¥æ', title: 'éå®åºåºæ¥æ', width: 200, templet: "<div>{{d.éå®åºåºæ¥æ ==null ?'':layui.util.toDateString(d.éå®åºåºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			]]
			, { field: 'hmainid', title: 'åæ®ID', hide: true, sort: true }
			, { field: 'æ¡ç ç±»å', title: 'æ¡ç ç±»å', width: 160, sort: true }
			, { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·', width: 160, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 250, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 250, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 200, sort: true }
			, { field: 'çå·', title: 'çå·', width: 200, sort: true }
			, { field: 'é¢å·å·', title: 'é¢å·å·', width: 200, sort: true }
			, { field: 'æ¡ç ç¶æ', title: 'æ¡ç ç¶æ', width: 200, sort: true }
			, { field: 'åå', title: 'åå', width: 200, sort: true }
			, { field: 'æåå·', title: 'æåå·', width: 200, 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: 200, templet: "<div>{{d.ä¿è´¨æè³ ==null ?'':layui.util.toDateString(d.ä¿è´¨æè³, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
			, { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', width: 160, sort: true }
			, { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 160, sort: true }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 160, sort: true }
			, { field: 'æ°é', title: 'æ°é', width: 200, sort: true }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 200, sort: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200, sort: true }
			, { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 200, sort: true }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 200, sort: true }
			, { field: 'è¿ææ¥æ', title: 'è¿ææ¥æ', width: 200, sort: true }
			, { field: 'è¿ææ¥æå¨', title: 'è¿ææ¥æå¨', width: 115, sort: true }
			, { field: 'å®¢æ·åå·', title: 'å®¢æ·åå·', width: 115, sort: true }
			, { field: 'å¾æ¥åä½', title: 'å¾æ¥åä½', width: 200, sort: true }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
			, { field: 'è½¦é´', title: 'è½¦é´', width: 115, sort: true }
			, { field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ', width: 200, sort: true }
			, { field: 'æå·', title: 'æå·', width: 200, sort: true }
			, { field: 'æ»ææ°', title: 'æ»ææ°', width: 200, sort: true }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200, sort: true }
			, { field: 'å¶ä½äºº', title: 'å¶ä½äºº', width: 115, 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: 200, sort: true }
			, { field: 'ä½åºæ è®°', title: 'ä½åºæ è®°', width: 200, sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 115, 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: 200, templet: "<div>{{d.éå®åºåºæ¥æ ==null ?'':layui.util.toDateString(d.éå®åºåºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			]]
			};

			}
			@@ -337,6 +366,10 @@
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "æ¡ç ä¸»æ¡£";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -454,6 +487,12 @@
			} else {
			table.render(option);
			}

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "æ¡ç ä¸»æ¡£";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}