diff --git a/app-ht/modules/device/controllers/DeviceController.php b/app-ht/modules/device/controllers/DeviceController.php
index 5acc9b2..c703183 100644
--- a/app-ht/modules/device/controllers/DeviceController.php
+++ b/app-ht/modules/device/controllers/DeviceController.php
@@ -7,6 +7,7 @@ use yii\base\Exception;
 use yii\data\Pagination;
 use app\ht\controllers\BaseController;
 use common\helpers\Utils;
+use common\models\AdminLog as AdminLogModel;
 use domain\device\DeviceAuthFailRepository;
 use domain\device\models\DeviceAuthFail as DeviceAuthFailModel;
 use domain\device\DeviceStatus;
@@ -17,6 +18,7 @@ use domain\device\models\Device as DeviceModel;
 use domain\device\CreateBatch;
 
 use stdClass;
+use yii\helpers\Url;
 
 /**
  * 设备管理
@@ -151,7 +153,12 @@ class DeviceController extends BaseController
     public function actionDeleteIndex()
     {
         $params = $this->dataList(1, 1);
-
+        $user = Yii::$app->user->identity;
+        if (isset($user->username) && 'admin' == $user->username) {
+            $params['is_admin'] = 1;
+        } else {
+            $params['is_admin'] = 0;
+        }
         return $this->render('delete-index', $params);
     }
 
@@ -281,7 +288,6 @@ class DeviceController extends BaseController
             $user = Yii::$app->user->identity;
             if (isset($user->is_manufacture) && $user->is_manufacture == 1) {
                 $where = 'sys_user_id = '.$user->id;
-
             } else {
                 $where = 'id >0';
             }
@@ -536,6 +542,59 @@ class DeviceController extends BaseController
     }
 
     /**
+     * @return string
+     */
+    public function actionDelDeviceForever()
+    {
+        $req = Yii::$app->request;
+        $ids = $req->post('ids');
+        $e = new stdClass();
+        $e->success = false;
+        $e->message = 'fail';
+        $ids = explode(',', $ids);
+
+        $user = Yii::$app->user->identity;
+        if (!isset($user->username) || 'admin' != $user->username || 1 == $user->is_manufacture) {
+            $e->message = '删除失败, 只有超管理员能删除';
+            return $this->renderJson($e);
+        }
+        $deviceModels = DeviceRepository::findAll(['id' => $ids]);
+        if (empty($deviceModels)) {
+            $e->message = '找不到该设备';
+            return $this->renderJson($e);
+        }
+
+        $deleteItems = [];
+        foreach ($deviceModels as $k => $v) {
+            $deleteItems[] = $v->toArray();
+        }
+        $trans = Yii::$app->getDb()->beginTransaction();
+        try {
+            DeviceModel::deleteAll(['id' => $ids]);
+            $userName = Yii::$app->user->identity->username;
+            $tableName = DeviceModel::tableName();
+            $description = sprintf("%s删除了表%s的数据%s", $userName, $tableName, json_encode($deleteItems, JSON_UNESCAPED_UNICODE));
+            $route = Url::to();
+            $userId = Yii::$app->user->id;
+            $ip = Utils::clientIp();
+            $model = new AdminLogModel();
+            $model->route = $route;
+            $model->description = $description;
+            $model->user_id = $userId;
+            $model->ip = $ip;
+            $model->save();
+            $trans->commit();
+            $e->message = '成功删除'. count($ids).'条记录';
+            $e->success = true;
+        } catch(Exception $exception) {
+            $trans->rollBack();
+            $e->message = '删除失败';
+        }
+
+        return $this->renderJson($e);
+    }
+
+    /**
      * 编辑
      * @return string
      */
diff --git a/app-ht/modules/device/views/device/delete-index.php b/app-ht/modules/device/views/device/delete-index.php
index 9f986a5..8c7356d 100644
--- a/app-ht/modules/device/views/device/delete-index.php
+++ b/app-ht/modules/device/views/device/delete-index.php
@@ -91,7 +91,7 @@ $this->params['breadcrumbs'][] =  $this->title;
     <div  class="panel-body">
         <ul id="countryTab" class="nav nav-tabs" style="margin-bottom: 20px">
             <li ><a style="padding: 10px 20px;" href="<?=Url::toRoute('/device/device/index')?>" >全部序列号</a></li>
-            <li class="active" ><a style="padding: 10px 12px;" href="<?=Url::toRoute('/device/device/delete-index')?>" >删除序列号</a></li>
+            <li class="active" ><a style="padding: 10px 12px;" href="<?=Url::toRoute('/device/device/delete-index')?>" >已删序列号</a></li>
         </ul>
 
         <table class="table table-striped table-bordered"  id="brand-table">
@@ -107,7 +107,7 @@ $this->params['breadcrumbs'][] =  $this->title;
                 <th width="8%">申请时间</th>
                 <th width="8%">授权时间</th>
                 <th width="8%">状态</th>
-                <th width="7%">状态</th>
+                <th width="8%">状态</th>
                 <th >操作</th>
             </tr>
             </thead>
@@ -150,6 +150,7 @@ $this->params['breadcrumbs'][] =  $this->title;
                         <td class="td-cls">
                             <button class="btn btn-info btn-sm btn_edit" aid="<?=$item['id'] ?>" data-action="edit">编辑</button> &nbsp;|&nbsp;
                             <button class="btn btn-warning btn-sm btn_restore" aid="<?=$item['id'] ?>">恢复</button>
+                            <?php if($is_admin) {?><button class="btn btn-danger btn-sm btn_del_forever" aid="<?=$item['id'] ?>">彻底删除</button><?php }?>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -164,6 +165,7 @@ $this->params['breadcrumbs'][] =  $this->title;
         </table>
         <div class="action-box">
             <label><input type="checkbox" class="check-all" value="all" /> 本页全选 </label> <button class="btn btn-primary btn-sm btn_batch_auth" >批量恢复</button>
+            <?php if($is_admin) {?><button class="btn btn-danger btn-sm btn_batch_del_forever" >彻底删除</button><?php }?>
         </div>
     </div>
 
@@ -180,6 +182,7 @@ $this->params['breadcrumbs'][] =  $this->title;
 <script>
     var authURL = "<?=Url::toRoute('/device/device/auth-device')?>";
     var delURL = "<?=Url::toRoute('/device/device/del-device')?>";
+    var delForeverURL = "<?=Url::toRoute('/device/device/del-device-forever')?>";
     var restoreURL = "<?=Url::toRoute('/device/device/restore-device')?>";
     var batchRestoreURL = "<?=Url::toRoute('/device/device/batch-restore-device')?>";
     var doEditURL = "<?=Url::toRoute('/device/device/do-edit')?>";
@@ -276,5 +279,49 @@ $this->params['breadcrumbs'][] =  $this->title;
             }, 'json')
         })
 
+        $('.btn_del_forever').click(function(e){
+            if(!confirm('彻底删除之后不能恢复！')) {
+                return false;
+            }
+            var ids = $(this).attr('aid');
+            $.post(delForeverURL,{ids:ids},function(res){
+                if (res.success) {
+                    alert(res.message);
+                    var _body = window.parent;
+                    var _iframe1=_body.document.getElementById('x-iframe');
+                    _iframe1.contentWindow.location.reload(true);
+                } else {
+                    alert(res.message);
+                }
+            }, 'json')
+        })
+
+        $('.btn_batch_del_forever').click(function(e) {
+            var checkedItems = $('.check-item:checked');
+            if (0 == checkedItems.length) {
+                alert('未选择删除项');
+                return false;
+            }
+            if(!confirm('选中'+checkedItems.length+'条记录。彻底删除之后不能恢复！')) {
+                return false;
+            }
+            var ids = [];
+            $.each(checkedItems, function(i,n){
+                ids.push($(n).val())
+            })
+            ids = ids.join(',');
+
+            $.post(delForeverURL,{ids:ids},function(res){
+                if (res.success) {
+                    alert(res.message);
+                    var _body = window.parent;
+                    var _iframe1=_body.document.getElementById('x-iframe');
+                    _iframe1.contentWindow.location.reload(true);
+                } else {
+                    alert(res.message);
+                }
+            }, 'json')
+        })
+
     });
 </script>
\ No newline at end of file
diff --git a/app-ht/modules/device/views/device/index.php b/app-ht/modules/device/views/device/index.php
index 3e69a7c..530529c 100644
--- a/app-ht/modules/device/views/device/index.php
+++ b/app-ht/modules/device/views/device/index.php
@@ -93,7 +93,7 @@ $this->params['breadcrumbs'][] =  $this->title;
     <div  class="panel-body">
         <ul id="countryTab" class="nav nav-tabs" style="margin-bottom: 20px">
             <li class="active" ><a style="padding: 10px 20px;" href="<?=Url::toRoute('/device/device/index')?>" >全部序列号</a></li>
-            <li ><a style="padding: 10px 12px;" href="<?=Url::toRoute('/device/device/delete-index')?>" >删除序列号</a></li>
+            <li ><a style="padding: 10px 12px;" href="<?=Url::toRoute('/device/device/delete-index')?>" >已删序列号</a></li>
         </ul>
 
         <table class="table table-striped table-bordered"  id="brand-table">
--
libgit2 0.21.0