MES-WEB-LayUI.git

			@@ -22,6 +22,7 @@
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -34,6 +35,25 @@
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -54,14 +74,7 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HProName" id="HProName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>

			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -80,6 +93,14 @@
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnResCnz" style="padding:0 5px">éæ°åæ¥</button>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -107,6 +128,60 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -130,7 +205,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ProjectReport" id="set_ProjectReport"><i class="layui-icon layui-icon-radio"></i>ä¸æ¨(é¶æ®µæ±æ¥)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_WorkTask" id="set_WorkTask"><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="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			@@ -177,7 +252,7 @@

			//#region ãè¿æ»¤æ¹æ¡ã

			//è¿æ»¤æ¡ä»¶çclassç±»
			//è¿æ»¤æ¡ä»¶çclassç±»
			var HClassTag = "ForFilteringSchemes";
			//æ¨¡ååç§°ï¼ä¸æçï¼ æ¯ä¸ªæ¨¡åé¡µé¢é½éè¦ä¿®æ¹
			window.HModuleName = "å·¥ç¨é¡¹ç®ç»´æ¤";
			@@ -317,6 +392,45 @@
			});
			//#endregion

			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event == 'åæ®å·') {
			var linterid = data.HInterID.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillSubType=' + HBillSubType
			, btn: ['ç¡®å®'],
			// æé®1 çåè°
			btn1: function (index, layero, that) {
			//å·æ°é¡µé¢
			$("#btnSearch").trigger('click');
			}
			})
			}
			});

			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}
			});

			//éæ°åæ¥æé®
			form.on('submit(btnResCnz)', function (data) {
			var HBillno2 = $('#HBillno2').val();
			@@ -365,6 +479,14 @@

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

			//åå§åè¡¨æ ¼
			set_InitGrid();
			//åå§åç»ç»
			@@ -528,6 +650,13 @@
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if (data[i].name == 'åæ®å·') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			}
			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 {
			@@ -579,13 +708,23 @@
			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {
			var HOrgID = "";
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProNumber = $("#HProNumber").val();//é¡¹ç®ä»£ç
			var HProName = $("#HProName").val();//é¡¹ç®åç§°
			var HDeptID = sessionStorage["HDeptID"];
			//ä»»æåæ®µè¿æ»¤
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			@@ -608,13 +747,59 @@
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (addSWhereByOpenType()) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			else {
			HOrgID = $("#HOrgID").val();//ç»ç»
			}

			if (HBillSubType == "ä»»å¡ç±»") {
			if (HDeptID != 0) {
			sWhere += " and HDeptID = '" + HDeptID + "'";
			}
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			@@ -626,6 +811,12 @@
			}
			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (number == 2) {
			if (HOrgID==null) {
			@@ -647,6 +838,12 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			form.render('select');

			sWhere = "";
			@@ -1178,6 +1375,10 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion
			@@ -1198,7 +1399,7 @@
			function addSWhereByOpenType() {
			//è·ååæ°
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var HOrgID = params[params[1]];
			HBillSubType = (decodeURI(params[params[2]]) != "å·¥ç¨ç±»" && decodeURI(params[params[2]]) != "ä»»å¡ç±»") ? "é¡¹ç®ç±»" : decodeURI(params[params[2]]);//è¥è§£ç åtypeä¸ä¸ºå·¥ç¨æä»»å¡å¼ºå¶åä¸ºé¡¹ç®
			if (HBillSubType == "å·¥ç¨ç±»") {
			@@ -1212,8 +1413,26 @@
			form.render("select");
			return true;
			}


			return false;
			}
			//#endregion

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©", "è¿åå¹´", "è¿ä¸å¹´"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
			}

			$("#HInitTimeCycle").empty();
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
			form.render('select');

			$("#HInitTimeCycle").val("365");
			}
			//#endregion

			@@ -1280,7 +1499,7 @@
			for (var i = 0; i < Filter.length; i++) {
			HFilterIdList = Filter[i].id; //è¿æ»¤æ¡ä»¶ID
			HFilterIdLists += Filter[i].id + ","; //è¿æ»¤æ¡ä»¶ID(æ¼æ¥)
			HValue += $("#" + HFilterIdList).val() + ","; //è¿æ»¤æ¡ä»¶ä¸è¾å¥çå¼
			HValue += $("#" + HFilterIdList).val() + ","; //è¿æ»¤æ¡ä»¶ä¸è¾å¥çå¼
			HElement_type += document.getElementById(HFilterIdList).tagName + ",";//éè¿æ ç¾idè·åæ ç¾ç±»å
			}