浏览代码

用户回收站

lizhen_gitee 1 月之前
父节点
当前提交
3a05b796db

+ 1 - 0
application/admin/lang/zh-cn/user/user.php

@@ -22,5 +22,6 @@ return [
     'Mini_openid'         => '微信小程序openid',
     'Address'             => '详细地址',
     'Company_id'          => '维保公司ID',
+    'Deletetime'          => '删除时间',
     'Company.companyname' => '公司名'
 ];

+ 3 - 2
application/admin/model/User.php

@@ -4,12 +4,13 @@ namespace app\admin\model;
 
 use think\Model;
 use app\common\library\Tenim;
+use traits\model\SoftDelete;
 
 
 class User extends Model
 {
 
-    
+    use SoftDelete;
 
     
 
@@ -22,7 +23,7 @@ class User extends Model
     // 定义时间戳字段名
     protected $createTime = 'createtime';
     protected $updateTime = 'updatetime';
-    protected $deleteTime = false;
+    protected $deleteTime = 'deletetime';
 
     // 追加属性
     protected $append = [

+ 1 - 1
application/admin/view/user/user/index.html

@@ -31,7 +31,7 @@
                             </ul>
                         </div>
 
-                        
+                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('user.user/recyclebin')?'':'hide'}" href="user.user/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('user/user/edit')}"

+ 25 - 0
application/admin/view/user/user/recyclebin.html

@@ -0,0 +1,25 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        {:build_toolbar('refresh')}
+                        <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('user.user/restore')?'':'hide'}" href="javascript:;" data-url="user.user/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
+                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('user.user/destroy')?'':'hide'}" href="javascript:;" data-url="user.user/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
+                        <a class="btn btn-success btn-restoreall {:$auth->check('user.user/restore')?'':'hide'}" href="javascript:;" data-url="user.user/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
+                        <a class="btn btn-danger btn-destroyall {:$auth->check('user.user/destroy')?'':'hide'}" href="javascript:;" data-url="user.user/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover"
+                           data-operate-restore="{:$auth->check('user.user/restore')}"
+                           data-operate-destroy="{:$auth->check('user.user/destroy')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

+ 67 - 6
public/assets/js/backend/user/user.js

@@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 初始化表格参数配置
             Table.api.init({
                 extend: {
-                    index_url: 'user/user/index' + location.search,
-                    add_url: 'user/user/add',
-                    edit_url: 'user/user/edit',
-//                    del_url: 'user/user/del',
-                    multi_url: 'user/user/multi',
-                    import_url: 'user/user/import',
+                    index_url: 'user.user/index' + location.search,
+                    add_url: 'user.user/add',
+                    edit_url: 'user.user/edit',
+                    del_url: 'user.user/del',
+                    multi_url: 'user.user/multi',
+                    import_url: 'user.user/import',
                     table: 'user',
                 }
             });
@@ -54,6 +54,67 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
+        recyclebin: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    'dragsort_url': ''
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: 'user.user/recyclebin' + location.search,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {
+                            field: 'deletetime',
+                            title: __('Deletetime'),
+                            operate: 'RANGE',
+                            addclass: 'datetimerange',
+                            formatter: Table.api.formatter.datetime
+                        },
+                        {
+                            field: 'operate',
+                            width: '140px',
+                            title: __('Operate'),
+                            table: table,
+                            events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'Restore',
+                                    text: __('Restore'),
+                                    classname: 'btn btn-xs btn-info btn-ajax btn-restoreit',
+                                    icon: 'fa fa-rotate-left',
+                                    url: 'user.user/restore',
+                                    refresh: true
+                                },
+                                {
+                                    name: 'Destroy',
+                                    text: __('Destroy'),
+                                    classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
+                                    icon: 'fa fa-times',
+                                    url: 'user.user/destroy',
+                                    refresh: true,
+                                    confirm:'是否彻底删除数据?无法找回!'
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate
+                        }
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+
         add: function () {
             Controller.api.bindevent();
         },