马铁龙 6 年之前
父節點
當前提交
bccb6bf04f

+ 9 - 3
application/admin/controller/Protector.php

@@ -71,9 +71,15 @@ class Protector extends Backend
             if($rules == '*'){
                 $where_usr_id = false;      // 管理员可以看到所有
             } else {
-                $auth_group = Db::table('auth_group')->select();
-                $arr = AuthGroup::getSubs($auth_group,Session::get('admin')['id']);
-                $where_usr_id = ['usr_id'=>['in',$arr]];    //只能查看自己和自己子级的保护客户和签单客户
+                $auth_group = Db::table('auth_group')->select();        // 所有组别
+                $depart_id = Session::get('admin')['depart_id'];        // 所属组别
+
+                // 获取所有子级部门
+                $arr = AuthGroup::getSubs($auth_group,$depart_id);
+                array_push($arr,$depart_id);
+
+                // 只能查看自己和自己子级的保护客户和签单客户
+                $where_usr_id = ['depart_id'=>['in',$arr]];
             }
 
             switch ($status){

+ 11 - 9
application/admin/model/AuthGroup.php

@@ -39,18 +39,20 @@ class AuthGroup extends Model
         return $protect_count;
     }
 
-//获取某个分类的所有子分类
-    public static function getSubs($categorys,$catId=0,$level=1){
-        $subs=array();
-        foreach($categorys as $item){
-            if($item['pid']==$catId){
-                $item['level']=$level;
-                $subs[]=$item['id'];
-                $subs=array_merge($subs,self::getSubs($categorys,$item['id'],$level+1));
 
+    // 获取所有子级id
+    public static function getSubs($arr, $pid){
+        // 拿到所有数据
+        static $ids = [];
+        foreach ($arr as $value){
+            if($value['pid'] == $pid){
+                $ids[] = $value['id'];
+                $ids = array_merge($ids, self::getSubs($arr, $value['id'])) ;
             }
         }
-        return $subs;
+        return array_unique($ids);
     }
 
+
+
 }

+ 1 - 7
public/assets/js/backend/intention.js

@@ -25,14 +25,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'selectpage'], functi
                 showColumns: false,
                 columns: [
                     [
-                        {field: 'unit_name', title: __('Unit_name')},
-                        {field: 'contacts', title: __('Contacts')},
-                        {field: 'con_position', title: __('Con_position'), searchable: false},
+                        {field: 'unit_name', title: '公司名称'},
                         {field: 'unit_type', title: __('Unit_type'), searchable: false},
-                        {field: 'number', title: __('Number'), searchable: false},
-                        {field: 'price', title: '单价', formatter:function (value) {
-                                return '¥  ' + value;
-                        }},
                         {field: 'usr_nickname', title: '操作人'},
                         {field: 'depart_id', title: '操作人部门',searchable: false,searchList: $.getJSON('auth/group/departList'),formatter:function (value, row) {
                                 return row.usr_depart;

+ 27 - 9
public/assets/js/backend/protector.js

@@ -26,17 +26,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'selectpage'], functi
                 // showExport: false,
                 columns: [
                     [
-                        {field: 'unit_name', title: __('Unit_name')},
-                        {field: 'contacts', title: __('Contacts')},
-                        {field: 'con_position', title: __('Con_position'),searchable: false},
-                        {field: 'unit_type', title: __('Unit_type'),searchable: false},
-                        {field: 'number', title: __('Number'),searchable: false},
-                        {field: 'price', title: '单价',searchable: false},
-                        {field: 'total', title: '总价',searchable: false},
+                        {field: 'unit_name', title: '公司名称'},
+                        {field: 'unit_type', title:'单位性质',searchable: false},
+                        {field: 'usr_nickname', title: '操作人'},
                         {field: 'depart_id', title: '操作人部门',searchable: false,searchList: $.getJSON('auth/group/departList'),formatter:function (value, row) {
                                 return row.usr_depart;
                         }},
-                        {field: 'usr_nickname', title: '操作人'},
                         {field: 'pro_date', title: __('Pro_date'), operate:'RANGE', addclass:'datetimerange'},
                         {field: 'ex_date', title: __('Ex_date'),searchable: false, operate:'RANGE', addclass:'datetimerange'},
                         {field: 'operate', title: __('Operate'),searchable: false,visible: status!='contract' ? true : false,
@@ -97,7 +92,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'selectpage'], functi
                             buttons.push({name: 'giveup', text: '放弃', classname: 'btn btn-xs btn-danger btn-giveup'});
                             buttons.push({name: 'sign', text: '签单', classname: 'btn btn-xs btn-success btn-sign'});
                             buttons.push({name: 'follow', text:'跟进', classname: 'btn btn-xs btn-info btn-follow'});
-                            buttons.push({name: 'edit', text:'修改', classname: 'btn btn-xs btn-warning btn-editone'});
+                            buttons.push({name: 'edit', text:'修改', classname: 'btn btn-xs btn-primary btn-editone'});
+                            buttons.push({name: 'detail', text:'详情', classname: 'btn btn-xs btn-warning btn-detail'});
                             break;
                         case 1:
                             buttons.push({name: 'again', text: '再次保护', classname: 'btn btn-xs btn-success btn-again'});
@@ -208,6 +204,28 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'selectpage'], functi
                             maxmin: false
                         });
                     },
+
+                    'click .btn-detail': function clickBtnEditone(e, value, row, index) {
+                        var html = '<table class="table table-striped table-bordered table-hover">';
+                        html += '<tr><td>公司名称</td><td>'+ row.unit_name +'</td></tr>';
+                        html += '<tr><td>联系人</td><td>'+ row.contacts +'</td></tr>';
+                        html += '<tr><td>联系方式</td><td>'+ row.phone +'</td></tr>';
+                        html += '<tr><td>固定电话</td><td>'+ row.fixed_phone +'</td></tr>';
+                        html += '<tr><td>地址</td><td>'+ row.address +'</td></tr>';
+                        html += '<tr><td>联系人职位</td><td>'+ row.con_position +'</td></tr>';
+                        html += '<tr><td>单位性质</td><td>'+ row.unit_type +'</td></tr>';
+                        html += '<tr><td>人数</td><td>'+ row.number +'</td></tr>';
+                        html += '<tr><td>单价</td><td>'+ row.price +'</td></tr>';
+                        html += '<tr><td>备注</td><td>'+ row.remark +'</td></tr>';
+                        html += '<tr><td>总价</td><td>'+ row.total +'</td></tr>';
+                        html += '<tr><td>操作人</td><td>'+ row.usr_nickname +'</td></tr>';
+                        html += '<tr><td>操作人部门</td><td>'+ row.usr_depart +'</td></tr>';
+                        html += '</table>';
+                        Layer.open({
+                            content :   html,
+                            area    :   ['500px'],
+                        })
+                    },
                 }
             }
         }