MES-WEB-LayUI.git

			@@ -291,7 +291,8 @@
			var params = getUrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			var HProjectStageID = params[params[3]]; //é¶æ®µåç
			var HEntryID = params[params[3]]; //ä»åæ°ä¸è·å åæ®åç
			//var HProjectStageID = params[params[3]]; //é¶æ®µåç

			//#endregion

			@@ -326,23 +327,27 @@
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åé¡¹ç®é¶æ®µè¡¨
			get_InitGrid();

			}
			//else if (OperationType == 2) { //å¤å¶
			// //ç¦ç¨ç»ç»éé¡¹
			// //$("#HOrgID").attr("disabled", true);
			// RoadBillMain(linterid);
			// $.ajax({
			// url: GetWEBURL() + "/Web/GetMAXNum",
			// type: "GET",
			// async: false,
			// data: { "HBillType": '4750' },
			// success: function (d) {
			// $("#HInterID").val(d.data[0].HInterID);
			// $("#HBillNo").val(d.data[0].HBillNo);
			// $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			// }
			// });
			//}
			else if (OperationType == 2) { //æçä»»å¡æ¨¡åä¸æ¨
			////ç¦ç¨ç»ç»éé¡¹
			//$("#HOrgID").attr("disabled", true);
			//çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·
			createBillNo();
			//æ±æ¥äººåå§å
			getHEmpByHUserName();

			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

			//åå§åæ¥æ
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åé¡¹ç®é¶æ®µè¡¨
			get_InitGrid();

			get_Display();
			}
			else if (OperationType == 3) {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¼è¾
			////ç¦ç¨ç»ç»éé¡¹
			//$("#HOrgID").attr("disabled", true);
			@@ -367,6 +372,7 @@
			get_InitGrid();
			//ä¸æ¨-é¡µé¢è®¾ç½®
			set_WorkTaskReport();

			}
			//#endregion

			@@ -590,7 +596,7 @@
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HOrgID").append(Organization);
			if (OperationType == 1 \|\| OperationType == 4) {
			if (OperationType == 1 \|\| OperationType == 4 \|\| OperationType == 2) {
			HOrgIDBar = sessionStorage["OrganizationID"];
			}
			$("#HOrgID").val(HOrgIDBar);
			@@ -757,6 +763,7 @@
			num.push(table.cache["mainTable"][i])
			}
			}

			//è·åç»ç»æ°æ®
			data.field.HPRDORGID = sessionStorage["OrganizationID"];//ç»ç»
			//è¥ä¸ºç¼è¾-ä¿åï¼åæ´æ°ä¿®æ¹äººåä¿®æ¹æ¶é´
			@@ -786,6 +793,8 @@
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			layer.close(index);
			layer.msg("æäº¤æå");
			var datas = num;
			UpdateState(datas);
			}
			else {
			layer.close(index);
			@@ -800,6 +809,40 @@
			}
			//#endregion


			//å¾ªç¯åè¡¨æ°æ®,æ¥çæ¯å¦å®æ,å®æå°±æ´æ°ç¶æä¸ºå·²ç»æ
			function UpdateState(datas) {
			var data = datas;
			for (var i = 0; i < data.length; i++) {
			if (data[i].HFinishFlag == true) {
			var InterID = data[i].HSourceInterID;
			var nums = 2;
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/PM_WorkTaskBill/BeginPM_WorkTaskBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			}
			}

			//#region ç¼è¾ é¡µé¢èµå¼
			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			@@ -1065,7 +1108,11 @@
			if (HRelTimes.substring(HRelTimes.length - 1, HRelTimes.length) == ".") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼èç¨å·¥æ¶æ«å°¾ä¸è½ä¸º.ï¼");
			return;
			} else {
			} else if (HRelTimes == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼èç¨å·¥æ¶ä¸è½ä¸º0ï¼");
			return;
			}
			else {
			var ref = /^[0-9]+\.?[0-9]*$/;
			if (!ref.test(HRelTimes)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼èç¨å·¥æ¶è¯·è¾æ£ç¡®å¥æ°åï¼");
			@@ -1079,9 +1126,9 @@
			//#region åè¡¨å³é®åæ®µéå¤æ£éª
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			temp = option.data[i]["HProjectID"] + "\|" + option.data[i]["HProjectStageID"] + "\|" + option.data[i]["HName"];
			temp = option.data[i]["HProjectID"] + "\|" + option.data[i]["HProjectStageID"] + "\|" + option.data[i]["HName"] + "\|" + option.data[i]["HSourceInterID"] + "\|" + option.data[i]["HSourceEntryID"];
			if ($.inArray(temp, num) != -1) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼é¡¹ç®ä»£ç ãé¡¹ç®é¶æ®µãä»»å¡åç§°éå¤ï¼è¯·éæ°éæ©ï¼");
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ä»»å¡éå¤ï¼è¯·éæ°éæ©ï¼");
			return false;
			}
			num.push(temp);
			@@ -1276,6 +1323,49 @@
			}
			//#endregion

			//#region æ¥è¯¢ æçä»»å¡ä¸æ¨æ¥è¯¢æ°æ®
			function get_Display() {
			var ajaxLoad = layer.load();

			$.ajax({
			url: GetWEBURL() + '/PM_WorkTaskBill/XTList',
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 1) {
			var rowdata = [];
			for (var i = 0; i < data1.data.length; i++) {
			rowdata.push(
			{
			"HName": data1.data[i].ä»»å¡åç§°
			, "HTaskNote": data1.data[i].ä»»å¡æè¿°
			, "HType": data1.data[i].ä»»å¡ç±»å
			, "HProjectID": data1.data[i].HProjectID
			, "HProNumber": data1.data[i].é¡¹ç®ä»£ç
			, "HProjectStageID": data1.data[i].HProjectStageID
			, "HProjectStageName": data1.data[i].é¡¹ç®é¶æ®µ
			, "HSourceInterID": data1.data[i].HInterID
			, "HSourceEntryID": data1.data[i].HEntryID
			, "HSourceBillNo": data1.data[i].åæ®å·
			, "HSourceBillType": data1.data[i].åæ®ç±»å
			, "HRelTimes": data1.data[i].å·²èç¨å·¥æ¶
			});
			}
			option.data = rowdata;
			table.render(option);
			CheckedSet_tableSub();
			form.render('select');
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			}
			//#endregion

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