From c44e292747967d71bbcb127fcb3ff141eb6cd7fe Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Thu, 29 Dec 2022 22:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/oa/view/approve/copy.html   |  1 +
 app/oa/view/approve/index.html  |  1 +
 app/oa/view/approve/list.html   |  1 +
 app/oa/view/plan/index.html     | 25 +++++++++++++++++++++---
 app/oa/view/schedule/index.html | 19 +++++++++++++++++-
 app/oa/view/work/index.html     | 34 ++++++++++++++++++++++++++++++---
 app/user/view/user/index.html   |  5 ++---
 7 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/app/oa/view/approve/copy.html b/app/oa/view/approve/copy.html
index 8a053d6..406de21 100644
--- a/app/oa/view/approve/copy.html
+++ b/app/oa/view/approve/copy.html
@@ -19,6 +19,7 @@
 		layui.pageTable = table.render({
 			elem: '#test'
 			,toolbar: '#toolbarDemo'
+			,defaultToolbar: false
 			,title:'审批列表'
 			,url: "/oa/approve/copy"
 			,page: true //开启分页
diff --git a/app/oa/view/approve/index.html b/app/oa/view/approve/index.html
index 7f68cee..b2c0242 100644
--- a/app/oa/view/approve/index.html
+++ b/app/oa/view/approve/index.html
@@ -70,6 +70,7 @@
 		layui.pageTable = table.render({
 			elem: '#test'
 			,toolbar: '#toolbarDemo'
+			,defaultToolbar: false
 			,title:'审批列表'
 			,url: "/oa/approve/index"
 			,page: true //开启分页
diff --git a/app/oa/view/approve/list.html b/app/oa/view/approve/list.html
index 800be1b..5fe086b 100644
--- a/app/oa/view/approve/list.html
+++ b/app/oa/view/approve/list.html
@@ -36,6 +36,7 @@
 		layui.pageTable = table.render({
 			elem: '#test'
 			,toolbar: '#toolbarDemo'
+			,defaultToolbar: false
 			,title:'审批列表'
 			,url: "/oa/approve/list"
 			,page: true //开启分页
diff --git a/app/oa/view/plan/index.html b/app/oa/view/plan/index.html
index bf1ce50..c050ff4 100644
--- a/app/oa/view/plan/index.html
+++ b/app/oa/view/plan/index.html
@@ -7,7 +7,7 @@
 <!-- 主体 -->
 {block name="body"}
 <div class="p-3">
-	<form class="layui-form gg-form-bar border-x border-t">
+	<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
 		<div id="barDate" class="layui-input-inline">
 			<div class="layui-input-inline" style="width:110px;">
 				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
@@ -85,6 +85,7 @@
 		layui.pageTable = table.render({
 			elem: '#test'
 			,toolbar: '#toolbarDemo'
+			,defaultToolbar:['filter', {title:'导出EXCEL',layEvent: 'LAYTABLE_EXCEL',icon: 'layui-icon-export'}]
 			,title:'日程安排列表'
 			,url: "/oa/plan/index"
 			,page: true //开启分页
@@ -128,6 +129,22 @@
 				}}
 			]]
 		});
+		
+		//表头工具栏事件
+		table.on('toolbar(test)', function(obj){
+			if(obj.event === 'LAYTABLE_EXCEL'){
+				var formSelect = form.val('barsearchform');
+				formSelect.limit=99999;
+				$.ajax({
+					url: '/oa/plan/index',
+					data: formSelect,
+					success:function(res){
+						table.exportFile('test', res.data,'xls');
+					}
+				});
+				return;
+			}
+		})
 
 		//操作
 		table.on('tool(test)', function(obj){
@@ -152,7 +169,8 @@
 							addEvent(detail);
 						}
 					}
-				})				
+				})	
+				return;				
 			}
 			else if(obj.event === 'view'){
 				$.ajax({
@@ -164,7 +182,8 @@
 							viewEvent(e.data);
 						}
 					}
-				})				
+				})
+				return;				
 			}
 		});
 		
diff --git a/app/oa/view/schedule/index.html b/app/oa/view/schedule/index.html
index 932090c..a24c71c 100644
--- a/app/oa/view/schedule/index.html
+++ b/app/oa/view/schedule/index.html
@@ -7,7 +7,7 @@
 <!-- 主体 -->
 {block name="body"}
 <div class="p-3">
-	<form class="layui-form gg-form-bar border-x border-t">
+	<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
 		<div id="barDate" class="layui-input-inline">
 			<div class="layui-input-inline" style="width:110px;">
 				<input type="text" class="layui-input" id="start_time" placeholder="选择时间区间" readonly name="start_time">
@@ -84,6 +84,7 @@
 		layui.scheduleTable = table.render({
 			elem: '#test'
 			,toolbar: '#toolbarDemo'
+			,defaultToolbar:['filter', {title:'导出EXCEL',layEvent: 'LAYTABLE_EXCEL',icon: 'layui-icon-export'}]
 			,title:'工作记录列表'
 			,url: "/oa/schedule/index"
 			,page: true //开启分页
@@ -123,6 +124,22 @@
 				}}
 			]]
 		});
+		
+		//表头工具栏事件
+		table.on('toolbar(test)', function(obj){
+			if(obj.event === 'LAYTABLE_EXCEL'){
+				var formSelect = form.val('barsearchform');
+				formSelect.limit=99999;
+				$.ajax({
+					url: '/oa/schedule/index',
+					data: formSelect,
+					success:function(res){
+						table.exportFile('test', res.data,'xls');
+					}
+				});
+				return;
+			}
+		})
 
 		//更改工时
 		table.on('tool(test)', function(obj){
diff --git a/app/oa/view/work/index.html b/app/oa/view/work/index.html
index 7ce84b7..b49e169 100644
--- a/app/oa/view/work/index.html
+++ b/app/oa/view/work/index.html
@@ -10,7 +10,7 @@
 	  </ul>
 	  <div class="layui-tab-content" style="padding:0">
 		<div class="layui-tab-item layui-show">
-			<form class="layui-form gg-form-bar border-x border-t">
+			<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform">
 				<div class="layui-inline" id="date">
 					<div class="layui-input-inline" style="width:112px">
 					  <input type="text" autocomplete="off" id="start_time" name="start_time" class="layui-input" placeholder="接收开始日期">
@@ -33,7 +33,7 @@
 			<table class="layui-hide" id="test" lay-filter="test"></table>
 		</div>
 		<div class="layui-tab-item">
-			<form class="layui-form gg-form-bar border-x border-t">
+			<form class="layui-form gg-form-bar border-x border-t" lay-filter="barsearchform2">>
 				<div class="layui-inline" id="date1">
 					<div class="layui-input-inline" style="width:112px">
 					  <input type="text" autocomplete="off" id="start_time1" name="start_time" class="layui-input" placeholder="接收开始日期">
@@ -100,6 +100,7 @@
 		layui.pageTable = table.render({
 			elem: '#test',
 			toolbar: '#toolbarDemo',
+			defaultToolbar:['filter', {title:'导出EXCEL',layEvent: 'LAYTABLE_EXCEL',icon: 'layui-icon-export'}],
 			title:'工作汇报列表',
 			url: "/oa/work/index", //数据接口
 			where:{'send':1},
@@ -151,6 +152,19 @@
 			if(obj.event === 'add'){
 				addNew();
 				return;
+			}
+			if(obj.event === 'LAYTABLE_EXCEL'){
+				var formSelect = form.val('barsearchform');
+				formSelect.limit=99999;
+				formSelect.send=1;
+				$.ajax({
+					url: '/oa/work/index',
+					data: formSelect,
+					success:function(res){
+						table.exportFile('test', res.data,'xls');
+					}
+				});
+				return;
 			}			
 		});
 		 
@@ -171,6 +185,7 @@
 		layui.pageTable1 = table.render({
 			elem: '#test1',
 			toolbar: '#toolbarDemo',
+			defaultToolbar:['filter', {title:'导出EXCEL',layEvent: 'LAYTABLE_EXCEL',icon: 'layui-icon-export'}],
 			title:'工作汇报列表',
 			url: "/oa/work/index", //数据接口
 			where:{'send':0},
@@ -233,7 +248,20 @@
 			if(obj.event === 'add'){
 				addNew();
 				return;
-			}	
+			}
+			if(obj.event === 'LAYTABLE_EXCEL'){
+				var formSelect = form.val('barsearchform1');
+				formSelect.limit=99999;
+				formSelect.send=0;
+				$.ajax({
+					url: '/oa/work/index',
+					data: formSelect,
+					success:function(res){
+						table.exportFile('test1', res.data,'xls');
+					}
+				});
+				return;
+			}			
 		});
 		
 		function addNew(){
diff --git a/app/user/view/user/index.html b/app/user/view/user/index.html
index bb147cd..6bb5a34 100644
--- a/app/user/view/user/index.html
+++ b/app/user/view/user/index.html
@@ -24,7 +24,7 @@
 		<div id="depament"></div>
 	</div>
 	<div class="body-table" style="margin-left:228px;">
-		<form class="layui-form gg-form-bar border-t border-x" lay-filter="seachform">
+		<form class="layui-form gg-form-bar border-t border-x" lay-filter="barsearchform">
 			<div class="layui-input-inline" style="width:136px">
 				<select name="status">
 					<option value="">选择员工状态</option>
@@ -320,9 +320,8 @@
 		table.on('toolbar(test)', function(obj){
 			var checkStatus = table.checkStatus(obj.config.id); //获取选中行状态
 			var data = checkStatus.data;
-			console.log(obj.event);
 			if(obj.event === 'LAYTABLE_EXCEL'){
-				var formSelect = form.val('seachform');
+				var formSelect = form.val('barsearchform');
 				formSelect.limit=99999;
 				$.ajax({
 					url: '/user/user/index',