MES-WEB-LayUI.git

			@@ -11,6 +11,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>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -92,6 +93,8 @@
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			</div>
			</div>
			</div>
			</div>
			@@ -99,6 +102,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -111,7 +115,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.$
			@@ -122,9 +126,11 @@
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable

			var sWhere = "";
			var option = [];
			var HModName = "JIT_CallGoodsBackRequestBill";
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -141,6 +147,10 @@
			switch (obj.event) {
			//å é¤
			case 'set_DeleteBill': set_DeleteBill();
			break;
			//éèåè®¾ç½®
			case 'HideColumn':
			get_HideColumn();
			break;
			};
			});
			@@ -185,6 +195,7 @@
			//æ¥æåå§å
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			DisPlay_HideColumn();
			}
			//#endregion

			@@ -192,60 +203,54 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 570
			, height: 'full-90'
			, page: 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', width: 110 }*/
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 165 }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 170 }
			, { field: 'éåäºº', title: 'éåäºº', width: 170 }
			, { field: 'éåæ¥æ', title: 'éåæ¥æ', width: 200, templet: "<div>{{d.éåæ¥æ ==null ?'':layui.util.toDateString(d.éåæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'éååå ', title: 'éååå ', width: 170 }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 200, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 170 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 170 }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'æºåç±»å', title: 'æºåç±»å', width: 170 }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 170 }
			, { field: 'æºåå·', title: 'æºåå·', width: 170 }
			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°', width: 170 }
			, { field: 'éæäººä»£ç ', title: 'éæäººä»£ç ', width: 170 }
			, { field: 'éæäºº', title: 'éæäºº', width: 170 }
			, { field: 'æ¬è¿äººä»£ç ', title: 'æ¬è¿äººä»£ç ', width: 170 }
			, { field: 'æ¬è¿äºº', title: 'æ¬è¿äºº', width: 170 }
			, { field: 'éªæ¶äººä»£ç ', title: 'éªæ¶äººä»£ç ', width: 170 }
			, { field: 'éªæ¶äºº', title: 'éªæ¶äºº', width: 170 }
			, { field: 'éææ¨¡å¼', title: 'å«ææ¨¡å¼', width: 170 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 170 }
			, { field: 'æºååå·', title: 'æºååå·', width: 170 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 170 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 170 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 170 }
			, { field: 'è´£ä»»é¨é¨ä»£ç ', title: 'è´£ä»»é¨é¨ä»£ç ', width: 170 }
			, { field: 'è´£ä»»é¨é¨åç§°', title: 'è´£ä»»é¨é¨åç§°', width: 170 }
			, { field: 'è°å¥ä»åº', title: 'è°å¥ä»åº', width: 170 }
			, { field: 'è°å¥ä»ä½', title: 'è°å¥ä»ä½', width: 215 }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 215 }
			, { field: 'è°åºä»ä½', title: 'è°åºä»ä½', width: 215 }
			, { field: 'éåæ°é', title: 'éåæ°é', width: 170 }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 170 }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 170 }
			, { field: 'éæåå ', title: 'éæåå ', width: 170 }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 170 }
			, { field: 'ä¾åºååç§°', title: 'ä¾åºååç§°', width: 170 }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', sort: true }
			, { field: 'è°åºç»ç»', title: 'è°åºç»ç»', width: 160, sort: true }
			, { field: 'è°å¥ç»ç»', title: 'è°å¥ç»ç»', width: 160, sort: true }
			, { field: 'éææ¨¡å¼', title: 'éææ¨¡å¼', width: 160, sort: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 160, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160, sort: true }
			, { field: 'éåæ°é', title: 'éåæ°é', width: 160, sort: true }
			, { field: 'éæåå ', title: 'éæåå ', width: 160, sort: true }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 160, sort: true }
			, { field: 'è°å¥ä»åº', title: 'è°å¥ä»åº', width: 160, sort: true }
			, { field: 'è°å¥ä»ä½', title: 'è°å¥ä»ä½', width: 160, sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 170, sort: true }
			, { field: 'è´£ä»»é¨é¨ä»£ç ', title: 'è´£ä»»é¨é¨ä»£ç ', width: 160, sort: true }
			, { field: 'è´£ä»»é¨é¨åç§°', title: 'è´£ä»»é¨é¨åç§°', width: 160, sort: true }
			, { field: 'éåäºº', title: 'éåäºº', width: 170, sort: true }
			, { field: 'éåæ¥æ', title: 'éåæ¥æ', width: 200, templet: "<div>{{d.éåæ¥æ ==null ?'':layui.util.toDateString(d.éåæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'éååå ', title: 'éååå ', width: 170, sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', sort: true }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', sort: true }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 200, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 170, sort: true }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 170, sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', 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: 'éªæ¶äºº', title: 'éªæ¶äºº', width: 160, sort: true }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160, sort: true }
			, { field: 'è°åºä»ä½', title: 'è°åºä»ä½', width: 160, sort: true }
			]]
			};
			}
			@@ -334,7 +339,7 @@
			$("#MaterialModel").val("");//è§æ ¼åå·
			$("#HDeptName").val("");//çäº§è½¦é´
			$("#ProcMul").val("");//å·¥æ®µ

			form.render('select');
			$("#btnSearch").click();//å·æ°
			sWhere = "";
			}
			@@ -352,7 +357,7 @@
			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });

			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -388,7 +393,7 @@
			HDeptName: HDeptName,
			ProcMul: ProcMul,
			Hmaker: Hmaker,
			HOrgID: HOrgID
			HOrgID: HOrgID,
			}

			get_Display(JSON.stringify(sWhere));
			@@ -435,6 +440,109 @@
			}
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "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", "HBillStatus"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			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 (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 (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["field"], 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

			//ä»¥ä¸æ¯layuiæ¨¡å