MES-WEB-LayUI.git

			@@ -66,6 +66,18 @@
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ¥åäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HReceiveEmp" id="HReceiveEmp">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ®ç¶æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBillStatus" id="HBillStatus">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			@@ -108,6 +120,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-radio"></i>æ¹éä¸æ¨</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			@@ -139,7 +152,7 @@
			var HModName = "PM_WorkTaskBillList";

			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HInterID","HProjectStageID","HOrgID","HEntryID", "HProjectID"];
			var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HEntryID", "HProjectID", "HBillStatus"];
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -193,6 +206,9 @@
			//åä½åºæé®
			case 'btn-DeDrop':
			set_DropBill(2);
			break;
			case 'set_ShowBill_dh':
			set_ShowBill_dh();
			break;
			////ç¦ç¨æé®
			//case 'btn-Stop':
			@@ -271,6 +287,7 @@
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 50000]
			@@ -311,6 +328,7 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 1) {
			var totalArray = ["è¯ä¼°å·¥æ¶", "èªè¯å·¥æ¶", "å·²èç¨å·¥æ¶"];
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -324,11 +342,13 @@
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			else if ($.inArray(data[i].name, totalArray)>-1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
			@@ -368,13 +388,15 @@
			//è·åç»å½è´¦æ·å¯¹åºèååç§°
			var HUserName = getHEmpByHUserName();
			if (HUserName != "" && HUserName != null) {
			sWhere = " and (æ´¾åäºº = '" + HUserName + "' or æ¥åäºº = '" + HUserName + "' or æéäºº like '%" + HUserName + "%') ";
			sWhere += " and (æ´¾åäºº = '" + HUserName + "' or æ¥åäºº = '" + HUserName + "' or æéäºº like '%" + HUserName + "%') ";
			}

			var HOrgID = "";
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProNumber = $("#HProNumber").val();//é¡¹ç®ä»£ç
			var HName = $("#HName").val();//å·¥ä½åç§°
			var HBillStatus = $("#HBillStatus").val();//åæ®ç¶æ
			var HReceiveEmp = $("#HReceiveEmp").val();//æ¥åäºº
			//ä»»æåæ®µè¿æ»¤
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			@@ -419,6 +441,13 @@
			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}
			if (HBillStatus) {
			sWhere += " and åæ®ç¶æ like '%" + HBillStatus + "%'";
			}
			if (HReceiveEmp) {
			sWhere += " and æ¥åäºº like '%" + HReceiveEmp + "%'";
			}

			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -429,6 +458,8 @@
			$("#HBillNo").val("");
			$("#HProNumber").val("");
			$("#HName").val("");
			$("#HReceiveEmp").val("");
			$("#HBillStatus").val("");
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			$("#ColContent").val("");
			$("#ColName").val("0");
			@@ -667,6 +698,56 @@
			}
			//#endregion

			//#region å¤è¡ä¸æ¨
			function set_ShowBill_dh() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (data.length != 0) {
			//layer.confirm("ç¡®è®¤è¦ä¸æ¨å?", function (index) {
			var dataArray = [];
			for (var i = 0; i < data.length; i++) {
			var temp = {
			"HProjectID": data[i].HProjectID
			, "HProNumber": data[i].é¡¹ç®ä»£ç
			, "HProjectStageID": data[i].HProjectStageID
			, "HProjectStageName": data[i].é¡¹ç®é¶æ®µ
			, "HName": data[i].ä»»å¡åç§°
			, "HTaskNote": data[i].ä»»å¡æè¿°
			, "HType": data[i].ä»»å¡ç±»å
			, "HSourceInterID": data[i].HInterID
			, "HSourceEntryID": data[i].HEntryID
			, "HSourceBillNo": data[i].åæ®å·
			, "HSourceBillType": data[i].åæ®ç±»å
			}
			dataArray.push(temp);
			}

			var datajson = {
			"data": dataArray
			};

			var url = encodeURI('../../é¡¹ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskReportBill.html?OperationType=4&res=' + JSON.stringify(datajson));

			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å·¥ä½ä»»å¡åè¡¨-å¤è¡ä¸æ¨'
			, shift: 0//å¼¹åºå¨ç»
			, content: url
			, btn: ['ç¡®å®'],
			// æé®1 çåè°
			btn1: function (index, layero, that) {
			//å·æ°é¡µé¢
			window.location.reload();
			}
			})
			//})
			} else {
			layer.msg('è¯·éæ©æ°æ®ä¸æ¨ï¼');
			}
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			@@ -818,7 +899,7 @@
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var HOrgID = params[params[1]];
			if (openType == 2) {
			sWhere += " and ISNULL(å³éäºº,'') = '' and ISNULL(ä½åºäºº,'') = '' ";
			sWhere += " and HBillStatus<3 and ISNULL(å³éäºº,'') = '' and ISNULL(ä½åºäºº,'') = '' ";
			$("#HOrgID").val(HOrgID);
			form.render("select");
			return true;