From a36e6401d9dba93d519512cd01509fd32974ce6e Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Tue, 23 Nov 2021 17:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/home/view/check/add.html         | 14 ++-----
 app/home/view/check/index.html       | 40 +++++++++++--------
 app/home/view/keywords/add.html      | 12 ++----
 app/home/view/keywords/index.html    | 31 +++++++++------
 app/home/view/role/index.html        |  5 +--
 app/home/view/schedule/cate.html     | 58 ++++++++++++++--------------
 app/home/view/schedule/cate_add.html | 11 ++----
 7 files changed, 83 insertions(+), 88 deletions(-)

diff --git a/app/home/view/check/add.html b/app/home/view/check/add.html
index 428d79e..65852de 100644
--- a/app/home/view/check/add.html
+++ b/app/home/view/check/add.html
@@ -6,8 +6,9 @@
 <!-- 主体 -->
 {block name="body"}
 <form class="layui-form body-content">
+	<h3 class="h3-title">审核人配置</h3>
 	{if condition="$id eq 0"}
-	<table class="layui-table layui-table-form">
+	<table class="layui-table">
 		<tr>
 			<td class="layui-td-gray2">审核类型<font>*</font></td>
 			<td>
@@ -63,7 +64,6 @@
 		<input type="hidden" name="id" value="{$id}" />
 		<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform">立即提交</button>
 		<button type="reset" class="layui-btn layui-btn-primary">重置</button>
-		<button lay-event="back" class="layui-btn layui-btn-primary">返回</button>
 	</div>
 </form>
 {/block}
@@ -75,8 +75,7 @@
 	function init(layui) {
 		var form = layui.form
 			, employeepicker = layui.employeepicker
-			, layer = layui.layer;
-			
+			, layer = layui.layer;			
 			
 		//添加人员		
 		function addEmployee(){
@@ -110,7 +109,7 @@
 				success: function (e) {
 					if (e.code == 0) {
 						layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
-							window.location.href="{:url('home/check/index')}";
+							parent.location.reload();
 						});
 					} else {
 						layer.msg(e.msg);
@@ -119,11 +118,6 @@
 			})
 			return false;
 		});
-		//监听返回
-		$('.body-content').on('click', '[lay-event="back"]', function () {
-			history.back(-1);
-			return false;
-		});
 	}
 
 </script>
diff --git a/app/home/view/check/index.html b/app/home/view/check/index.html
index 3614161..3720717 100644
--- a/app/home/view/check/index.html
+++ b/app/home/view/check/index.html
@@ -6,7 +6,7 @@
 </div>
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
-	<a class="layui-btn layui-btn-normal layui-btn-sm" href="{:url('home/check/add')}">+ 添加审核人配置</a>
+	<button class="layui-btn layui-btn-normal layui-btn-sm" lay-event="add">+ 添加审核人配置</button>
   </div>
 </script>
 {/block}
@@ -17,6 +17,7 @@
 <script>
 	function init(layui) {
 		var table = layui.table,
+			rightpage = layui.rightpage,
 			form = layui.form;
 
 		var tableIns = table.render({
@@ -49,30 +50,37 @@
 				, {width: 100, title: '操作', align: 'center'
 					, templet: function (d) {
 						var html = '<div class="layui-btn-group">';
-						html+='<a class="layui-btn layui-btn-xs" href="/home/check/add?id='+d.id+'">编辑</a>';
-						html+= '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>';
+						html+='<button class="layui-btn layui-btn-xs" lay-event="edit">编辑</button>';
+						html+= '<button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
 						html+= '</div>';
 						return html;
 					}
 				}]
 			]
 		});
-		//删除
+		
+		//表头工具栏事件
+		table.on('toolbar(test)', function(obj){
+			if (obj.event === 'add') {
+				rightpage.open("{:url('home/check/add')}");
+				return;
+			}
+		});
+		//监听行工具事件
 		table.on('tool(test)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'edit') {
+				rightpage.open('/home/check/add?id='+obj.data.id);
+				return;
+			}
 			if (obj.event === 'del') {
-				layer.confirm('确定要删除吗?', {
-					icon: 3,
-					title: '提示'
-				}, function (index) {
+				layer.confirm('确定要删除吗？', { icon: 3, title: '提示' }, function (index) {
 					$.ajax({
 						url: "{:url('home/check/delete')}",
-						type: 'post',
-						data: {
-							id: obj.data.id
-						},
-						success: function (res) {
-							layer.msg(res.msg);
-							if (res.code == 0) {
+						data: { id: data.id },
+						success: function (e) {
+							layer.msg(e.msg);
+							if (e.code == 0) {
 								obj.del();
 							}
 						}
@@ -83,6 +91,6 @@
 		});
 	}
 </script>
-{include file="common/layui" base="base" extend="[]" callback="init" /}
+{include file="common/layui" base="base" extend="['rightpage']" callback="init" /}
 {/block}
 <!-- /脚本 -->
\ No newline at end of file
diff --git a/app/home/view/keywords/add.html b/app/home/view/keywords/add.html
index 19471ce..5d63bf3 100644
--- a/app/home/view/keywords/add.html
+++ b/app/home/view/keywords/add.html
@@ -2,7 +2,8 @@
 <!-- 主体 -->
 {block name="body"}
 <form class="layui-form body-content">
-	<table class="layui-table layui-table-form">
+	<h3 class="h3-title">知识关键字</h3>
+	<table class="layui-table">
 		<tr>
 			<td class="layui-td-gray">关键字名称<font>*</font></td>
 			<td>				
@@ -29,7 +30,6 @@
 		<input type="hidden" name="id" value="{$id}" />
 		<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform">立即提交</button>
 		<button type="reset" class="layui-btn layui-btn-primary">重置</button>
-		<button lay-event="back" class="layui-btn layui-btn-primary">返回</button>
 	</div>
 </form>
 {/block}
@@ -51,8 +51,7 @@
 				success: function (e) {
 					if (e.code == 0) {
 						layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
-							history.back(-1);
-							layer.close(index);
+							parent.location.reload();
 						});
 					} else {
 						layer.msg(e.msg);
@@ -61,11 +60,6 @@
 			})
 			return false;
 		});
-		//监听返回
-		$('.body-content').on('click', '[lay-event="back"]', function () {
-			history.back(-1);
-			return false;
-		});
 	}
 
 </script>
diff --git a/app/home/view/keywords/index.html b/app/home/view/keywords/index.html
index 4b2d816..b77a398 100644
--- a/app/home/view/keywords/index.html
+++ b/app/home/view/keywords/index.html
@@ -16,7 +16,7 @@
 </script>
 <script type="text/html" id="toolbarDemo">
 	<div class="layui-btn-container">
-	<a class="layui-btn layui-btn-normal layui-btn-sm" href="{:url('home/keywords/add')}">+ 添加关键字</a>
+	<button class="layui-btn layui-btn-normal layui-btn-sm" lay-event="add">+ 添加关键字</button>
   </div>
 </script>
 {/block}
@@ -27,6 +27,7 @@
 <script>
 	function init(layui) {
 		var table = layui.table,
+			rightpage = layui.rightpage,
 			form = layui.form;
 
 		var tableIns = table.render({
@@ -63,7 +64,7 @@
 					title: '操作',
 					align: 'center',
 					templet: function (d) {
-						var html = '<div class="layui-btn-group"><a class="layui-btn layui-btn-xs" href="/home/keywords/add?id=' + d.id + '">编辑</a><a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a></div>';
+						var html = '<div class="layui-btn-group"><button class="layui-btn layui-btn-xs" lay-event="edit">编辑</button><button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button></div>';
 						return html;
 					}
 				}]
@@ -87,19 +88,25 @@
 			return false;
 		});
 
-		//删除
+		//表头工具栏事件
+		table.on('toolbar(test)', function(obj){
+			if (obj.event === 'add') {
+				rightpage.open("{:url('home/keywords/add')}");
+				return;
+			}
+		});
+		//监听行工具事件
 		table.on('tool(test)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'edit') {
+				rightpage.open('/home/keywords/add?id='+obj.data.id);
+				return;
+			}
 			if (obj.event === 'del') {
-				layer.confirm('确定要删除吗?', {
-					icon: 3,
-					title: '提示'
-				}, function (index) {
+				layer.confirm('确定要删除吗？', { icon: 3, title: '提示' }, function (index) {
 					$.ajax({
 						url: "{:url('home/keywords/delete')}",
-						type: 'post',
-						data: {
-							id: obj.data.id
-						},
+						data: { id: data.id },
 						success: function (e) {
 							layer.msg(e.msg);
 							if (e.code == 0) {
@@ -113,6 +120,6 @@
 		});
 	}
 </script>
-{include file="common/layui" base="base" extend="[]" callback="init" /}
+{include file="common/layui" base="base" extend="['rightpage']" callback="init" /}
 {/block}
 <!-- /脚本 -->
\ No newline at end of file
diff --git a/app/home/view/role/index.html b/app/home/view/role/index.html
index 81c7036..b8d2600 100644
--- a/app/home/view/role/index.html
+++ b/app/home/view/role/index.html
@@ -41,10 +41,7 @@
 				, { field: 'title', title: '权限组名称', width: 200 }
 				, { field: 'desc', title: '备注' }
 				, { field: 'status', title: '状态', toolbar: '#status', align: 'center', width: 80 }
-				, {	width: 100,
-					title: '操作',
-					align: 'center',
-					templet: function (d) {
+				, {	width: 100,title: '操作',align: 'center',templet: function (d) {
 						var html = '<div class="layui-btn-group"><button class="layui-btn layui-btn-xs" lay-event="edit">编辑</button><button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button></div>';
 						return html;
 					}
diff --git a/app/home/view/schedule/cate.html b/app/home/view/schedule/cate.html
index d910661..a262685 100644
--- a/app/home/view/schedule/cate.html
+++ b/app/home/view/schedule/cate.html
@@ -10,7 +10,7 @@
 </script>
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
-	<a class="layui-btn layui-btn-normal layui-btn-sm" href="{:url('home/schedule/cate_add')}">+ 添加工作类型</a>
+	<button class="layui-btn layui-btn-normal layui-btn-sm" lay-event="add">+ 添加工作类型</button>
   </div>
 </script>
 {/block}
@@ -21,6 +21,7 @@
 <script>
 	function init(layui) {
 		var table = layui.table,
+			rightpage = layui.rightpage,
 			form = layui.form;
 
 		var tableIns = table.render({
@@ -32,44 +33,43 @@
 			limit: 20,
 			cols: [
 				[{field: 'id',width: 80,title: 'ID编号',align: 'center'}
-				, { field: 'title', width: 180, title: '工作类型名称'}
-				, { field: 'department',width: 300,title: '关联部门'}
+				, { field: 'title', width: 200, title: '工作类型名称'}
+				, { field: 'department',width: 200,title: '关联部门'}
 				, { field: 'remark', title: '备注'}
-				, {
-					field: 'status',
-					width: 80,
-					title: '状态',
-					templet: '#status',
-					align: 'center'
-				},
-				, {width: 100, title: '操作', align: 'center'
-					, templet: function (d) {
+				, {field: 'status', width: 80,title: '状态',templet: '#status',align: 'center'}
+				, {width: 100, title: '操作', align: 'center', templet: function (d) {
 						var html = '<div class="layui-btn-group">';
-						html+='<a class="layui-btn layui-btn-xs" href="/home/schedule/cate_add?id='+d.id+'">编辑</a>';
-						html+= '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>';
-						html+= '</div>';
+						html+='<button class="layui-btn layui-btn-xs" lay-event="edit">编辑</button>';
+						html+='<button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
+						html+='</div>';
 						return html;
 					}
 				}]
 			]
 		});
 
-		//删除
+		//表头工具栏事件
+		table.on('toolbar(test)', function(obj){
+			if (obj.event === 'add') {
+				rightpage.open("{:url('home/schedule/cate_add')}");
+				return;
+			}
+		});
+		//监听行工具事件
 		table.on('tool(test)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'edit') {
+				rightpage.open('/home/schedule/cate_add?id='+obj.data.id);
+				return;
+			}
 			if (obj.event === 'del') {
-				layer.confirm('确定要删除吗?', {
-					icon: 3,
-					title: '提示'
-				}, function (index) {
+				layer.confirm('确定要删除吗？', { icon: 3, title: '提示' }, function (index) {
 					$.ajax({
-						url: "{:url('home/schedule/cate_delete')}",
-						type: 'post',
-						data: {
-							id: obj.data.id
-						},
-						success: function (res) {
-							layer.msg(res.msg);
-							if (res.code == 0) {
+						url: "{:url('home/schedule/delete')}",
+						data: { id: data.id },
+						success: function (e) {
+							layer.msg(e.msg);
+							if (e.code == 0) {
 								obj.del();
 							}
 						}
@@ -80,6 +80,6 @@
 		});
 	}
 </script>
-{include file="common/layui" base="base" extend="[]" callback="init" /}
+{include file="common/layui" base="base" extend="['rightpage']" callback="init" /}
 {/block}
 <!-- /脚本 -->
\ No newline at end of file
diff --git a/app/home/view/schedule/cate_add.html b/app/home/view/schedule/cate_add.html
index 36f93b1..46e501f 100644
--- a/app/home/view/schedule/cate_add.html
+++ b/app/home/view/schedule/cate_add.html
@@ -2,8 +2,9 @@
 <!-- 主体 -->
 {block name="body"}
 <form class="layui-form body-content">
+	<h3 class="h3-title">工作类型</h3>
 	{if condition="$id eq 0"}
-	<table class="layui-table layui-table-form">
+	<table class="layui-table">
 		<tr>
 			<td class="layui-td-gray2">工作类型名称<font>*</font></td>
 			<td>
@@ -65,7 +66,6 @@
 		<input type="hidden" name="id" value="{$id}" />
 		<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform">立即提交</button>
 		<button type="reset" class="layui-btn layui-btn-primary">重置</button>
-		<button lay-event="back" class="layui-btn layui-btn-primary">返回</button>
 	</div>
 </form>
 {/block}
@@ -87,7 +87,7 @@
 				success: function (e) {
 					if (e.code == 0) {
 						layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
-							window.location.href="{:url('home/schedule/cate')}";
+							parent.location.reload();
 						});
 					} else {
 						layer.msg(e.msg);
@@ -96,11 +96,6 @@
 			})
 			return false;
 		});
-		//监听返回
-		$('.body-content').on('click', '[lay-event="back"]', function () {
-			history.back(-1);
-			return false;
-		});
 	}
 
 </script>