rabin 3 rokov pred
rodič
commit
d094878b97
4 zmenil súbory, kde vykonal 175 pridanie a 1 odobranie
  1. 39 1
      database/admin.php
  2. 79 0
      database/admin_group.php
  3. 14 0
      database/group.php
  4. 43 0
      src/Company.php

+ 39 - 1
database/admin.php

@@ -140,6 +140,16 @@ return array
 			'update' => array('role_id' => 'role'),
 			# 同步更新的类型,delete为先删再插入,update为先查询是否存在,存在直接更新,不存在则插入, only为仅更新
 			'type' => 'delete',
+		),
+
+		'manage/admin_group' => array
+		(
+			# 更新时的条件,另外一个表的字段 => 本表的字段
+			'where' => array('admin_id', 'id'),
+			# 要更新的数据
+			'update' => array('group_id' => 'group'),
+			# 同步更新的类型,delete为先删再插入,update为先查询是否存在,存在直接更新,不存在则插入, only为仅更新
+			'type' => 'delete',
 		)
 	),
 	/*
@@ -645,11 +655,27 @@ return array
 		(
 			'type' 		=> 'varchar-2000',
 			'name' 		=> '所属部门',
-			'default' 	=> '',
+			'default' 	=> '1',
 			'desc' 		=> '请选择所属部门',
 			'match' 	=> 'is_string',
 			'option' 	=> $company_group,
 			'update'	=> 'checkbox',
+			/*
+			'option' 	=> $company,
+			'update'	=> 'checkbox',
+			'update'	=> array
+			(
+				array
+                (
+                    'col'       => 'group_id',
+                    'name'      => '选择部门',
+                    'default'   => '',
+                    'desc'      => '选择部门',
+                    'match'     => 'is_string',
+                    'update'    => 'select',
+                    'update_search' => 'manage/company.search',
+                ),
+			),*/
 			//'list'		=> true,
 			# 取代option,从接口里读取选项
 			//'update_search' => 'goods/lib/manage.search_sku',
@@ -942,5 +968,17 @@ return array
             'type' => 'all',
             'col' => '*|id',
         ),
+
+        'getAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'ids' => array('yes-id', 'in'),
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'col' => '*',
+        ),
 	),
 );

+ 79 - 0
database/admin_group.php

@@ -0,0 +1,79 @@
+<?php
+/*
+|--------------------------------------------------------------------------
+| admin.php 管理员表
+|--------------------------------------------------------------------------
+*/
+
+return array
+(
+	# 表名
+	'name' => 'admin_group',
+	# 显示给用户看的名称
+	'lang' => '管理员部门关联表',
+	'menu' => false,
+
+	# 数据结构
+	'struct' => array
+	(
+		'id' 		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'ID',
+			'default' 	=> '',
+			'desc' 		=> '',
+			'match' 	=> 'is_numeric',
+			'search'	=> 'order',
+			'list'		=> true,
+		),
+		
+		'admin_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '管理员ID',
+			'default' 	=> '',
+			'desc' 		=> '管理员ID',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'text',
+			'list'		=> true,
+		),
+
+		'group_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '部门ID',
+			'default' 	=> '',
+			'desc' 		=> '部门ID',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'text',
+			'list'		=> true,
+		),
+		
+		'cdate'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '录入时间',
+			'match' 	=> array('is_numeric', DEVER_TIME),
+			'desc' 		=> '',
+			# 只有insert时才生效
+			'insert'	=> true,
+			'list'		=> 'date("Y-m-d H:i:s", {cdate})',
+		),
+	),
+
+	# request 请求接口定义
+	'request' => array
+	(
+		'getAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'group_id' => 'yes',
+                'admin_id' => array('yes', '!='),
+            ),
+            'type' => 'all',
+            'col' => '*|admin_id',
+        ),
+	)
+);

+ 14 - 0
database/group.php

@@ -88,6 +88,20 @@ $config = array
 			//'option'	=> $area,
 		),
 
+		'reorder'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '排序',
+			'default' 	=> '1',
+			'desc' 		=> '请输入排序',
+			'match' 	=> 'option',
+			//'update'	=> 'text',
+			//'search'	=> 'order',
+			//'list'		=> true,
+			//'order'		=> 'desc',
+			//'edit'		=> true,
+		),
+
 		'state'		=> array
 		(
 			'type' 		=> 'tinyint-1',

+ 43 - 0
src/Company.php

@@ -55,6 +55,8 @@ class Company extends Save
             if ($company) {
                 $company_id = $company[0]['id'];
                 $this->set($company_id);
+            } else {
+                $company_id = false;
             }
         }
         return $company_id;
@@ -111,4 +113,45 @@ class Company extends Save
             Dever::db('manage/group')->insert($data);
         }
     }
+
+    # 获取部门
+    public function getGroup()
+    {
+        $where = array();
+        $company_id = $this->get();
+        if ($company_id) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = 1;
+        }
+        $group = Dever::db('manage/group')->select($where);
+
+        return $group;
+    }
+
+    # 获取部门下的员工
+    public function getAdmin($group, $id = false)
+    {
+        $where['group_id'] = $group;
+        if ($id) {
+            $where['admin_id'] = $id;
+        }
+        $data = Dever::db('manage/admin_group')->getAll($where);
+        if ($data) {
+            $ids = array_keys($data);
+            return Dever::db('manage/admin')->getAll(array('ids' => $ids));
+        }
+        return array();
+    }
+
+    public function search_api()
+    {
+        $where = array();
+
+        $cate = Dever::input('cate');
+        if ($cate) {
+            $where['company_id'] = $cate;
+        }
+        return Dever::search('manage/group', $where);
+    }
 }