MES-WEB-LayUI.git

			@@ -368,6 +368,7 @@
			<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>
			</form>
			@@ -451,17 +452,20 @@
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": ""
			, "HProcID": 0, "å·¥ä½ä¸å¿ä»£ç ": "", "HCenterID": 0, "å·¥ä½ä¸å¿": "", "HSupID": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "HWorkQty": 0, "HPassRate": 0, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HWorkQty": 1, "HPassRate": 0, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
			, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
			, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
			, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			, "HProcWorkNum": ""
			}];

			var HModName = "Sc_MouldDotCheckBillList";
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½

			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();

			//å¶åäºº
			$("#HMaker").val(sessionStorage["HUserName"]);
			@@ -479,11 +483,11 @@
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å æ·»å ä¿å
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			var linteridSub = params[params[3]]; //ä»åæ°è·å åè¡¨çº§å«
			//var linteridSub = params[params[3]]; //ä»åæ°è·å åè¡¨çº§å«

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			linteridSub = -1;
			//linteridSub = -1;
			OperationType = 1;
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -500,7 +504,7 @@
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);
			RoadBillMain(linterid, linteridSub);
			RoadBillMain(linterid);
			//RoadBillSub(linterid);
			}

			@@ -517,7 +521,7 @@
			, { field: 'HProcID_S', title: 'å·¥æ®µ', edit: 'text' }
			, { field: 'HProcType', title: 'å·¥åºç±»å', templet: '#HProcType' }//éæ©
			, { field: 'HCenterID_SName', title: 'äº§çº¿ä¸å¿', edit: 'text', event: "CheckHCenterID_S" }//f7
			, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			//, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			, { field: 'HWorkQty_S', title: 'äº§çº¿äº§è½', edit: 'text' }
			, { field: 'HSubStdEmpQty_S', title: 'äº§çº¿äººæ°', edit: 'text' }
			, { field: 'HMouldNo', title: 'æ¨¡å·ç¼å·', edit: 'text' }
			@@ -528,11 +532,11 @@
			, { field: 'HMyWorkDays', title: 'çäº§å¨æ', edit: 'text' }
			, { field: 'HMyFixWorkDays', title: 'åºå®çäº§å¤©æ°', edit: 'text' }
			, { field: 'å·¥åº', title: 'å·¥åº', edit: 'text', event: "CheckHProcID" }//f7
			, { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			//, { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ' }//ä¸å¡«
			, { field: 'HCenterID', title: 'å·¥ä½ä¸å¿id', hide: true }//, hide: true
			//, { field: 'HCenterID', title: 'å·¥ä½ä¸å¿id', hide: true }//, hide: true
			, { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿', edit: 'text', event: "CheckHCenterID" }//f7
			, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			//, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			, { field: 'ä¾åºå', title: 'ä¾åºå', edit: 'text', width: 110, event: "CheckHSupID" }//f7
			, { field: 'HSupFlag', title: 'å¤åæ è®°', templet: "#HSupFlag" }//checkbox
			@@ -715,7 +719,7 @@
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": ""
			, "HProcID": 0, "å·¥ä½ä¸å¿ä»£ç ": "", "HCenterID": 0, "å·¥ä½ä¸å¿": "", "HSupID": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "HWorkQty": 0, "HPassRate": 0, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HWorkQty": 1, "HPassRate": 0, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
			, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
			, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
			@@ -795,6 +799,10 @@
			form.render('select');
			form.render('checkbox');
			}
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});
			@@ -1326,9 +1334,9 @@
			}

			//ç¼è¾ é¡µé¢èµå¼
			function RoadBillMain(linterid, linteridSub)//å è½½è¡¨å¤´
			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
			var sWhere = " and hmainid='" + linterid + "'";
			$.ajax({
			url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
			type: "GET",
			@@ -1377,40 +1385,47 @@
			, "HOrgID": d.data[0].HOrgID
			});

			//åè¡¨ èµå¼
			var rowdata = [{
			"HProcNo": d.data[0].å·¥åºå·, "HProcID_S": d.data[0].å·¥æ®µ, "HProcType": d.data[0].å·¥åºç±»å, "HCenterID_S": d.data[0].HCenterID_S, "HCenterID_SName": d.data[0].äº§çº¿ä¸å¿
			, "HWorkQty_S": d.data[0].äº§çº¿äº§è½, "HSubStdEmpQty_S": d.data[0].äº§çº¿äººæ°, "HMouldNo": d.data[0].æ¨¡å·ç¼å·, "HChangeMould": d.data[0].æ¢æ¨¡æ¶é´, "HPackStd": d.data[0].å¨è½¬ç®±æ å
			, "HPack": d.data[0].å¨è½¬ç®±, "HPutArea": d.data[0].ææ¾åº, "HMyWorkDays": d.data[0].çäº§å¨æ, "HMyFixWorkDays": d.data[0].åºå®çäº§å¤©æ°, "å·¥åº": d.data[0].å·¥åº
			, "HProcID": d.data[0].hprocid, "å·¥ä½ä¸å¿ä»£ç ": d.data[0].å·¥ä½ä¸å¿ä»£ç , "HCenterID": d.data[0].HCenterID, "å·¥ä½ä¸å¿": d.data[0].å·¥ä½ä¸å¿åç§°, "HSupID": d.data[0].HSupID
			, "ä¾åºåä»£ç ": d.data[0].ä¾åºåä»£ç , "ä¾åºå": d.data[0].ä¾åºå, "HSupFlag": d.data[0].å§å¤æ è®° == 0 ? false : true, "HTimeUnit": d.data[0].æ¶é´åä½, "HUnitTime": d.data[0].è¿è¡æ¶é´
			, "HWorkQty": d.data[0].å å·¥æ°é, "HPassRate": d.data[0].è¯ç, "HOverRate": d.data[0].è¶é¢æ¯ä¾, "HReadyTime": d.data[0].åå¤æ¶é´, "HQueueTime": d.data[0].æéæ¶é´
			, "HMoveTime": d.data[0].è½¬ç§»æ¶é´, "HNextProcFlag": d.data[0].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[0].æµè½¬å·¥åº == 0 ? false : true, "HSubStdEmpQty": d.data[0].æ åäººæ°, "HSubCanUseSourceQty": d.data[0].å¯æä½è®¾å¤æ°
			, "HFixPrice": d.data[0].çäº§å®é¢, "HProcPrice": d.data[0].å å·¥åä»·, "HBadPrice": d.data[0].ä¸åæ ¼åä»·, "HWasterPrice": d.data[0].æ¥åºåä»·, "HStdFlag": d.data[0].æ åå®é¢
			, "HBeginDayQty": d.data[0].å¼å·¥ä½éå¤©æ°, "HBeginFixQty": d.data[0].å¼å·¥ä½éåºæ°, "HFixWorkDays": d.data[0].ä¸éåºå®å¤©æ°, "HTrunWorkDays": d.data[0].ä¸éå¾ªç¯å¨æ, "HReadyTimes": d.data[0].æ¬éåå¤æ¶é´
			, "HICMOReadyTimes": d.data[0].æ¢ååå¤æ¶é´, "HAutoTrunFlag": d.data[0].èªå¨ç§»è½¬, "HTechnologyParameter": d.data[0].å·¥èºåæ°, "HPicNum": d.data[0].å¾çº¸ç¼å·, "HProcCheckNote": d.data[0].æ¬å·¥åºç¡®è®¤è®°å½
			, "HProcWorkNum": d.data[0].ç¨åºå·
			}];
			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < d.data.length; i++) {
			rowdata.push(
			{
			"HProcNo": d.data[i].å·¥åºå·, "HProcID_S": d.data[i].å·¥æ®µ, "HProcType": d.data[i].å·¥åºç±»å, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].äº§çº¿ä¸å¿
			, "HWorkQty_S": d.data[i].äº§çº¿äº§è½, "HSubStdEmpQty_S": d.data[i].äº§çº¿äººæ°, "HMouldNo": d.data[i].æ¨¡å·ç¼å·, "HChangeMould": d.data[i].æ¢æ¨¡æ¶é´, "HPackStd": d.data[i].å¨è½¬ç®±æ å
			, "HPack": d.data[i].å¨è½¬ç®±, "HPutArea": d.data[i].ææ¾åº, "HMyWorkDays": d.data[i].çäº§å¨æ, "HMyFixWorkDays": d.data[i].åºå®çäº§å¤©æ°, "å·¥åº": d.data[i].å·¥åº
			, "HProcID": d.data[i].hprocid, "å·¥ä½ä¸å¿ä»£ç ": d.data[i].å·¥ä½ä¸å¿ä»£ç , "HCenterID": d.data[i].HCenterID, "å·¥ä½ä¸å¿": d.data[i].å·¥ä½ä¸å¿åç§°, "HSupID": d.data[i].HSupID
			, "ä¾åºåä»£ç ": d.data[i].ä¾åºåä»£ç , "ä¾åºå": d.data[i].ä¾åºå, "HSupFlag": d.data[i].å§å¤æ è®° == 0 ? false : true, "HTimeUnit": d.data[i].æ¶é´åä½, "HUnitTime": d.data[i].è¿è¡æ¶é´
			, "HWorkQty": d.data[i].å å·¥æ°é, "HPassRate": d.data[i].è¯ç, "HOverRate": d.data[i].è¶é¢æ¯ä¾, "HReadyTime": d.data[i].åå¤æ¶é´, "HQueueTime": d.data[i].æéæ¶é´
			, "HMoveTime": d.data[i].è½¬ç§»æ¶é´, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].æµè½¬å·¥åº == 0 ? false : true, "HSubStdEmpQty": d.data[i].æ åäººæ°, "HSubCanUseSourceQty": d.data[i].å¯æä½è®¾å¤æ°
			, "HFixPrice": d.data[i].çäº§å®é¢, "HProcPrice": d.data[i].å å·¥åä»·, "HBadPrice": d.data[i].ä¸åæ ¼åä»·, "HWasterPrice": d.data[i].æ¥åºåä»·, "HStdFlag": d.data[i].æ åå®é¢
			, "HBeginDayQty": d.data[i].å¼å·¥ä½éå¤©æ°, "HBeginFixQty": d.data[i].å¼å·¥ä½éåºæ°, "HFixWorkDays": d.data[i].ä¸éåºå®å¤©æ°, "HTrunWorkDays": d.data[i].ä¸éå¾ªç¯å¨æ, "HReadyTimes": d.data[i].æ¬éåå¤æ¶é´
			, "HICMOReadyTimes": d.data[i].æ¢ååå¤æ¶é´, "HAutoTrunFlag": d.data[i].èªå¨ç§»è½¬, "HTechnologyParameter": d.data[i].å·¥èºåæ°, "HPicNum": d.data[i].å¾çº¸ç¼å·, "HProcCheckNote": d.data[i].æ¬å·¥åºç¡®è®¤è®°å½
			, "HProcWorkNum": d.data[i].ç¨åºå·
			}
			)
			}
			option.data = rowdata;
			table.render(option);

			if (d.data[0].å§å¤æ è®°) {
			$('#HSupFlag1').attr("checked", true);
			}
			if (d.data[0].HNextProcFlag) {
			$('#HNextProcFlag1').attr("checked", true);
			}
			if (d.data[0].æµè½¬å·¥åº) {
			$('#HFlowProc1').attr("checked", true);
			}
			if (d.data[0].æ åå®é¢) {
			$('#HStdFlag1').attr("checked", true);
			}
			if (d.data[0].èªå¨ç§»è½¬) {
			$('#HAutoTrunFlag1').attr("checked", true);

			for (var i = 0; i < d.data.length; i++) {
			if (d.data[i].å§å¤æ è®°) {
			$('#HSupFlag' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].HNextProcFlag) {
			$('#HNextProcFlag' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].æµè½¬å·¥åº) {
			$('#HFlowProc' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].æ åå®é¢) {
			$('#HStdFlag' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].èªå¨ç§»è½¬) {
			$('#HAutoTrunFlag' + (i + 1)).attr("checked", true);
			}
			$('#HProcType' + (i + 1)).find("option[value='" + d.data[i].å·¥åºç±»å + "']").attr("selected", true);
			}
			form.render('checkbox');
			$('#HProcType1').find("option[value='" + d.data[0].å·¥åºç±»å+ "']").attr("selected", true);
			form.render('select');
			}
			})
			@@ -1429,8 +1444,8 @@
			data.field.HPRDORGID = sessionStorage["OrganizationID"];//ç»ç»
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num);
			var hentryid = linteridSub;//åè¡¨ æåºid
			var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
			//var hentryid = linteridSub;//åè¡¨ æåºid
			var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];

			var index = layer.load();
			$.ajax({
			@@ -1476,14 +1491,14 @@
			layer.msg("äº§åä»£ç æ²¡æéæ©");
			return false;
			}
			if ($("#HUnitName").val() == "") {
			layer.msg("è®¡éåä½æ²¡æéæ©");
			return false;
			}
			if ($("#HMainProcIDName").val() == "") {
			layer.msg("å·¥åºæ²¡æéæ©");
			return false;
			}
			//if ($("#HUnitName").val() == "") {
			// layer.msg("è®¡éåä½æ²¡æéæ©");
			// return false;
			//}
			//if ($("#HMainProcIDName").val() == "") {
			// layer.msg("å·¥åºæ²¡æéæ©");
			// return false;
			//}
			if ($("#HMainCenterIDName").val() == "") {
			layer.msg("å·¥ä½ä¸å¿æ²¡æéæ©");
			return false;
			@@ -1509,6 +1524,123 @@

			}

			//éèåè®¾ç½®
			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 = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			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

			});