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

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

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

@@ -133,12 +133,12 @@
                    }
                },
                { field: 'createUserName', width: 300, sort: true, title: '创建者' },
                { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
                { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
                { field: 'enabled', width: 100, sort: true, templet: '#doctor-templete-tpl-state', title: '状态' },
                { field: 'recordTitle', width: 300, toolbar: '#doctor-templete-table-bar', sort: true, title: '操作' },
            ]],
            done:function(){
                permissionsInput();
            done:function(res){
                permissionsInput(res,config);
            }
        });

@@ -148,6 +148,20 @@
            var layEvent = obj.event;
            if (layEvent === 'edit') { // 查看详情
                showEditModel(data, 2);
            }else if(layEvent === 'del'){
                layer.confirm('确定删除此用户吗？', function (i) {
                    layer.close(i);
                    layer.load(2);
                    admin.req('api-opration/doctortemplete/' + obj.data.id, {}, function (data) {
                        layer.closeAll('loading');
                        if (data.code == 0) {
                            layer.msg(data.msg, { icon: 1, time: 500 });
                            table.reload('app-table', {});
                        } else {
                            layer.msg(data.msg, { icon: 2, time: 500 });
                        }
                    }, 'delete');
                });
            }
        });