MES-WEB-LayUI.git

			@@ -9,6 +9,8 @@
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>

			</head>
			<body>

			@@ -65,7 +67,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add" ><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="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>
			</div>
			</script>
			@@ -91,7 +93,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
			}).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer','soulTable'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			@@ -99,12 +101,19 @@
			, laydate = layui.laydate
			, table = layui.table
			, form = layui.form
			, soulTable = layui.soulTable
			, element = layui.element;



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

			//åå§åè¡¨æ ¼
			set_InitGrid();
			DisPlay_HideColumn();
			//#region è¿å¥é¡µé¢å³å è½½

			//å¤ææä½ç±»å
			@@ -137,6 +146,9 @@
			break;
			//åå®¡æ ¸æé®
			case 'btn-DeAudit': set_AbandonCheck();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//éåºæé®
			case 'btn_Exit': Pub_Close(1);
			@@ -174,37 +186,41 @@
			, cellMinWidth: 100
			, height: 'full-50'
			, page: true
			, totalRow: true
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡'}
			, { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
			, { field: 'è¡¨å¤´å¤æ³¨ ', title: 'è¡¨å¤´å¤æ³¨', width: 105 }
			, { field: 'ç©æ', title: 'ç©æ' }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'ç©æå¤§ç±»ä»£ç ', title: 'ç©æå¤§ç±»ä»£ç ' }
			, { field: 'ç©æå¤§ç±»åç§°', title: 'ç©æå¤§ç±»åç§°', width: 115 }
			, { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ', width: 115 }
			, { field: 'åä½åç§°', title: 'åä½åç§°' }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 160 }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 160 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 160 }
			, { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 160 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 160 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 160, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 160 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 160, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº ', title: 'ä¿®æ¹äºº', width: 215 }
			, { field: 'ä¿®æ¹æ¥æ ', title: 'ä¿®æ¹æ¥æ ', width: 115, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº' }
			, { field: 'å³éæ¥æ ', title: 'å³éæ¥æ', width: 100, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			, { field: 'è¡¨å¤´å¤æ³¨ ', title: 'è¡¨å¤´å¤æ³¨', width: 105, sort: true }
			, { field: 'ç©æ', title: 'ç©æ', sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true }
			, { field: 'ç©æå¤§ç±»ä»£ç ', title: 'ç©æå¤§ç±»ä»£ç ', sort: true }
			, { field: 'ç©æå¤§ç±»åç§°', title: 'ç©æå¤§ç±»åç§°', width: 115, sort: true }
			, { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ', width: 115, 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, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 160, sort: true }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 160, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'ä¿®æ¹äºº ', title: 'ä¿®æ¹äºº', width: 215, sort: true }
			, { field: 'ä¿®æ¹æ¥æ ', title: 'ä¿®æ¹æ¥æ ', width: 115, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å³éäºº', title: 'å³éäºº', sort: true }
			, { field: 'å³éæ¥æ ', title: 'å³éæ¥æ', width: 100, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', sort: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', sort: true }

			]]
			};
			@@ -217,7 +233,7 @@
			$.ajax({
			url: GetWEBURL() + "/QC_Management/MES_QC_CheckProjectList_Json",
			type: "GET",
			data: { "sWhere": sWhere },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (result) {
			if (result.count == 1) {
			option.data = result.data;
			@@ -320,7 +336,7 @@
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetQCCheckProject", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "DeltetQCCheckProject", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			@@ -357,6 +373,124 @@

			}

			//éèåè®¾ç½®
			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"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			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