MES-WEB-LayUI.git

			@@ -38,6 +38,10 @@
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<h1 style="text-align: center; padding: 10px 0;"><b>å·¡æ£å</b></h1>
			<div class="layui-tab-content">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">snç ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item">
			<div class="layui-row">
			@@ -189,6 +193,7 @@
			</div>
			</div>
			</div>

			</div>
			<div class="layui-form-item">
			<div class="layui-row" style="display:none">
			@@ -219,6 +224,75 @@
			</div>
			</div>
			</div>
			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN1</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote1_SN" id="HQCNote1_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN2</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote2_SN" id="HQCNote2_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN3</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote3_SN" id="HQCNote3_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN4</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote4_SN" id="HQCNote4_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN5</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote5_SN" id="HQCNote5_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN6</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote6_SN" id="HQCNote6_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN7</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote7_SN" id="HQCNote7_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN8</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote8_SN" id="HQCNote8_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN9</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote9_SN" id="HQCNote9_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">æ½æ£SN10</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HQCNote10_SN" id="HQCNote10_SN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			</div>


			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -244,12 +318,14 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></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>
			<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine_Bad"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine_Bad"><i class="layui-icon layui-icon-form"></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>
			<script type="text/html" id="xuhao">
			@@ -324,6 +400,7 @@
			}

			var params = getUrlVars();

			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			var closeType = 2; //å³éç±»å
			@@ -358,6 +435,7 @@

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "7506";
			var HModName = "MES_QC_PatrolProcCheckDetail_Json";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			@@ -374,30 +452,40 @@
			, cols: [[ //è¡¨å¤´
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 75 }
			, { field: 'HQCNote1_SN', title: 'æ½æ£SN1', width: 185, edit: 'text', hide: true }
			, { field: 'HQCNote2_SN', title: 'æ½æ£SN2', width: 185, edit: 'text', hide: true}
			, { field: 'HQCNote3_SN', title: 'æ½æ£SN3', width: 185, edit: 'text', hide: true }
			, { field: 'HQCNote4_SN', title: 'æ½æ£SN4', width: 185, edit: 'text', hide: true }
			, { field: 'HQCNote5_SN', title: 'æ½æ£SN5', width: 185, edit: 'text', hide: true }
			, { field: 'HQCNote6_SN', title: 'æ½æ£SN6', width: 185, edit: 'text', hide: true }
			, { field: 'HQCNote7_SN', title: 'æ½æ£SN7', width: 185, edit: 'text', hide: true }
			, { field: 'HQCNote8_SN', title: 'æ½æ£SN8', width: 185, edit: 'text', hide: true }
			, { field: 'HQCNote9_SN', title: 'æ½æ£SN9', width: 185, edit: 'text', hide: true }
			, { field: 'HQCNote10_SN', title: 'æ½æ£SN10', width: 185, edit: 'text', hide: true }
			, { field: 'æ£éªé¡¹ç®åç±»', title: 'æ£éªé¡¹ç®åç±»', event: "", width: 120 }
			, { field: 'HQCCheckItemID', title: 'æ£éªé¡¹ç®ID', edit: 'text', hide: true }
			, { field: 'HQCCheckItemName', title: 'æ£éªé¡¹ç®åç§°', edit: 'text', width: 230 }
			, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text', event: "", width: 95, hide: true }
			, { field: 'HQCNote1', title: 'æ£éªè®°å½1(09:00--11:00)', width: 185, templet: '#HQCNote1' }
			, { field: 'HQCNote1_SN', title: 'æ½æ£SN1', width: 185, edit: 'text' }

			, { field: 'HQCNote2', title: 'æ£éªè®°å½2(11:00--13:00)', width: 185, templet: '#HQCNote2' }
			, { field: 'HQCNote2_SN', title: 'æ½æ£SN2', width: 185, edit: 'text' }

			, { field: 'HQCNote3', title: 'æ£éªè®°å½3(13:00--15:00)', width: 185, templet: '#HQCNote3' }
			, { field: 'HQCNote3_SN', title: 'æ½æ£SN3', width: 185, edit: 'text' }

			, { field: 'HQCNote4', title: 'æ£éªè®°å½4(15:00--17:00)', width: 185, templet: '#HQCNote4' }
			, { field: 'HQCNote4_SN', title: 'æ½æ£SN4', width: 185, edit: 'text' }

			, { field: 'HQCNote5', title: 'æ£éªè®°å½5(17:00--19:00)', width: 185, templet: '#HQCNote5' }
			, { field: 'HQCNote5_SN', title: 'æ½æ£SN5', width: 185, edit: 'text' }

			, { field: 'HQCNote6', title: 'æ£éªè®°å½6(18:00--20:00)', edit: 'text', width: 185, hide: true }
			, { field: 'HQCNote6_SN', title: 'æ½æ£SN6', width: 185, edit: 'text', hide: true }

			, { field: 'HQCNote7', title: 'æ£éªè®°å½7', edit: 'text', hide: true }
			, { field: 'HQCNote7_SN', title: 'æ½æ£SN7', width: 185, edit: 'text', hide: true }

			, { field: 'HQCNote8', title: 'æ£éªè®°å½8', edit: 'text', hide: true }
			, { field: 'HQCNote8_SN', title: 'æ½æ£SN8', width: 185, edit: 'text', hide: true }

			, { field: 'HQCNote9', title: 'æ£éªè®°å½9', edit: 'text', hide: true }
			, { field: 'HQCNote9_SN', title: 'æ½æ£SN9', width: 185, edit: 'text', hide: true }

			, { field: 'HQCNote10', title: 'æ£éªè®°å½10', edit: 'text', hide: true }
			, { field: 'HQCNote10_SN', title: 'æ½æ£SN10', width: 185, edit: 'text', hide: true }

			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text', width: 120 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 75 }
			]]
			@@ -496,11 +584,21 @@
			"HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
			"HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
			"HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].è¡¨ä½å¤æ³¨,
			"HQCNote1_SN": data[i].æ½æ£SNç 1, "HQCNote2_SN": data[i].æ½æ£SNç 2, "HQCNote3_SN": data[i].æ½æ£SNç 3, "HQCNote4_SN": data[i].æ½æ£SNç 4, "HQCNote5_SN": data[i].æ½æ£SNç 5, "HQCNote6_SN": data[i].æ½æ£SNç 6, "HQCNote7_SN": data[i].æ½æ£SNç 7
			, "HQCNote8_SN": data[i].æ½æ£SNç 8, "HQCNote9_SN": data[i].æ½æ£SNç 9, "HQCNote10_SN": data[i].æ½æ£SNç 10
			/* "HQCNote1_SN": data[i].æ½æ£SNç 1, "HQCNote2_SN": data[i].æ½æ£SNç 2, "HQCNote3_SN": data[i].æ½æ£SNç 3, "HQCNote4_SN": data[i].æ½æ£SNç 4, "HQCNote5_SN": data[i].æ½æ£SNç 5, "HQCNote6_SN": data[i].æ½æ£SNç 6, "HQCNote7_SN": data[i].æ½æ£SNç 7*/
			/, "HQCNote8_SN": data[i].æ½æ£SNç 8, "HQCNote9_SN": data[i].æ½æ£SNç 9, "HQCNote10_SN": data[i].æ½æ£SNç 10/
			});
			}


			$("#HQCNote1_SN").val(data[0].æ½æ£SNç 1 \|\| '');
			$("#HQCNote2_SN").val(data[0].æ½æ£SNç 2 \|\| '');
			$("#HQCNote3_SN").val(data[0].æ½æ£SNç 3 \|\| '');
			$("#HQCNote4_SN").val(data[0].æ½æ£SNç 4 \|\| '');
			$("#HQCNote5_SN").val(data[0].æ½æ£SNç 5 \|\| '');
			$("#HQCNote6_SN").val(data[0].æ½æ£SNç 6 \|\| '');
			$("#HQCNote7_SN").val(data[0].æ½æ£SNç 7 \|\| '');
			$("#HQCNote8_SN").val(data[0].æ½æ£SNç 8 \|\| '');
			$("#HQCNote9_SN").val(data[0].æ½æ£SNç 9 \|\| '');
			$("#HQCNote10_SN").val(data[0].æ½æ£SNç 10 \|\| '');
			option.data = rowdata;
			table.render(option);
			for (var i = 0; i < result.data.length; i++) {
			@@ -542,7 +640,12 @@
			});

			}

			// å¨é¡µé¢å è½½å®æåï¼å¦æå·²æåè¡¨æ°æ®ï¼åæ¥å°è¡¨å¤´
			$(document).ready(function () {
			setTimeout(function () {
			syncSubTableToHeader();
			}, 500);
			});
			//å¤´å·¥å·æ äºä»¶
			var rowid = 0;
			var rows = 0;
			@@ -551,8 +654,9 @@
			, data = checkStatus.data;;
			var AddRow = table.cache['mainTable'];
			var NewRow = {
			"HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " ", "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
			, "HQCNote8_SN": "", "HQCNote9_SN": "", "HQCNote10_SN": ""};
			"HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
			, "HQCNote1_SN": $("#HQCNote1_SN").val() \|\| '', "HQCNote2_SN": $("#HQCNote2_SN").val() \|\| '', "HQCNote3_SN": $("#HQCNote3_SN").val() \|\| '', "HQCNote4_SN": $("#HQCNote4_SN").val() \|\| '', "HQCNote5_SN": $("#HQCNote5_SN").val() \|\| '', "HQCNote6_SN": $("#HQCNote6_SN").val() \|\| '', "HQCNote7_SN": $("#HQCNote7_SN").val() \|\| '', "HQCNote8_SN": $("#HQCNote8_SN").val() \|\| '', "HQCNote9_SN": $("#HQCNote9_SN").val() \|\| '', "HQCNote10_SN": $("#HQCNote10_SN").val() \|\| ''
			};
			switch (obj.event) {
			case 'btn-AddLine':
			//table.cache["mainTable"].push(AddRow[rows]);
			@@ -578,6 +682,10 @@
			table.render(option);//å°æ°æ®æ¸²æå°è¡¨æ ¼ä¸
			//layer.alert(copyrow);
			}
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});
			@@ -1647,9 +1755,43 @@
			}
			});
			})
			// åæ¥è¡¨å¤´SNç å°åè¡¨
			function syncHeaderToSubTable() {
			var tableData = table.cache['mainTable'];
			if (tableData && tableData.length > 0) {
			for (var i = 0; i < tableData.length; i++) {
			tableData[i].HQCNote1_SN = $("#HQCNote1_SN").val() \|\| '';
			tableData[i].HQCNote2_SN = $("#HQCNote2_SN").val() \|\| '';
			tableData[i].HQCNote3_SN = $("#HQCNote3_SN").val() \|\| '';
			tableData[i].HQCNote4_SN = $("#HQCNote4_SN").val() \|\| '';
			tableData[i].HQCNote5_SN = $("#HQCNote5_SN").val() \|\| '';
			}
			table.reload('mainTable', {
			data: tableData
			});
			}
			}

			// åæ¥åè¡¨SNç å°è¡¨å¤´
			function syncSubTableToHeader() {
			var tableData = table.cache['mainTable'];
			if (tableData && tableData.length > 0) {
			var firstRow = tableData[0];
			$("#HQCNote1_SN").val(firstRow.HQCNote1_SN \|\| '');
			$("#HQCNote2_SN").val(firstRow.HQCNote2_SN \|\| '');
			$("#HQCNote3_SN").val(firstRow.HQCNote3_SN \|\| '');
			$("#HQCNote4_SN").val(firstRow.HQCNote4_SN \|\| '');
			$("#HQCNote5_SN").val(firstRow.HQCNote5_SN \|\| '');
			$("#HQCNote6_SN").val(firstRow.HQCNote5_SN \|\| '');
			$("#HQCNote7_SN").val(firstRow.HQCNote5_SN \|\| '');
			$("#HQCNote8_SN").val(firstRow.HQCNote5_SN \|\| '');
			$("#HQCNote9_SN").val(firstRow.HQCNote5_SN \|\| '');
			$("#HQCNote10_SN").val(firstRow.HQCNote5_SN \|\| '');
			}
			}
			form.on('submit(Saver)', function (data) {//ä¿å
			//debugger;
			syncHeaderToSubTable();
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sBadStr = JSON.stringify(table.cache['BadReTable']);
			@@ -1684,7 +1826,125 @@
			layer.alert(sMsg, { icon: 5 });

			}
			//#region åè¡¨1ï¼éèåè®¾ç½®
			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 åè¡¨1ï¼æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			async: false,
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			async: false,
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol.length <= i) {
			break;
			}
			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 (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;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}

			//åæ¶å»ç»å
			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
			//çå¬æäº¤
			form.verify({
			numberOrEmpty: function (value, item) {