edit

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

@@ -11,7 +11,7 @@
 <meta name="format-detection" content="telephone=no">
 <link rel="stylesheet" type="text/css" href="../script/lib/layui/css/layui.css" />
 <link rel="stylesheet" type="text/css" href="../script/lib/valid/validationEngine.jquery.css">
-<link rel="stylesheet" type="text/css" href="../script/lib/layui/admin/style/admin.css?v9" media="all">
+<!-- <link rel="stylesheet" type="text/css" href="../script/lib/layui/admin/style/admin.css?v9" media="all"> -->
 <link rel="stylesheet" type="text/css" href="../script/lib/fancybox/jquery.fancybox.css">
 <script src="../script/lib/jquery/jquery.min.js"></script>
 <script src="../script/lib/layui/layui.js"></script>
@@ -231,14 +231,14 @@ body{
     </div>
     <div class="layui-row">
     <{if(isset($info['video']) && $info['video']):}>
-    <div style="float:left;">
+    <div style="float:left; margin-top:10px;">
         
       <video class="player "  height="100px" src="<{$info['video']}>" onclick="player($(this))">查看视频</video>
       
     </div>
     <{endif}>
     <{if(isset($info['pic']) && $info['pic']):}>
-      <div id="layer-photos-<{$info['id']}>" class="grid-demo layui-col-xs5 layer-photos-demo " id="tk">
+      <div id="layer-photos-<{$info['id']}>" margin-top:10px; class="grid-demo layui-col-xs5 layer-photos-demo " id="tk">
       <{foreach($info['pic'] as $k => $v):}>
           <img src='<{$v}>' id='show' class="fd show" height='100px'>
         <{endforeach}>
@@ -251,17 +251,22 @@ body{
     <{foreach($info_log as $k => $v):}>
       
       <div class="layui-row onebor">
+      <div class="layui-row list">
+        <div class="chu">
+          <div class="grid-demo"><span >处理时间：<{$v['cdate']}></span><span style="margin-left:20px">处理人：<{$v['admin_group']}></span><span style="margin-left:20px"><{$v['appoint_admin']}></span></div>
+        </div>
+      </div>
       <div class="layui-col-bg layui-col-md8 ">
         <div class="grid-demo grid-demo-bg desc">描述：<{$v['desc']}></div>
       </div>
       <div class="layui-row ">
       <{if(isset($v['video'])):}>
-      <div style="float:left;">
+      <div style="float:left; margin-top:10px;">
       
       <video class="player " height="100px" src="<{$v['video']}>" onclick="player($(this))">查看视频</video>
       </div>
        <{endif}>
-      <div id="layer-photos_log-<{$v['id']}>" class="layer-photos-demo layui-col-xs5" id="tk">
+      <div id="layer-photos_log-<{$v['id']}>" margin_top:10px; class="layer-photos-demo layui-col-xs5" id="tk">
       
       <{if(isset($v['pic'])):}>
       <{foreach($v['pic'] as $k1 => $v1):}>
@@ -269,21 +274,8 @@ body{
         <{endforeach}>
         <{endif}>
       </div>
-        <!-- <div class="grid-demo"><{$v['pic']}></div> -->
-      </div>
-      <div class="layui-row list">
-        <div class="chu">
-          <div class="grid-demo"><span >处理时间：<{$v['cdate']}></span><span style="margin-left:20px">处理人：<{$v['admin_group']}></span><span style="margin-left:20px"><{$v['appoint_admin']}></span></div>
-          <!-- <div class="grid-demo"></div>
-           <div class="grid-demo"><{$v['appoint_admin']}></div> -->
-        </div>
-        <!-- <div class="layui-col-xs4 chu">
-          <div class="grid-demo">处理人：<{$v['admin_group']}></div>
-        </div>
-        <div class="layui-col-xs4 chu">
-          <div class="grid-demo"><{$v['appoint_admin']}></div>
-        </div> -->
       </div>
+      
       </div>
     <{endforeach}>
   <{endif}>
@@ -361,10 +353,10 @@ function player(e){
             area: ['730px', '500px'],
             shade: [0.8, 'rgb(14, 16, 22)'],
             skin: 'demo-class',
-            content: loadstr
-        });
+            content: loadstr,
+            shadeClose:true,
+        });       
 }
-
 function finish()
     {
         var id = '<{$info['id']}>';

tool/work/database/info.php

@@ -73,12 +73,13 @@ $list_button['location'] = array('查看详情',Dever::url('lib/appoint.show','w
 $list_button ['fast_add'] = array('指派工单','appoint&search_option_info_id={id}','{status}<3');
 $data = array();
 $insert = true;
+// $company = Dever::load('manage/company.get');
 if ($search_auth == 2) {
     $insert = false;
     $audit_admin = Dever::setInput('search_option_col', $admin_id);
-    $data[]= array('待我处理',function() use ($admin_id) {return Dever::db('work/info')->getTotal(array('status'=>2,'appoint_id'=>$admin_id));});
-    $data[]= array('处理完成',function() use($admin_id) {return Dever::db('work/info')->getTotal(array('status'=>3,'appoint_id'=>$admin_id));});
-    $data[]= array('我创建的',function() use($admin_id) {return Dever::db('work/info')->getTotal(array('audit_admin'=>$admin_id));});
+    $data[]= array('待我处理',function() use ($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,2);});
+    $data[]= array('处理完成',function() use($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,3);});
+    $data[]= array('我创建的',function() use($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,false);});
 } 
 $button = array();
 if ($search_auth == 1) {
@@ -198,19 +199,6 @@ return array
             'list'      => 'Dever::load("work/lib/manage.getUser#cate_name",{id})',
         ),
 
-        // 'question_id'      => array
-        // (
-        //     'type'      => 'int-11',
-        //     'name'      => '问题类型描述',
-        //     'default'   => '-1',
-        //     'desc'      => '问题类型描述',
-        //     'match'     => 'is_string',
-        //     'option'    => $question,
-        //     'update'    => 'select',
-        //     'search'    => $search_auth == 1 ? 'select' : false,
-        //     // 'list'      => true,
-        // ),
-
         'priority_id'      => array
         (
             'type'      => 'int-11',
@@ -429,6 +417,7 @@ return array
                 'appoint_id' => 'yes',
                 'state' => 1,
                 'status'=> 'yes',
+                'company_id'=>'yes',
             ),
             'type' => 'count',
             // 'order' => array('reorder' => 'desc', 'id' => 'asc'),

tool/work/lib/Manage.php

@@ -300,4 +300,23 @@ Class Manage
 		$file = Dever::input('excel_name');
     	return Dever::excelExport($body, $header, $file);
 	}
+
+	public function getTotal($admin_id,$status=false)
+	{
+		$company = Dever::load('manage/company.get');
+		$where = array();
+		
+		if ($status){
+			$where['status'] = $status;
+			$where['appoint_id'] = $admin_id;
+		} else {
+			$where['audit_admin'] = $admin_id;
+		}
+		if ($company) {
+			$where['company_id'] = $company;
+		}
+		
+		$data = Dever::db('work/info')->getTotal($where);
+		return $data;
+	}
 }