Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2021-02-26 e7c3314727fc06444689c0e6ecab5fea337afeb0

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html

@@ -8,13 +8,13 @@
    </div>
    <div class="layui-card-body">
        <div class="layui-form toolbar">&emsp;
            <input id="user-search-value" class="layui-input search-input" type="text" placeholder="输入医生姓名" />&emsp;
            <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
            <input id="user-search-value" class="layui-input search-input" type="text" placeholder="按医生姓名" />&emsp;
            <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="开始时间" autocomplete="off"
                class="layui-input search-input">
            至
            <input type="text" name="date" id="dateend" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
            <input type="text" name="date" id="dateend" lay-verify="date" placeholder="结束时间" autocomplete="off"
                class="layui-input search-input"> &emsp;
            <button id="user-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
            <button id="user-btn-search" class="layui-btn icon-btn permissioins" permissioins="feedback-list"><i class="layui-icon">&#xe615;</i>搜索</button>
        </div>

        <table class="layui-table" id="feedback-table" lay-filter="feedback-table"></table>
@@ -24,7 +24,7 @@
<!-- 表格操作列 -->
<script type="text/html" id="feeedback-table-bar">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs permissioins" permissioins="feedback-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="user-tpl-state">
@@ -65,10 +65,14 @@
                { field: 'doctorTel', width: 200, title: '联系电话' },
                { field: 'hospitalName', width: 300, title: '医院' },
                { field: 'departmentName', width: 180, title: '科室' },
                { field: 'enabled', width: 150, templet: '#user-tpl-state', sort: true, title: '状态' },
                { field: 'createTime', width: 200, sort: true, title: '创建时间' },
                { align: 'center', width: 200, toolbar: '#feeedback-table-bar', title: '操作' }
            ]]
                { field: 'enabled', width: 150, templet: '#user-tpl-state',  title: '状态' },
                { field: 'createTime', width: 200, title: '创建时间',templet:function(d){
                    return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                } },
                { align: 'center', width: 150, toolbar: '#feeedback-table-bar', title: '操作',fixed: 'right' }
            ]],done:function(res){
                permissionsInput(res,config);
            }
        });

        // 修改状态
@@ -80,9 +84,9 @@
            }, function (data) {
                layer.closeAll('loading');
                if (data.code == 0) {
                    layer.msg(data.msg, { icon: 1, time: 500 });
                    layer.msg(data.msg, { icon: 1, time: 2000 });
                } else {
                    layer.msg(data.msg, { icon: 2, time: 500 });
                    layer.msg(data.msg, { icon: 2, time: 2000 });
                    $(obj.elem).prop('checked', !obj.elem.checked);
                    form.render('checkbox');
                }
@@ -97,7 +101,7 @@
                    layer.load(2);
                    admin.req('api-opration/sysfeedback/' + obj.data.id, {}, function (data) {
                        layer.closeAll('loading');
                        layer.msg(data.msg, { icon: 1, time: 500 }, function () {
                        layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
                            tableLoad();
                        });
                        obj.del();
@@ -122,7 +126,7 @@
                            });
                        }
                        else {
                            layer.msg('未找到相关数据', { icon: 1, time: 500 });
                            layer.msg('未找到相关数据', { icon: 1, time: 2000 });
                        }
                    },
                    beforeSend: function (xhr) {
@@ -146,8 +150,7 @@
                dateend = dateUtil.getNowDate();
                $('#dateend').val(dateend);
            }
            table.reload('feedback-table', { where: { doctorName: doctorName, createTime: datebegin, updateTime: dateend } });
            table.reload('feedback-table', { where: { doctorName: doctorName, createTime: datebegin, updateTime: dateend },page: {curr: 1  } });
        });

    });
</script>