MES-WEB-LayUI.git

			@@ -780,7 +780,7 @@
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			sqlWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			@@ -801,7 +801,7 @@
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			sqlWhere += " and " + ColName2 + " " + com2;
			}
			if (HBillNo)
			sqlWhere += " and åæ®å· like '%" + HBillNo + "%'";
			@@ -823,10 +823,10 @@
			sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";

			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate1 + "'";
			sqlWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate1 + "'";
			}
			if (HDate2) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate2 + "'";
			sqlWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate2 + "'";
			}
			if (number == 2) {
			if (HProject) {
			@@ -882,6 +882,9 @@
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			if (itemobj === 'è§æ ¼åå·') {
			item[itemobj] = item[itemobj].replace(/,/g, 'ï¼'); // æ¿æ¢è±æéå·ä¸ºä¸æéå·
			}
			}
			});
			@@ -1116,8 +1119,8 @@

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365]; //valuelistæ°ç»åå«ä¸æ¶é´ç¸å³çæ´æ°å¼
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©", "è¿åå¹´", "è¿ä¸å¹´"]; //itilelistä¸valuelistå¼ç¸å¯¹äºçè¡¨ï¼ä¸ä½ä¸ºä¸ææ¡ææ¬æ¾ç¤º

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {