Browse Source

优化图标

huangsanjia 2 năm trước cách đây
mục cha
commit
8a6f8f970a

+ 7 - 7
application/admin/controller/Entrust.php

@@ -465,14 +465,14 @@ class Entrust extends Backend
                 if (empty($entrust_id)) {
                     $res_check = Db::name('res')->insert($params[$i]);
                 } else {
-                    $data =Db::name('res')
-                        ->where('entrust_id',$idList[$i])
-                        ->where('id',$entrust_id['id'])
-                        ->update(['delete_time'=>date('Y-m-d H:i:s',time())]);
-                    if (!$data){
-                        $record[$i] = $idList[$i];
+                    if ($entrust_id['status'] != 1){
+                        $data =Db::name('res')
+                            ->where('id',$entrust_id['id'])
+                            ->update(['delete_time'=>date('Y-m-d H:i:s',time())]);
+                        $res_check = Db::name('res')->insert($params[$i]);
+                    }else{
+                        $res_check = true;
                     }
-                    $res_check = Db::name('res')->insert($params[$i]);
                 }
                 $log_res = Db::name('entrust_log')->insert($log[$i]);
                 if (!$log_res || !$res_check) {

+ 2 - 2
application/admin/view/entrust/index.html

@@ -20,8 +20,8 @@
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('entrust/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('entrust/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('entrust/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-printing btn-disabled disabled {:$auth->check('entrust/print')?'':'hide'}" title="打印" ><i class="fa fa-pencil"></i>打印委托单</a>
-                        <a href="javascript:;" class="btn btn-success btn-submits btn-disabled disabled {:$auth->check('entrust/submits')?'':'hide'}" title="批量提交" ><i class="fa fa-pencil"></i>批量提交</a>
+                        <a href="javascript:;" class="btn btn-success btn-printing btn-disabled disabled {:$auth->check('entrust/print')?'':'hide'}" title="打印" ><i class="glyphicon glyphicon-floppy-disk"></i>打印委托单</a>
+                        <a href="javascript:;" class="btn btn-success btn-submits btn-disabled disabled {:$auth->check('entrust/submits')?'':'hide'}" title="批量提交" ><i class="glyphicon glyphicon-ok-circle"></i>批量提交</a>
 
 <!--                        <div class="dropdown btn-group {:$auth->check('entrust/multi')?'':'hide'}">-->
 <!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->

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

@@ -22,7 +22,7 @@
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('res/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
 <!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('res/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         <a href="javascript:POBrowser.openWindowModeless('http://www.6in7.cn/SendParameters/SendParameters.php?doc=/www/wwwroot/res.7in6.com/public/test.doc' , 'width=1200px;height=800px;');">编辑文档</a>
-                        <a href="javascript:;" class="btn btn-success btn-reports btn-disabled disabled {:$auth->check('res/report')?'':'hide'}" title="批量导出" ><i class="fa fa-pencil"></i> 批量导出</a>
+                        <a href="javascript:;" class="btn btn-success btn-reports btn-disabled disabled {:$auth->check('res/report')?'':'hide'}" title="批量导出" ><i class="glyphicon glyphicon-export"></i> 批量导出</a>
                         <a href="javascript:;" class="btn btn-success btn-couse btn-disabled disabled {:$auth->check('res/couse')?'':'hide'}" title="批量审核" ><i class="fa fa-pencil"></i> 批量审核</a>
 
                         <div class="dropdown btn-group {:$auth->check('res/multi')?'':'hide'}">