edit

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

@@ -36,11 +36,11 @@ body{
     margin: 9.5px;
 }
   .layui-col-xs4{
-    font-size: 15px;
+    /*font-size: 15px;*/
   }
   .layui-col-xs6{
     margin-top: 15px;
-    font-size: 14px;
+    /*font-size: 14px;*/
     /*margin-left:10px;*/
   }
   .onebor{
@@ -51,7 +51,10 @@ body{
     /*border-left: 1px solid grey;
     border-right: 1px solid grey;
     border-bottom: 1px solid grey;*/
-    margin-top: -8px;
+    /*margin-top: -8px;*/
+    margin-bottom: 10px;
+    /*box-shadow: 3px 10px 32px -6px;*/
+    border-radius: 15px;
   }
   .desc{
     margin-top:10px;
@@ -61,15 +64,15 @@ body{
   .chu{
     margin-top:10px;
     margin-bottom: 10px;
-    font-size: 14px;
+    /*font-size: 14px;*/
   }
   .bian{
     margin-bottom:15px;
-    font-size: 14px;
+    /*font-size: 14px;*/
   }
   .gongdan{
     margin-top:20px;
-    font-size:14px;
+    /*font-size:14px;*/
   }
   .layout{
     width: 100%;
@@ -78,6 +81,7 @@ body{
 
     display: flex;
     justify-content : space-around;
+    font-size:14px;
 
 }
 .aside{
@@ -103,6 +107,7 @@ body{
   .row2{
     margin-left:15px;
     margin-top:80px;
+    /*box-shadow: 3px 10px 32px -6px;*/
     /*margin-bottom: 15px;*/
   }
   .row3{
@@ -113,17 +118,19 @@ body{
     border: 0px solid #C9C9C9;
     background-color: #dedede;
     color: #555;
-    font-size: 5px;
+    /*font-size: 5px;*/
     width: 90px;
     height: 36px;
+    /*box-shadow: 3px 10px 32px -6px;*/
 }
 .time {
     border: 0px solid #C9C9C9;
     background-color: #ededed;
     color: #555;
-    font-size: 5px;
+    /*font-size: 5px;*/
     width: 130px;
     height: 36px;
+    margin-bottom: 10px;
 }
 .layui-icon-praise{
     margin-left: -30px;
@@ -157,6 +164,7 @@ body{
 .content{
     margin-top:20px;
     margin-bottom: 10px;
+    /*box-shadow: 3px 10px 32px -6px;*/
 }
 .list{
     margin-top: 20px;
@@ -177,17 +185,19 @@ body{
     <aside class='aside'>
   <{if($info['status']<3):}>
     <div class="layui-row row1">
-    <div class="layui-col-xs2">
-      <div class="grid-demo"> 
+    <div class="anniu">
+      <!-- <div class="grid-demo">  -->
       <button class="layui-btn layui-btn-radius  " type="button" style="vertical-align: middle;margin-bottom: 2px;" onclick="finish()">完成关闭</button>
-      </div>
+      <button class="layui-btn layui-btn-radius  " id="quxiao" style="vertical-align: middle;margin-bottom: 2px;" onclick="quxiao();">取消关闭</button>
+      <button class="layui-btn layui-btn-radius  " id="huifu" style="vertical-align: middle;margin-bottom: 2px;" onclick="fastEdit($(this),'<{$hui}>')">回复/指派</button>
+      <!-- </div> -->
     </div>
-    <div class="layui-col-xs2">
+    <!-- <div class="layui-col-xs2">
       <div class="grid-demo grid-demo-bg1"><button class="layui-btn layui-btn-radius  " id="quxiao" style="vertical-align: middle;margin-bottom: 2px;" onclick="quxiao();">取消关闭</button></div>
     </div>
     <div class="layui-col-xs2">
       <div class="grid-demo"><button class="layui-btn layui-btn-radius  " id="huifu" style="vertical-align: middle;margin-bottom: 2px;" onclick="fastEdit($(this),'<{$hui}>')">回复/指派</button></div>
-    </div>
+    </div> -->
   </div>
   <{endif}>
         <div class="layui-row">
@@ -213,7 +223,7 @@ body{
       <div class="grid-demo">相关系统产品：<{$info['product_name']}></div>
     </div>
     <!-- <div class="layui-col-md4 you"> -->
-      <div class="you"><button class="layui-btn layui-btn-radius layui-btn-primary" style="font-size: 15px; color: <{$info['color']}>;background: #f6f5ec; margin-left: 450px;margin-bottom: -19px;width: 120px;"><{$info['priority_name']}></button></div>
+      <div class="you"><button class="layui-btn layui-btn-radius layui-btn-primary1" style=" color: <{$info['color']}>;background: #f6f5ec; margin-left: 450px;margin-bottom: -19px;width: 120px;"><{$info['priority_name']}></button></div>
     <!-- </div> -->
   </div>
 
@@ -257,17 +267,7 @@ body{
   <div class="layui-row content">
   <{if(isset($info_log)):}>
     <{foreach($info_log as $k => $v):}>
-      <div class="layui-row list">
-        <div class="layui-col-xs4 chu">
-          <div class="grid-demo">处理时间：<{$v['cdate']}></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 class="layui-row onebor">
       <div class="layui-col-bg layui-col-md8 ">
         <div class="grid-demo grid-demo-bg desc">描述：<{$v['desc']}></div>
@@ -289,6 +289,19 @@ body{
       </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}>
@@ -298,7 +311,7 @@ body{
     <div class="layui-row  row2">
       <div class="layui-col-lg  row3">
       
-        <div class="grid-demo "><i class="layui-icon layui-icon-praise" style="font-size: 20px; color: #1E9FFF;"></i><{$info['cdate']}></div>
+        <div class="grid-demo "><i class="layui-icon layui-icon-praise" style=" color: #1E9FFF;"></i><{$info['cdate']}></div>
       </div>
       <div class="layui-col-lg row3">
         <div class="grid-demo"><{$info['admin']}></div>
@@ -311,7 +324,7 @@ body{
         <{if(isset($zhi)):}>
     <{foreach($zhi as $k => $v):}>
       <div class="layui-col-lg row3">
-        <div class="grid-demo"><i class="layui-icon layui-icon-praise" style="font-size: 20px; color: #1E9FFF;"></i><{$v['cdate']}></div>
+        <div class="grid-demo"><i class="layui-icon layui-icon-praise" style=" color: #1E9FFF;"></i><{$v['cdate']}></div>
       </div>
       <div class="layui-col-lg row3">
         <div class="grid-demo"><{$v['admin']}></div>

tool/work/lib/Appoint.php

@@ -217,10 +217,20 @@ Class Appoint
     		if (isset($appoint) && $appoint) {
     			$data['info_log'][$k]['desc'] = $appoint['desc'];
     			$appoint_admin = explode(',',$appoint['admin_id']);
-        		$appoint_group = Dever::db('manage/group')->find($appoint_admin[0]);
-        		$appoint_ad = Dever::db('manage/admin')->find($appoint_admin[1]);
-        		if ($appoint_admin && $appoint_ad) {
-        			$data['info_log'][$k]['appoint_admin'] = $appoint_group['name'].'   /   '.$appoint_ad['username'];
+                if (isset($appoint_admin[0])) {
+                    $appoint_group = Dever::db('manage/group')->find($appoint_admin[0]);
+                } else {
+                    $appoint_group = array();
+                }
+                if (isset($appoint_admin[1]) && $appoint_admin[1]) {
+                    $appoint_ad = Dever::db('manage/admin')->find($appoint_admin[1]);
+                } else {
+                    $appoint_ad = array();
+                }
+        		
+        		
+        		if ($appoint_group && $appoint_ad) {
+        			$data['info_log'][$k]['appoint_admin'] = '指派人：'. $appoint_group['name'].'   /   '.$appoint_ad['username'];
         		}
     		}
     		
@@ -240,9 +250,22 @@ Class Appoint
 			$time = $v['cdate'] - $ztime;
 			$data['zhi'][$k]['time'] = floor($time%86400/3600).'小时'.floor($time%3600/60).'分钟'.floor($time%60).'秒';
 			$admin = explode(',',$v['admin_id']);
-			$group = Dever::db('manage/group')->find($admin[0]);
-        	$adm = Dever::db('manage/admin')->find($admin[1]);
-        	$data['zhi'][$k]['admin'] = $group['name'].'   /   '.$adm['username'];
+            if (isset($admin[0]) && $admin[0]) {
+                $group = Dever::db('manage/group')->find($admin[0]);
+            } else {
+                $group = array();
+            }
+			if (isset($admin[1]) && $admin[1]) {
+                $adm = Dever::db('manage/admin')->find($admin[1]);
+            } else {
+                $adm = array();
+            }
+        	if ($group && $admin) {
+                $data['zhi'][$k]['admin'] = $group['name'].'   /   '.$adm['username'];
+            } else {
+                $data['zhi'][$k]['admin'] = '';
+            }
+        	
         	$data['zhi'][$k]['cdate'] = date('Y-m-d H:i',$v['cdate']);
         	$info_log = Dever::db('work/info_log')->find(array('appoint_id'=>$v['id']));
         	if ($info_log && $info_log['fdate']) {