feat:调试人情往来事件列表查询页面

src/main/webapp/WEB-INF/pages/favor/list.jsp

@@ -15,13 +15,13 @@
 <div style="margin: 0 auto; width: 90%;">
     <form class="layui-form" action="">
         <div class="layui-inline">
-            <label class="layui-form-label">事件</label>
+            <label class="layui-form-label">事件标题</label>
             <div class="layui-input-inline">
                 <input type="text" id="title" name="title" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-inline">
-            <label class="layui-form-label">人员</label>
+            <label class="layui-form-label">事件对象</label>
             <div class="layui-input-inline">
                 <select id="personId" name="personId" lay-verify="" lay-search>
                     <option value="">请选择</option>
@@ -48,7 +48,7 @@
         </div>
     </form>
 
-    <table id="favorTab" class="layui-hide" lay-filter="person"></table>
+    <table id="favorTab" class="layui-hide" lay-filter="favor"></table>
 </div>
 
 <%-- 表格上方按钮 --%>
@@ -69,19 +69,19 @@
 <script>
     let headUrl = "${pageContext.request.contextPath}";
     layui.use(['laydate', 'table',], function () {
-        var $ = layui.$,//jquery
+        let $ = layui.$,//jquery
             table = layui.table,//表格
             layer = layui.layer,//基础
             laydate = layui.laydate;//日期
-        var myDate = new Date();//获取当前时间设置选择时间的范围
-        var maxtime = myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + (myDate.getDate());//拼接当前是时间
 
-        //初始化选择时间控件
+        //region 初始化选择时间控件
+        let myDate = new Date();//获取当前时间设置选择时间的范围
+        let maxTime = myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + (myDate.getDate());//拼接当前是时间
         laydate.render({
             elem: '#occurDate'
             , type: 'date'
             , range: '~'
-            , max: maxtime//设置选择最大时间为当前
+            , max: maxTime//设置选择最大时间为当前
             , calendar: true
             , btns: ['clear', 'confirm', 'now']
             , done: function (value, date) {
@@ -90,6 +90,7 @@
                 console.log("日期范围的值：" + value)
             }
         });
+        //endregion
         //数据表格渲染
         table.render({
             id: 'favorTab',
@@ -119,15 +120,28 @@
             cols: [[
                 { field: 'occurDate', title: '日期', sort: true },
                 { field: 'title', title: '事件'},
-                { field: 'personName', title: '主体人员'},
+                { field: 'personName', title: '对象', event: 'clickPerson',style:'cursor: pointer;' },
                 { field: 'incomeAmount', title: '收入金额'},
                 { field: 'payAmount', title: '支出金额' },
                 { field: 'remark', title: '备注'},
                 { fixed: 'right', align:'center', width: 240, toolbar: '#barDemo'}
             ]]
         });
-        //搜索
+        //点击查询按钮
         $('#searchBtn').on('click', function () {
+            let terms = {
+                title: $("#title").val(),
+                personId: $("#personId").val()
+            };
+            let occurDate = $("#occurDate").val();
+            let arr = occurDate.split(" ~ ");
+            if(arr.length > 0) {
+                terms.startOccurDate = arr[0];
+                if(arr.length>1) {
+                    terms.endOccurDate = arr[1];
+                }
+            }
+
             table.reload('favorTab', {
                 url: '${pageContext.request.contextPath}/favor/listPage',
                 method: 'post',
@@ -141,12 +155,8 @@
                     pageNo: 1 //重新从第 1 页开始
                 },
                 where : {
-                    terms: {
-                        title: $("#title").val(),
-                        personId: $("#personId").val(),
-                        familyPersonId: $("#familyPersonId").val()
-                    },
-                    sortName: "p.create_time",
+                    terms: terms,
+                    sortName: "occur_date",
                     sortOrder: "asc"
                 }
             });
@@ -154,27 +164,25 @@
         });
 
         //头工具栏事件
-        table.on('toolbar(person)', function (obj) {
+        table.on('toolbar(favor)', function (obj) {
             switch (obj.event) {
                 case 'addFavor':
                     window.location.href = "${pageContext.request.contextPath}/favor/toAdd";
                     break;
-            };
+            }
         });
 
         //监听行工具事件
-        table.on('tool(person)', function (obj) {
-            var data = obj.data;
-            if (obj.event === 'clickAddress') {
-                $("#address").val(data.address);
-                $("#searchBtn").click();
-            } else if (obj.event === 'addFavor') {
-                $("#address").val(data.address);
+        table.on('tool(favor)', function (obj) {
+            let data = obj.data;
+            if (obj.event === 'clickPerson') {
+                $("#personId").val(data.personId);
+                layui.form.render();
                 $("#searchBtn").click();
             } else if (obj.event === 'del') {
                 //eg1
                 layer.confirm('确定要删除？<br/><i>会删掉关联的明细等</i>', {icon: 3, title:'提示'}, function(index){
-                    let url = "${pageContext.request.contextPath}/favor/del/" + data.id;
+                    let url = "${pageContext.request.contextPath}/favor/delete/" + data.id;
                     $.ajax({
                         url:url,
                         type:"POST",