MES-WEB-LayUI.git

			@@ -19,7 +19,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>

			<script src="../../../layuiadmin/PageTitle.js"></script>

			</head>
			<body>
			@@ -83,15 +83,17 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillStatus" id="HBillStatus">
			</div>
			</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="ColName" id="ColName" class=" ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class=" ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -106,7 +108,61 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			<input type="text" class="layui-input" 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>
			@@ -170,6 +226,12 @@
			var option = [];
			var sWhere = "";
			var HModName = "PM_WorkTaskBillList";

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "4753";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
			//#endregion

			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HEntryID", "HProjectID", "HBillStatus", "HOrderLevID"];
			@@ -296,6 +358,28 @@
			});
			})
			//#endregion

			table.on('sort(mainTable)', function (obj) { //æ³¨ï¼sort æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			table.reload('mainTable', {
			initSort: obj //è®°å½åå§æåºï¼å¦æä¸è®¾çè¯ï¼å°æ æ³æ è®°è¡¨å¤´çæåºç¶æã layui 2.1.1 æ°å¢åæ°
			, where: { //è¯·æ±åæ°ï¼æ³¨æï¼è¿éé¢çåæ°å¯ä»»æå®ä¹ï¼å¹¶éä¸é¢åºå®çæ ¼å¼ï¼
			field: obj.field //æåºåæ®µ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			, order: obj.type //æåºæ¹å¼ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			}
			});
			option.data = layui.table.cache["mainTable"];
			table.render(option);
			});

			//#region åå»è¿åæ°æ®
			table.on('rowDouble(mainTable)', function (obj) {
			var data = [];
			data.push(obj.data);
			parent.GetWorkTaskValue(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			//#endregion

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			@@ -339,10 +423,11 @@
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, sort: true //éç¹1ï¼è¿éçsortè¡¨ç¤º tableè¡¨å¨åå¾æ¥å£æ°æ®åï¼å¯¹é¡µé¢æ¸²æåçtableæ°æ®è¿è¡æåºãåæ¶ï¼è¿éçtrue ä¼å½±åé¡µé¢sort ä¸ä¸å°ç®å¤´ç æ¾ç¤ºææ
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 50000]
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			@@ -415,7 +500,6 @@
			option.cols = [col];
			option.data = data1.data;
			table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			@@ -453,10 +537,15 @@
			var HName = $("#HName").val();//å·¥ä½åç§°
			var HBillStatus = $("#HBillStatus").val();//åæ®ç¶æ
			var HReceiveEmp = $("#HReceiveEmp").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 = "";
			@@ -478,6 +567,48 @@
			break;
			}
			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 (number == 1) {
			HOrgID = sessionStorage["OrganizationID"];
			@@ -519,7 +650,13 @@
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');

			sWhere = "";
			@@ -532,7 +669,7 @@
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'å·¥ä½ä»»å¡åè¡¨-æ°å¢'
			, title: 'æ°å¢' + HPageTitle
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../é¡¹ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskBill.html?OperationType=1&linterid=0&HSouceBillType='
			,btn: ['ç¡®å®'],
			@@ -555,7 +692,7 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å·¥ä½ä»»å¡åè¡¨-ç¼è¾'
			, title: 'ç¼è¾' + HPageTitle
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../é¡¹ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
			, btn: ['ç¡®å®'],
			@@ -1069,8 +1206,7 @@
			})
			}
			//#endregion

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