MES-WEB-LayUI.git

			@@ -14,6 +14,7 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<!--<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			@@ -65,6 +66,7 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">åå³é</button>-->
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<h1 style="text-align: center; padding: 10px 0;"><b>ä»»å¡æ±æ¥</b></h1>
			<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;">å¶ä»ä¿¡æ¯</li>
			@@ -225,6 +227,7 @@
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">

			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">é¡¹ç®é¶æ®µ</li>
			</ul>
			@@ -238,7 +241,7 @@
			<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>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>-->
			</div>
			</script>
			</div>
			@@ -291,11 +294,20 @@
			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

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

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "4754";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			//#endregion

			//#region å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			@@ -326,23 +338,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 +383,7 @@
			get_InitGrid();
			//ä¸æ¨-é¡µé¢è®¾ç½®
			set_WorkTaskReport();

			}
			//#endregion

			@@ -590,7 +607,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 +774,7 @@
			num.push(table.cache["mainTable"][i])
			}
			}

			//è·åç»ç»æ°æ®
			data.field.HPRDORGID = sessionStorage["OrganizationID"];//ç»ç»
			//è¥ä¸ºç¼è¾-ä¿åï¼åæ´æ°ä¿®æ¹äººåä¿®æ¹æ¶é´
			@@ -786,6 +804,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 +820,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)//å è½½è¡¨å¤´
			{
			@@ -1280,6 +1334,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 = "";