edit

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/lib/Appoint.php

@@ -253,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));
@@ -412,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/Manage.php

@@ -62,6 +62,8 @@ Class Manage
 			$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);