MES-WEB-LayUI.git

			@@ -85,6 +85,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>
			@@ -99,7 +153,6 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>å³é</button>
			<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="set_ShowBill_dh"><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>
			<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="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			@@ -135,7 +188,7 @@
			var HModName = "PM_WorkTaskBillList";

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

			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -297,7 +350,7 @@
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 50000]
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			@@ -311,7 +364,7 @@
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/PM_ProjectBill/getPM_CustomerTaskBillMainList',
			url: GetWEBURL() + '/PM_ProjectBill/getPM_ProjectMoneyBillMainList',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			@@ -385,9 +438,17 @@
			var HProNumber = $("#HProNumber").val();//é¡¹ç®ä»£ç
			var HName = $("#HName").val();//é¡¹ç®åç§°
			//ä»»æåæ®µè¿æ»¤

			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 = "";
			@@ -410,7 +471,48 @@
			}
			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 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			@@ -433,7 +535,12 @@
			$("#HName").val("");
			$("#HReceiveEmp").val("");
			$("#HBillStatus").val("");

			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			@@ -498,7 +605,7 @@
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'PM_ProjectBill/PM_CustomerTaskBillMainDelete',
			url: GetWEBURL() + 'PM_ProjectBill/PM_ProjectMoneyBillMainDelete',
			type: "GET",
			data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			@@ -546,9 +653,9 @@
			layer.confirm("ç¡®è®¤è¦å®¡æ ¸å?", function (index) {
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/PM_ProjectBill/CheckPM_CustomerTaskBillMain',
			url: GetWEBURL() + '/PM_ProjectBill/CheckPM_ProjectMoneyBillMain',
			type: "GET",
			data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
			data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 });
			@@ -576,9 +683,9 @@
			layer.confirm("ç¡®è®¤è¦åå®¡æ ¸å?", function (index) {
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/PM_ProjectBill/CheckPM_CustomerTaskBillMain',
			url: GetWEBURL() + '/PM_ProjectBill/CheckPM_ProjectMoneyBillMain',
			type: "GET",
			data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
			data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 });
			@@ -606,7 +713,7 @@
			layer.confirm("ç¡®è®¤è¦å³éå?", function (index) {
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/PM_ProjectBill/ClosePM_CustomerTaskBillMain',
			url: GetWEBURL() + '/PM_ProjectBill/ClosePM_ProjectMoneyBillMain',
			type: "GET",
			data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
			success: function (result) {
			@@ -637,7 +744,7 @@
			layer.confirm("ç¡®è®¤è¦åå³éå?", function (index) {
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/PM_ProjectBill/ClosePM_CustomerTaskBillMain',
			url: GetWEBURL() + '/PM_ProjectBill/ClosePM_ProjectMoneyBillMain',
			type: "GET",
			data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
			success: function (result) {
			@@ -817,7 +924,7 @@
			}
			//#endregion

			//#region ä»»æåæ®µè¿æ»¤ï¼ååæ¾ç¤ºä¸ææ¡
			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			@@ -827,6 +934,10 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion