MES-WEB-LayUI.git

			@@ -35,15 +35,9 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate1" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -102,7 +96,6 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script>
			var cols_arr = []; //åå¨è¡¨æ ¼å¤´çæ°ç»
			var table = null;
			@@ -129,20 +122,12 @@
			var pageIndex = 1;//å½åé¡µç å¼

			//#region è¿å¥é¡µé¢æ¢å è½½
			//åå§åè¡¨åæä»¶
			set_InitFrom();
			//åå§åçé¢
			set_ClearBill(sWhere);
			//#endregion

			//#region åå§åè¡¨å
			function set_InitFrom() {
			laydate.render({
			elem: '#HDate'
			});
			laydate.render({
			elem: '#HDate1'
			});
			}
			//#endregion

			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			@@ -191,15 +176,17 @@
			get_FastQuery();
			});

			//åå§åè¡¨å
			function set_InitFrom() {
			laydate.render({
			elem: '#HDate'
			});
			}
			//åå§åçé¢
			function set_ClearBill(sWhere) {
			resultTableHead = []; //æ¸ç©ºè¡¨å¤´åï¼é²æ¢éå¤æ¸²æ
			//åå§æ¥è¯¢
			//get_Display(sWhere);
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			get_FastQuery();

			get_Display(sWhere);
			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			@@ -207,7 +194,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
			type: "GET",
			data: { "page": 1, "limit": 10 ,"sWhere": sWhere},
			data: { "sWhere": sWhere, "page": 1, "limit": 10 },
			datatype: "json",
			success: function (data1) {
			console.log(data1);
			@@ -234,22 +221,22 @@
			switch (data[i].Type) {
			//int
			case 'Int32':
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true,width: 100 };
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
			break;
			//Decimal
			case 'Decimal':
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
			break;
			default:
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200};
			cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
			}
			}
			}
			//å¡«åè¡¨æ ¼æ°æ®
			table.render({
			elem: '#mainTable',
			toolbar: '#toolbarDemo',
			url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
			toolbar: '#toolbarDemo',
			title: 'ç»æååè¡¨',
			cols: cols_arr, //å¡«åè¡¨æ ¼å¤´æ°æ®,
			id: 'mainTable', //è¡¨æ ¼id
			@@ -268,10 +255,48 @@
			}
			});
			}
			//å é¤
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_PackUnionBill/set_DeleteBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			}
			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var HDate = $("#HDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HDate1").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HDepartName = $("#HDepartName").val();
			var HMaterNumber = $("#HMaterNumber").val();
			@@ -279,9 +304,6 @@
			var HMakerMan = $("#HMakerMan").val();
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			@@ -298,20 +320,19 @@
			if (HMakerMan) {
			sWhere += " and å¶åäºº like '%" + HMakerMan + "%'";
			}
			get_Display(sWhere);
			set_ClearBill(sWhere);
			sWhere = "";
			}
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#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("");
			$("#HDepartName").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HMakerMan").val("");
			sWhere = " ";
			get_FastQuery();
			sWhere = "";
			get_Display(sWhere);
			}
			//å·æ°
			function set_Refresh() {