MES-WEB-LayUI.git

			@@ -171,10 +171,10 @@
			, { field: 'è¿åºç«æç¨æ¶é´', title: 'è¿åºç«æç¨æ¶é´', width: 160 }
			, { field: 'å·¥æ¶', title: 'å·¥æ¶', width: 160 }
			, { field: 'å·¥åºå', title: 'å·¥åºå', width: 160 }
			, { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é', width: 160 }
			, { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é', width: 160 }
			, { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', width: 160 }
			, { field: 'åºç«æ°é', title: 'åºç«æ°é', width: 160 }
			, { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é', totalRow: true, width: 160 }
			, { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é', totalRow: true, width: 160 }
			, { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', totalRow: true, width: 160 }
			, { field: 'åºç«æ°é', title: 'åºç«æ°é', totalRow: true, width: 160 }
			, { field: 'åºç«æ¶é´', title: 'åºç«æ¶é´', width: 160 }
			, { field: 'è¿ç«æ¶é´', title: 'è¿ç«æ¶é´', width: 160 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			@@ -239,6 +239,29 @@
			}
			});
			}

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTablemainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion


			//ç¼è¾åæ®
			function set_ShowBill() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -309,33 +332,34 @@
			//Excelè¡¨æ ¼å¯¼åº
			function SetExcel() {
			layer.confirm("ç¡®å®å¯¼åºæææ°æ®å", { title: "å¯¼åºç¡®è®¤" }, function (index) {
			window.location.href = GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel";
			//var wait = layer.load();
			//$.ajax({
			// type: "GET",
			// url: GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel",
			// success: function (result) {
			// window.location.reload();
			// //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();
			// // });
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HICMOBillNo = $("#HICMOBillNo").val(); //åæ®å·
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			var HName = $("#HName").val();

			// //} else {
			// // layer.alert(result.code + result.Message, { icon: 5 });
			// //}
			// //layer.close(wait);
			// }, error: function () {
			// layer.close(wait);
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			//});
			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),è¿ç«æ¶é´, 23) >= '" + HBeginDate + "'";
			}
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),è¿ç«æ¶é´, 23) <= '" + HEndDate + "'";
			}
			if (HICMOBillNo) {
			sWhere += " and è¿ç«çäº§è®¢åå· like '%" + HICMOBillNo + "%'";
			}
			if (HProcExchBillNo) {
			sWhere += " and æµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
			}
			if (HName) {
			sWhere += " and å·¥åºå like '%" + HName + "%'";
			}
			window.location.href = GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel?sWhere=" + sWhere;
			// å¾å°frameç´¢å¼
			//var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			})
			sWhere = " where 1=1 ";
			}

			//é¢è§
			@@ -485,6 +509,7 @@
			$("#HEndDate").val("");
			$("#HICMOBillNo").val("");
			$("#HProcExchBillNo").val("");
			$("#HName").val("");
			sWhere = " where 1 = 1 ";
			get_Display(sWhere);
			}