MES-WEB-LayUI.git

			@@ -11,7 +11,7 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>

			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -70,6 +70,90 @@
			</button>
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<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>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -90,7 +174,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			@@ -103,6 +187,7 @@
			, util = layui.util
			, tree = layui.tree
			, util = layui.util
			, soulTable = layui.soulTable
			var sWhere = "";
			var option = [];
			//#endregion
			@@ -147,43 +232,63 @@
			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¥æ
			$("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//æææ¥æ
			$("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//è³
			//çäº§ç»ç»å è½½
			Organ();
			//åå§åè¡¨æ ¼
			set_InitGrid();

			//å¿«éè¿æ»¤
			get_FastQuery(1);
			ColFilter();
			}
			//#endregion

			//#region åå§åè¡¨æ ¼æ¹æ³
			function set_InitGrid() {
			var columns = [];
			var myDate = new Date();
			var yyyy = myDate.getFullYear();
			var MM = myDate.getMonth() + 1;
			var dd = myDate.getDate();
			var SumMonth = 31; //å¨æä¸¤æä¹å·® new Date(yyyy, MM, 0).getDate()
			var MonthCount = new Date(yyyy, MM-1, 0).getDate();

			columns.push({ type: 'checkbox', fixed: 'left' });
			columns.push({ field: 'ç»ç»', title: 'çäº§ç»ç»' });
			columns.push({ field: 'é¨é¨', title: 'çäº§è½¦é´' });
			columns.push({ field: 'FSUMQTY', title: 'åè®¡' });
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°' });
			columns.push({ field: 'è§æ ¼åå·', title: 'ç©æè§æ ¼' });
			columns.push({ field: 'HICMOBillNo', title: 'çäº§è®¢åå·' });
			columns.push({ field: 'HSeOrderBillNo', title: 'éæ±åå·' });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ' });
			columns.push({ field: 'è®¡éåä½åç§°', title: 'è®¡éåä½' });
			columns.push({ field: 'TQSUM', title: 'è¦ææææ°é' });
			for (var i = 1; i <= (MonthCount - dd); i++) {
			columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'MM.dd'), width: 70 })//0
			}
			for (var i = 1; i <= (SumMonth - MonthCount + dd); i++) {
			columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
			columns.push({ type: 'checkbox', fixed: 'left', sort: true});
			columns.push({ field: 'ç»ç»', title: 'çäº§ç»ç»', sort: true});
			columns.push({ field: 'é¨é¨', title: 'çäº§è½¦é´', sort: true});
			columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true});
			columns.push({ field: 'è§æ ¼åå·', title: 'ç©æè§æ ¼', sort: true});
			columns.push({ field: 'HICMOBillNo', title: 'çäº§è®¢åå·', sort: true});
			columns.push({ field: 'HSeOrderBillNo', title: 'éæ±åå·', sort: true});
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', sort: true});
			columns.push({ field: 'è®¡éåä½åç§°', title: 'è®¡éåä½', sort: true});
			columns.push({ field: 'TQSUM', title: 'è¦ææææ°é', sort: true, totalRow: true});
			//è·åä¸¤ä¸ªææä¹é´çç¸å·®
			var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//å¼å§æ¶é´
			var time2 = Date.parse(new Date($("#HENDDATE").val()));//ç»ææ¶é´
			var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
			//è·åå¹´
			var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
			//è·åæä»½
			var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
			//è·åå¼å§æä»½çæå¤§å¤©æ°
			var SumMonth = new Date(yyyy, MM, 0).getDate(); //å¨æä¸¤æä¹å·®
			//è·åå¼å§æ¥æçå¤©æ°
			var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //è·åå¼å§æ¥æå¤©æ°

			var k = 0;//æ¶éå¾ªç¯æ¬¡æ°
			for (var j = 0; j <= (Days - k); j++) {
			columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true})
			//è·¨å¹´çè¯ ä¼ä»ä¸æä¸å·å¼å§
			if (MM == 12 && (HBEGINDATE + j) == 31) {
			yyyy += 1;
			MM = 1;
			SumMonth = new Date(yyyy, MM, 0).getDate();
			HBEGINDATE = 0;
			k += j;
			j = 0;
			} else if ((HBEGINDATE + j) == SumMonth) { //è·¨æ ææ°å ä¸ å¤©æ°ä»ä¸å¼å§
			HBEGINDATE = 0;
			MM += 1;
			SumMonth = new Date(yyyy, MM, 0).getDate();
			k += j;
			j = 0;
			}
			}
			columns.push({ field: '', title: 'è®¡åæç»_åè®¡' });

			@@ -191,12 +296,16 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, cellMinWidth: 90
			, limit: 50
			, limit: 20000
			, totalRow: true
			, limits: [50, 500, 5000, 20000]
			, loading: false
			, cols: [columns]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			};
			}
			//#endregion
			@@ -263,6 +372,84 @@
			var HMATERIALID = $("#HMATERIALID").val();//ç©æ/äº§å
			var HDeptID = $("#HDeptID").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 = "";
			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 (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 (HBEGINDATE > HENDDATE) {
			return layer.msg("å¼å§æ¥æä¸è½å°äºç»ææ¥æ!");
			}

			sWhere = {
			HORGID: HORGID
			, HBEGINDATE: HBEGINDATE
			@@ -270,6 +457,8 @@
			, HMATERIALID: HMATERIALID
			, HDeptID: HDeptID
			}
			//åå§åè¡¨æ ¼
			set_InitGrid();
			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -278,12 +467,21 @@
			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HORGID").val(sessionStorage["OrganizationID"]);//ç»ç»
			$("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//æææ¥æ
			$("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));//è³
			$("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//æææ¥æ
			$("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//è³
			$("#HMATERIALID").val("");//ç©æ/äº§å
			$("#HMATERIALNAME").val("");
			$("#HDeptID").val("");//çäº§è½¦é´
			$("#DeptNAME").val("");
			$("#ColContent").val("");
			$("#ColName").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 = "";
			}
			@@ -297,7 +495,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç©æåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -307,7 +505,7 @@
			}
			//è·åæ°æ®
			$("#HMATERIALID").val(checkStatus.data[0].HItemID);
			$("#HMATERIALNAME").val(checkStatus.data[0].HName);
			$("#HMATERIALNAME").val(checkStatus.data[0].ç©æåç§°);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			@@ -322,7 +520,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¨é¨åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -332,13 +530,29 @@
			}
			//è·åæ°æ®
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			$("#DeptNAME").val(checkStatus.data[0].HName);
			$("#DeptNAME").val(checkStatus.data[0].é¨é¨åç§°);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//åææ¾ç¤ºä¸ææ¡
			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);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);

			form.render('select');
			}


			//#endregion