MES-WEB-LayUI.git

			@@ -67,24 +67,58 @@
			<input type="text" class="layui-input" name="Part" id="Part" style="width:190px;">
			</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">
			<!--å¨ææ¸²æç»ç»-->
			</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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-row">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="Source" id="Source" style="width:190px;">
			</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;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" 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="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="Source" id="Source" style="width:190px;">
			</div>
			</div>

			</div>
			</div>
			</div>
			@@ -198,11 +232,18 @@

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#HDate").val("");//å¼å§æ¥æ
			$("#HDate1").val("");//ç»ææ¥æ
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");
			$("#Part").val("");
			$("#Source").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			form.render('select');
			sWhere = "";

			});
			//#endregion

			@@ -214,6 +255,7 @@
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			Organ();

			}

			@@ -244,6 +286,7 @@
			}
			}
			}
			, { field: 'ç»ç»', title: 'ç»ç»', width: 200 }
			, {
			field: 'HBillStatus', title: 'åæ®ç¶æ', width: 200, templet: function (d) {
			switch (d.HBillStatus) {
			@@ -335,10 +378,32 @@
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'HReportType', title: 'æ±æ¥ç±»å', width: 200 }
			//, { field: 'HReportType', title: 'æ±æ¥ç±»å', width: 200 }
			, { field: 'HRelationInterID', title: 'æ¯å¦æ¥æ£ç³è¯·', width: 200, hide: true }
			]]
			};
			}

			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			var Organization = "";
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HOrgID").append(Organization);
			$("#HOrgID").val(sessionStorage["OrganizationID"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			//æ¥è¯¢æ°æ®
			@@ -355,6 +420,10 @@
			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -368,13 +437,46 @@
			}

			// å¿«éè¿æ»¤
			function get_FastQuery() {
			function get_FastQuery(number) {
			var HDate = $("#HDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HDate1").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var Part = $("#Part").val(); //ç©æä¿¡æ¯
			var Source = $("#Source").val(); //èµæº
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var HOrgID = ""; //ç»ç»
			sWhere += SchWhere;

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}

			if (number == 1) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			else {
			HOrgID = $("#HOrgID").val();//ç»ç»
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			@@ -390,7 +492,9 @@
			if (Source) {
			sWhere += " and çäº§èµæº like '%" + Dept + "%'";
			}

			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			@@ -423,7 +527,7 @@
			var HInterID = data[0].HInterID;
			var HICMOInID = data[0].HSourceInterID;
			var HICMOEnID = data[0].HSourceEntryID;
			var HRelationInterID = data[0].HRelationInterID;
			var HRelationInterID = data[0].HRelationInterID;
			if (HRelationInterID == 1) {
			layer.msg('åæ®å·²æ¥æ£å®¡æ ¸æ æ³ä¿®æ¹ï¼');
			return false;
			@@ -461,8 +565,8 @@
			var InterID = data[0].HInterID.toString();
			var HICMOInID = data[0].HSourceInterID.toString();
			var HICMOEnID = data[0].HSourceEntryID.toString();
			var HRelationInterID = data[0].HRelationInterID.toString();
			if (HRelationInterID == 1) {
			var HBillStatus = data[0].HBillStatus.toString();
			if (HBillStatus == 2) {
			layer.msg('åæ®å·²æ¥æ£å®¡æ ¸æ æ³å é¤ï¼');
			return false;
			}
			@@ -516,7 +620,6 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			console.log(JSON.stringify(data))
			var HBillStatus = data[0].HBillStatus.toString(); //åæ®ç¶æ
			var HSourceID = data[0].HSourceID.toString(); //çäº§èµæºID
			var HSourceInterID = data[0].HSourceInterID.toString(); //æºåä¸»åç
			@@ -573,7 +676,7 @@
			var HICMOInterID = data[0].HICMOInterID.toString();//çäº§è®¢åä¸»ID
			var HICMOEntryID = data[0].HICMOEntryID.toString();//çäº§è®¢ååID
			var HInterID = data[0].HInterID.toString();//äº§éæ±æ¥ä¸´æ¶è¡¨ä¸»ID
			if (HBillStatus = 1 \|\| HBillStatus>2) {
			if (HBillStatus == 1 \|\| HBillStatus>2) {
			layer.msg('åæ®æªå®¡æ ¸ï¼ä¸éè¦åå®¡æ ¸æèåæ®å·²çæä¸åè®¸åå®¡æ ¸ï¼');
			return false;
			}
			@@ -607,6 +710,19 @@

			}

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');
			}


			// #endregion
			//ä»¥ä¸æ¯layuiæ¨¡å