MES-WEB-LayUI.git

			@@ -102,6 +102,7 @@
			</div>
			<script type="text/html" id="toolbarDemo1">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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>
			@@ -117,7 +118,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {

			//#region å¬å±åé
			var $ = layui.$
			@@ -131,8 +132,9 @@
			, soulTable = layui.soulTable
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "QC_RegistrationForTestingReport";
			var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID", "HInterIDLKY","HInterIDSZB"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//#endregion

			@@ -152,6 +154,9 @@
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			};
			});
			@@ -216,20 +221,20 @@

			var columns = [];
			columns.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			columns.push({ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 180});
			columns.push({ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 180 });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true, width: 180 });
			columns.push({ field: 'ç©æ', title: 'ç©æ', sort: true, width: 110 });
			columns.push({ field: 'å·¥åº', title: 'å·¥åº', sort: true, width: 110 });
			columns.push({ field: 'æ¹æ¬¡å·', title: 'æ¹æ¬¡å·', sort: true, width: 110 });
			columns.push({ field: '(1)äº§ååé/g', title: '(1)äº§ååé/g', sort: true, totalRow: true, width: 140});
			columns.push({ field: '(2)äº§ååé/g', title: '(2)äº§ååé/g', sort: true, totalRow: true, width: 140});
			columns.push({ field: '(3)äº§ååé/g', title: '(3)äº§ååé/g', sort: true, totalRow: true, width: 140});
			columns.push({ field: 'éæµåå®¹', title: 'éæµåå®¹', sort: true, width: 110});
			columns.push({ field: 'éæµæ°é', title: 'éæµæ°é', sort: true, totalRow: true, width: 110});
			columns.push({ field: 'éæµæ¶é´', title: 'éæµæ¶é´', sort: true, width: 180});
			columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110});
			columns.push({ field: 'åæ¶æ°é', title: 'åæ¶æ°é', sort: true, totalRow: true, width: 110});
			columns.push({ field: 'åæ¶æ¶é´', title: 'åæ¶æ¶é´', sort: true, width: 180});
			columns.push({ field: '(1)äº§ååé/g', title: '(1)äº§ååé/g', sort: true, totalRow: true, width: 140 });
			columns.push({ field: '(2)äº§ååé/g', title: '(2)äº§ååé/g', sort: true, totalRow: true, width: 140 });
			columns.push({ field: '(3)äº§ååé/g', title: '(3)äº§ååé/g', sort: true, totalRow: true, width: 140 });
			columns.push({ field: 'éæµåå®¹', title: 'éæµåå®¹', sort: true, width: 110 });
			columns.push({ field: 'éæµæ°é', title: 'éæµæ°é', sort: true, totalRow: true, width: 110 });
			columns.push({ field: 'éæµæ¶é´', title: 'éæµæ¶é´', sort: true, width: 180 });
			columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110 });
			columns.push({ field: 'åæ¶æ°é', title: 'åæ¶æ°é', sort: true, totalRow: true, width: 110 });
			columns.push({ field: 'åæ¶æ¶é´', title: 'åæ¶æ¶é´', sort: true, width: 180 });
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo1'
			@@ -238,7 +243,7 @@
			//, cellMinWidth: 'auto'
			, totalRow: true
			, limit: 500
			, data:[]
			, data: []
			, limits: [50, 500, 5000, 20000]
			//, done: function (res, curr, count) {
			// soulTable.render(this);
			@@ -272,6 +277,20 @@
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if (data[i].name == 'ä¸åæ ') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'ä¸åæ ', templet: function (d) {
			return '<span style="color: blue;">' + d.ä¸åæ + '</span>'
			}, style: 'cursor: pointer;'
			});
			}
			else if (data[i].name == 'è½®å»ä»ª') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'è½®å»ä»ª', templet: function (d) {
			return '<span style="color: blue;">' + d.è½®å»ä»ª + '</span>'
			}, style: 'cursor: pointer;'
			});
			}
			else {
			switch (data[i].Type) {
			@@ -311,15 +330,10 @@
			option.data = data1.data
			}


			table.render(option);

			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			//if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			// ColFilter();
			//}

			layer.close(ajaxLoad);
			} else {
			@@ -343,10 +357,10 @@
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨


			sWhere = {
			HBeginDate: HBeginDate
			,HEndDate: HEndDate
			, HEndDate: HEndDate
			, HMaterID: HMaterID
			, HBatchNo: HBatchNo
			, HProject: HProject
			@@ -422,6 +436,126 @@
			//#endregion


			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event == 'ä¸åæ ') {
			const HBillNo = data.ä¸åæ .substring(0, 2);
			var linterid = data.HInterIDSZB;
			if (HBillNo == "SJ") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çé¦ä»¶æ£éªå'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../é¦ä»¶æ£éªå/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			else if (HBillNo == "XJ") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çå·¡æ£è®°å½å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å·¡æ£è®°å½å/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			else if (HBillNo == "GX") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çæ«æ£æ£éªå'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å·¥åºæ£éªå/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			}
			if (obj.event == 'è½®å»ä»ª') {
			const HBillNo = data.è½®å»ä»ª.substring(0, 2);
			var linterid = data.HInterIDLKY;
			if (HBillNo == "SJ") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çé¦ä»¶æ£éªå'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../é¦ä»¶æ£éªå/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			else if (HBillNo == "XJ") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çå·¡æ£è®°å½å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å·¡æ£è®°å½å/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			else if (HBillNo == "GX") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çæ«æ£æ£éªå'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å·¥åºæ£éªå/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			}
			});

			//#region å¯¼åºExecel
			function btn_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";