MES-WEB-LayUI.git

			@@ -200,18 +200,8 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è®¢åççº§</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<select name="HOrderLevID" id="HOrderLevID" lay-filter="HOrderLevID" style="width:120px;">
			<select name="HOrderLevID" id="HOrderLevID" lay-filter="HOrderLevID" style="width:120px;" >
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å¬ä¿æ¬¡æ°</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HHasten" name="HHasten" id="HHasten" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly >

			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHHasten" id="btnSearchHHasten" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			</div>
			@@ -427,7 +417,7 @@
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			var HEntryID = params[params[3]]; //å·¥ç¨é¡¹ç®ååç

			var HSouceBillType = params[params[2]]; //æºåç±»å
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -442,6 +432,8 @@
			//#region ä»»å¡ç±»åç±»åä¸ææ¡æ¾ç¤º
			ColFilter();
			//#endregion
			//åå§åè®¢åççº§
			HOrderLev();

			//#region å¤æå¹¶è®¾ç½®æä½ç±»åãé¡µé¢åå§å
			if (OperationType == null \|\| OperationType == 1) { //æ°å¢
			@@ -464,8 +456,9 @@
			//æä»¶éæ©åå§å
			PicUpload();

			//åå§åè®¢åççº§
			HOrderLev();




			}
			//else if (OperationType == 2) { //å¤å¶
			@@ -485,11 +478,13 @@
			// });
			//}
			else if (OperationType == 3) {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			//åå§åè®¢åççº§
			HOrderLev();

			//ç¼è¾
			////ç¦ç¨ç»ç»éé¡¹
			//$("#HOrgID").attr("disabled", true);



			//åå§åé¡¹ç®é¶æ®µè¡¨
			RoadBillMain(linterid);

			@@ -497,6 +492,7 @@
			PicUpload();
			//å±ç¤ºå·²ä¸ä¼ çæä»¶
			getFileList_loaded();


			} else if (OperationType == 4 && HProjectStageID != null) { //ä¸æ¨
			////ç¦ç¨ç»ç»éé¡¹
			@@ -517,19 +513,21 @@


			//ä¸æ¨-é¡µé¢è®¾ç½®
			set_WorkTaskReport();
			//é¡¹ç®éæ±åé®é¢æ¸å ä¸æ¨å·¥ä½ä»»å¡ é¡µé¢èµå¼å¦æçäº 4759 å°±æ¯é¡¹ç®éæ±åé®é¢æ¸åçä¸æ¨
			if (HSouceBillType == 4759) {
			CustomerTaskRoadBillMain();
			} else {
			set_WorkTaskReport();
			}

			//æä»¶éæ©åå§å
			PicUpload();
			//åå§åè®¢åççº§
			HOrderLev();

			}
			//#endregion

			//#region åå§åç»ç»
			//#region åå§åç»ç»
			Organ();
			//#endregion


			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			@@ -656,7 +654,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);
			@@ -683,10 +681,7 @@
			Order += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
			}
			$("#HOrderLevID ").append(Order);
			//if (OperationType == 1) {
			// HOrgIDBar = sessionStorage["OrganizationID"];
			//}
			//$("#HOrderLevID ").val(HOrgIDBar);

			form.render('select');
			}
			layer.closeAll("loading");
			@@ -696,12 +691,7 @@
			//#endregion


			//#region è·åå¬ä¿æ¬¡æ°
			document.getElementById('btnSearchHHasten').addEventListener('click', function () {
			var input = document.getElementById('HHasten');
			input.value = parseInt(input.value) + 1;
			});


			//#endregion

			//#region è·ååæ°
			@@ -1056,6 +1046,9 @@
			function set_AddNew(data) {
			//è·åç»ç»æ°æ®
			data.field.HPRDORGID = sessionStorage["OrganizationID"];//ç»ç»
			if (data.field.HOrderLevID == "") {
			data.field.HOrderLevID = 0;
			}
			//è¥ä¸ºç¼è¾-ä¿åï¼åæ´æ°ä¿®æ¹äººåä¿®æ¹æ¶é´
			if (OperationType == 3) {
			data.field.HUpdater = sessionStorage["HUserName"];
			@@ -1128,7 +1121,6 @@
			, "HRemark": tableMain[0]["HRemark"]
			, "HOrgID": tableMain[0]["HOrgID"]
			, "HOrderLevID": tableMain[0]["HOrderLevID"]
			, "HHasten": tableMain[0]["HHasten"]

			, "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
			, "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
			@@ -1189,6 +1181,47 @@
			}
			})
			}

			// é¡¹ç®éæ±åé®é¢æ¸å ä¸æ¨å·¥ä½ä»»å¡ é¡µé¢èµå¼
			function CustomerTaskRoadBillMain( )//å è½½è¡¨å¤´
			{
			$.ajax({
			url: GetWEBURL() + "/PM_ProjectBill/PM_CustomerTaskBillMainEditList",
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var tableMain = result.data;

			//ä¸»è¡¨ èµå¼
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": tableMain[0]["HInterID"]
			, "HMainSourceBillNo": tableMain[0]["åæ®å·"]
			, "HMainSourceBillType": tableMain[0]["åæ®ç±»å"]
			, "HProjectID": tableMain[0]["HProjectID"]
			, "HProNumber": tableMain[0]["é¡¹ç®ä»£ç "]
			, "HProName": tableMain[0]["é¡¹ç®åç§°"]
			, "HProjectStageID": tableMain[0]["HProjectStageID"]
			, "HProjectStageName": tableMain[0]["é¡¹ç®é¶æ®µ"]
			, "HName": tableMain[0]["éæ±åç§°"]
			, "HDate": Format(new Date(tableMain[0]["æ¥æ"]), "yyyy-MM-dd")
			, "HTaskNote": tableMain[0]["éæ±æè¿°"]
			, "HType": tableMain[0]["éæ±ç±»å"]
			, "HSendEmp": tableMain[0]["å®¢æ·æåºäºº"]
			, "HReceiveEmp": tableMain[0]["æ¥æ¶äºº"]
			, "HCopyEmp": tableMain[0]["æéäºº"]
			, "HRemark": tableMain[0]["è¡¨å¤´å¤æ³¨"]
			, "HTaskStatus": tableMain[0]["éæ±ç¶æ"]
			, "HOrderLevID": tableMain[0]["HOrderLevID"]
			, "HLastDate": Format(new Date(tableMain[0]["è¦æ±å®ææ¥æ"]), "yyyy-MM-dd")
			, "HOrgID": tableMain[0]["HOrgID"]

			});

			}
			})
			}

			//#endregion

			//#region å®¡æ ¸