Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

tool/work/assets/pc/html/index.html

@@ -344,6 +344,20 @@ body{
       <{endif}>
       <{endforeach}>
   <{endif}>
+        <{if(isset($jilu['time']) && $jilu['time'] ):}>
+      <div class="layui-col-lg row3">
+      <div class="grid-demo "><i class="layui-icon layui-icon-praise" style=" color: #1E9FFF;"></i><{$jilu['time']}></div>
+      <div class="grid-demo" style="margin-bottom:10px; margin-top:10px;"><{$info['admin']}></div>
+      <{endif}>
+  <{if(isset($jilu['finish']) && $jilu['finish']):}>
+      <div class="layui-col-lg row3">
+        <div class="grid-demo">
+        <!-- <button type="button" class="layui-btn"> -->
+          <button class="layui-btn layui-btn-radius layui-btn-primary" style="margin-left:-15px;"><{$jilu['finish']}></button>
+        <!-- </button> -->
+        </div>
+      </div>
+      <{endif}>
   </div>
     </article>
 </div>

tool/work/database/appoint.php

@@ -81,6 +81,18 @@ return array
             // 'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
         ),
 
+        'admin'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '指派的人',
+            'default'   => '',
+            'desc'      => '指派的人',
+            'match'     => 'option',
+            // 'search'    => 'linkage',
+            'update'    => 'hidden',
+            // 'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
+        ),
+
         'desc'       => array
         (
             'type'      => 'text-255',
@@ -198,5 +210,20 @@ return array
             // 'order' => array('id' => 'desc'),
             'col' => '*|info_id',
         ),
+
+        'getAdmin' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'info_id' => 'yes',
+                'admin' => array('yes','!='),
+                // 'end' =>array('yes-cdate','<='),
+                'state' => 1,
+            ),
+            'type' => 'one',
+            'order' => array('id' => 'desc'),
+            'col' => '*',
+        ),
     ),
 );

tool/work/database/info.php

@@ -88,7 +88,7 @@ if ($search_auth == 2) {
     $insert = false;
     $audit_admin = Dever::setInput('search_option_col', $admin_id);
     $data[]= array('待我处理',function() use ($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,2);}, 'search_option_dever_auth=2&search_option_status=2&search_option_appoint_id=' . $admin_id);
-    $data[]= array('处理完成',function() use($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,3);}, 'search_option_dever_auth=2&search_option_status=3&search_option_appoint_id=' . $admin_id);
+    $data[]= array('处理完成',function() use($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,'3,4');}, 'search_option_dever_auth=2&search_option_status=3&search_option_appoint_id=' . $admin_id);
     $data[]= array('我创建的',function() use($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,false);}, 'search_option_dever_auth=2&search_option_audit_admin=' . $admin_id);
 } 
 $button = array();
@@ -351,6 +351,19 @@ return array
             'list_order' => 1,
         ),
 
+        'fpeople'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '完成人',
+            'default'   => '',
+            'desc'      => '完成人',
+            'match'     => 'option',
+            // 'search'    => 'select',
+            'update'    => 'hidden',
+            // 'option'    => $product,
+            // 'list'      => true,
+        ),
+
         'zdate'     => array
         (
             'type'      => 'int-11',
@@ -453,7 +466,7 @@ return array
     (
         'list_option' => array
         (
-         'col' => 'yes-appoint_id,audit_admin',
+         'col' => 'yes-appoint_id,audit_admin,fpeople',
         ),
         'getSearch' => array
         (
@@ -472,8 +485,9 @@ return array
             (
                 'audit_admin' => 'yes',
                 'appoint_id' => 'yes',
+                'fpeople' => 'yes',
                 'state' => 1,
-                'status'=> 'yes',
+                'status'=> array('yes','in'),
                 'company_id'=>'yes',
             ),
             'type' => 'count',
@@ -492,6 +506,7 @@ return array
                 'start' => array('yes-cdate','>='),
                 'end' => array('yes-cdate','<='),
                 'status'=> array('yes','in'),
+                'fpeople' => array('yes','in'),
             ),
             'type' => 'count',
             // 'order' => array('reorder' => 'desc', 'id' => 'asc'),

tool/work/lib/Appoint.php

@@ -38,6 +38,7 @@ Class Appoint
         $info_id = Dever::param('info_id',$data);
         if ($info_id) {
             $info = Dever::db('work/info')->find($info_id);
+            // print_R($info);die;
             if ($info['appoint_id'] != $admin['id'] && $admin['id'] != $info['audit_admin']) {
                 Dever::alert('reload');
             }
@@ -93,6 +94,9 @@ Class Appoint
 				// }
 				$wh['where_id'] = $id;
 				$wh['group'] = $branch[0];
+                if(isset($branch[1]) && $branch[1]) {
+                    $wh['admin'] = $branch[1];
+                }
 				Dever::db('work/appoint')->update($wh);
 			}
 		}
@@ -249,6 +253,7 @@ Class Appoint
     	$data['info']['priority_name'] = $priority['name'];
     	$data['info']['color'] = $priority['color'];
     	$admin = Dever::db('manage/admin')->find($data['info']['audit_admin']);
+        // print_R($admin);die;
         $admin['group'] = explode(',',$admin['group']);
         foreach ($admin['group'] as $k => $v) {
             $group = Dever::db('manage/group')->find(array('company_id'=>$data['info']['company_id'],'id'=>$v));
@@ -408,6 +413,18 @@ Class Appoint
         		}
         	}
 		}
+        $data['jilu'] = array();
+        if (!$data['zhi']) {
+            if ($data['info']['fdate']) {
+                // $time = $data['info']['fdate']-$ztime;
+                $data['jilu']['time'] = date('Y-m-d H:i:s',$data['info']['fdate']);
+                if ($data['info']['status'] == 3) {
+                    $data['jilu']['finish'] = '完成关闭';
+                } elseif ($data['info']['status'] == 4) {
+                     $data['jilu']['finish'] = '取消关闭';
+                }
+             }
+        }
         if ($data['info']['status'] < 3) {
             $data['hui'] = Dever::url('project/database/update?project=work&table=appoint&search_option_info_id='.$info_id, 'manage');
         } 

tool/work/lib/Cron.php

@@ -30,10 +30,21 @@ Class Cron
         $question = array_keys($question);
         $data['info']['app'] = Dever::db('work/info')->getCount(array('question'=>$question,'end'=>$end));
         $data['info']['xu'] = Dever::db('work/info')->getCount(array('group'=>$data['branch']['group_id'],'end'=>$end,'status'=>2));
-        $app = Dever::db('work/appoint')->getYAll(array('group'=>$data['branch']['group_id']));
-        $app = array_keys($app);
-        $data['info']['yi'] = Dever::db('work/info')->getCount(array('id'=>$app,'end'=>$end,'status'=>'3,4'));
-
+        // $app = Dever::db('work/appoint')->getYAll(array('group'=>$data['branch']['group_id']));
+        // $app = array_keys($app);
+        // $data['info']['yi'] = Dever::db('work/info')->getCount(array('id'=>$app,'end'=>$end,'status'=>'3,4'));
+        $admin = explode(',',$data['branch']['group']);
+        if ($data['branch']['coor']) {
+            $coor = explode(',',$data['branch']['coor']);
+            if (isset($coor) && $coor[0] && $coor[0] >0) {
+                $people = $data['branch']['coor'].','.$admin[1];
+            } else {
+                 $people = $admin[1];
+            } 
+        } else {
+            $people = $admin[1];
+        }
+        $data['info']['yi'] = Dever::db('work/info')->getCount(array('fpeople'=>$people,'end'=>$end,'status'=>'3,4'));
         // $data['info']['wei'] = Dever::db('work/info')->getCount(array('group'=>$data['branch']['group_id'],'start'=>$start,'end'=>$end,'status'=>4));
 
         $data['question'] = Dever::db('work/question')->getAll(array('branch_id'=>$data['branch']['group_id']));

tool/work/lib/Manage.php

@@ -59,6 +59,13 @@ Class Manage
 			}
 			$where['fdate'] = time();
 			$where['chdate'] = time();
+			$app = Dever::db('work/appoint')->getAdmin(array('info_id'=>$data['id'],'admin'=>$data['audit_admin']));
+			if ($app && $app['admin']) {
+				$where['fpeople'] = $app['admin'];
+			} else {
+				$where['fpeople'] = $data['audit_admin'];
+			}
+			if ($app['admin_id'] != $data['audit_admin'])
 			Dever::db('work/info')->update($where);
 			$log = Dever::db('work/info_log')->find(array('info_id'=>$id));
 			if ($log) {
@@ -354,7 +361,12 @@ Class Manage
 		
 		if ($status){
 			$where['status'] = $status;
-			$where['appoint_id'] = $admin_id;
+			if ($where['status'] == 2) {
+				$where['appoint_id'] = $admin_id;
+			} else {
+				$where['fpeople'] = $admin_id;
+			}
+			
 		} else {
 			$where['audit_admin'] = $admin_id;
 		}