MES-WEB-LayUI.git

			@@ -121,8 +121,8 @@
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
			<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="0">
			<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="0">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
			<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
			</div>
			</div>
			</div>
			@@ -351,24 +351,24 @@
			get_InitGrid();
			DisPlay_HideColumn();
			RoadBillMain(linterid);
			} else if (OperationType == 4 && HProjectStageID != null) { //ä¸æ¨
			////ç¦ç¨ç»ç»éé¡¹
			//$("#HOrgID").attr("disabled", true);
			} else if (OperationType == 4) { //ä¸æ¨
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);
			//çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·
			//createBillNo();
			////æ±æ¥äººåå§å
			//getHEmpByHUserName();
			createBillNo();
			//æ±æ¥äººåå§å
			getHEmpByHUserName();


			////åå§åå¶åäººåå¶åæ¶é´
			//$("#HMaker").val(sessionStorage["HUserName"]);
			//$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			////åå§åæ¥æ
			//$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			////åå§åé¡¹ç®é¶æ®µè¡¨
			//get_InitGrid();
			////ä¸æ¨-é¡µé¢è®¾ç½®
			//set_WorkTaskReport();
			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åæ¥æ
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åé¡¹ç®é¶æ®µè¡¨
			get_InitGrid();
			//ä¸æ¨-é¡µé¢è®¾ç½®
			set_WorkTaskReport();
			}
			//#endregion

			@@ -377,7 +377,7 @@
			//#endregion

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

			//#endregion
			@@ -590,7 +590,7 @@
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HOrgID").append(Organization);
			if (OperationType == 1) {
			if (OperationType == 1 \|\| OperationType == 4) {
			HOrgIDBar = sessionStorage["OrganizationID"];
			}
			$("#HOrgID").val(HOrgIDBar);
			@@ -612,6 +612,16 @@
			vars[hash[0]] = hash[1];
			}
			return vars;
			}
			//#endregion

			//#region è·ååæ°_ä¼ éçJSONæ ¼å¼åæ°
			function getUrlVars_JSON() {
			var datajson;
			var str = window.location.search; //è·åé¾æ¥ä¸ä¼ éçåæ°
			var arr = str.substring(str.indexOf("=") + 7);
			datajson = $.parseJSON(decodeURI(arr));
			return datajson;
			}
			//#endregion

			@@ -693,7 +703,7 @@
			}
			//#endregion

			//å®ææ è®°
			//#region å®ææ è®°
			form.on('checkbox(HFinishFlag)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			@@ -704,6 +714,7 @@
			}
			});
			});
			//#endregion

			//#region æ±æ¥äººéæ©é¡µé¢
			function get_checkSearchHReportEmp() {
			@@ -849,35 +860,65 @@

			//#region ä¸æ¨-é¡µé¢èµå¼
			function set_WorkTaskReport() {
			$.ajax({
			url: GetWEBURL() + "/PM_ProjectBill/set_WorkTaskReport",
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "HProjectStageID": HProjectStageID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var tableMain = result.data[0];
			var tableSub = result.data[1];

			//ä¸»è¡¨ èµå¼
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HOrgID": tableMain[0]["HOrgID"]
			, "HProID": tableMain[0]["HInterID"]
			, "HProjectStageID": tableMain[0]["HProjectStageID"]
			, "HMainSourceBillNo": tableMain[0]["åæ®å·"]
			, "HMainSourceBillType": tableMain[0]["åæ®ç±»å"]
			});

			//ç»ç»çå¼HOrgIDååï¼éæ°æ¸²æ
			HOrgIDBar = tableMain[0]["HOrgID"];

			//åè¡¨ èµå¼
			for (var i = 0; i < tableSub.length; i++) {
			tableSub[i].RowID = (i + 1) * 10;
			var data = getUrlVars_JSON().data;
			var dataArray = [];
			for (var i = 0; i < data.length; i++) {
			var NewRow =
			{
			"RowID": (i + 1) * 10
			, "HProjectID": data[i].HProjectID
			, "HProNumber": data[i].HProNumber
			, "HProjectStageID": data[i].HProjectStageID
			, "HProjectStageName": data[i].HProjectStageName
			, "HName": data[i].HName
			, "HTaskNote": data[i].HTaskNote
			, "HType": data[i].HType
			, "HRelTimes": "0"
			, "HReportNote": ""
			, "HFinishFlag": false
			, "HAdv": ""
			, "HRemarkSub": ""
			, "HSourceInterID": data[i].HSourceInterID
			, "HSourceEntryID": data[i].HSourceEntryID
			, "HSourceBillNo": data[i].HSourceBillNo
			, "HSourceBillType": data[i].HSourceBillType
			};
			dataArray.push(NewRow);
			}
			option.data = tableSub;

			option.data = dataArray;
			table.render(option);
			}
			})


			//$.ajax({
			// url: GetWEBURL() + "/PM_ProjectBill/set_WorkTaskReport",
			// type: "GET",
			// async: false,
			// data: { "HInterID": linterid, "HProjectStageID": HProjectStageID, "user": sessionStorage["HUserName"] },
			// success: function (result) {
			// var tableMain = result.data[0];
			// var tableSub = result.data[1];

			// //ä¸»è¡¨ èµå¼
			// form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			// "HOrgID": tableMain[0]["HOrgID"]
			// , "HProID": tableMain[0]["HInterID"]
			// , "HProjectStageID": tableMain[0]["HProjectStageID"]
			// , "HMainSourceBillNo": tableMain[0]["åæ®å·"]
			// , "HMainSourceBillType": tableMain[0]["åæ®ç±»å"]
			// });

			// //ç»ç»çå¼HOrgIDååï¼éæ°æ¸²æ
			// HOrgIDBar = tableMain[0]["HOrgID"];

			// //åè¡¨ èµå¼
			// for (var i = 0; i < tableSub.length; i++) {
			// tableSub[i].RowID = (i + 1) * 10;
			// }
			// option.data = tableSub;
			// table.render(option);
			// }
			//})
			}
			//#endregion