Your Name 3 gadi atpakaļ
vecāks
revīzija
5937d78439

+ 4 - 4
tool/work/assets/pc/html/email.html

@@ -133,19 +133,19 @@ th{
   <div class="zong">
     <div class="container" id="nav">
         <ul style="list-style:none;">
-            <li>
+            <li style="list-style:none;">
                 <p><{$info['app']}></p>
                 <h3>部门相关</h3>
             </li>
-            <li>
+            <li style="list-style:none;">
                 <p><{$info['xu']}></p>
                 <h3>需处理</h3>
             </li>
-            <li>
+            <li style="list-style:none;">
                 <p><{$info['yi']}></p>
                 <h3>已处理</h3>
             </li>
-            <li>
+            <li style="list-style:none;">
                 <p><{$info['wei']}></p>
                 <h3>未完成</h3>
             </li>

+ 2 - 2
tool/work/assets/pc/html/index.html

@@ -216,8 +216,8 @@ body{
   <{endif}>
     <div class="layui-row">
     <div class="gongdan">
-      <div style="margin-bottom:10px">工单号:<{$info['work_num']}></div>
-      <div class="grid-demo" style="margin-bottom:10px"><span>创建时间:<{$info['cdate']}></span><span style="margin-left:25px">创建人:<{$info['admin']}></span></div>
+      <div style="margin-bottom:10px"><span>工单号:<{$info['work_num']}></span><span style="margin-left:25px">创建时间:<{$info['cdate']}></span></div>
+      <div class="grid-demo" style="margin-bottom:10px"><span>创建人:<{$info['admin']}></span><span style="margin-left:25px"><{$info['branch_name']}></span></div>
       <div class="grid-demo" style="margin-bottom:10px"><span>工单来源:<{$info['source_name']}></span><span style="margin-left:50px">相关系统产品:<{$info['product_name']}></span></div>
     </div>
   </div>

+ 1 - 1
tool/work/database/info.php

@@ -287,7 +287,7 @@ return array
             'match'     => 'option',
             // 'search'    => 'linkage',
             'update'    => 'linkage',
-            'option'    => Dever::url('lib/appoint.get?level_total=1', 'work'),
+            'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
         ),
 
         'status'      => array

+ 15 - 0
tool/work/lib/Appoint.php

@@ -129,6 +129,7 @@ Class Appoint
                 $default['name'] = '组员选择';
             } 
         } else {
+            // echo 11;
             $default = $this->default;
         }
         // if ($level_id < 0) {
@@ -148,6 +149,9 @@ Class Appoint
         if ($level_search || $level_num >= 1) {
             array_unshift($data, $default);
         }
+        if ($level_num == 2) {
+            unset($data[0]);
+        }
         $result['level_total'] = $level_total;
         $result['list'] = $data;
         return $result;
@@ -246,6 +250,17 @@ Class Appoint
 				$data['info']['source_name'] = $source['name'];
 			}
 		} 
+        if ($data['info']['branch_id']) {
+            $branch_id = explode(',',$data['info']['branch_id']);
+            if (isset($branch_id[0]) && $branch_id[0]>0) {
+                $group = Dever::db('manage/group')->find($branch_id[0]);
+                $data['info']['branch_name'] = '指派人:'.$group['name'];
+            }
+            if (isset($branch_id[1]) && $branch_id[1]>0) {
+                $admin = Dever::db('manage/admin')->find($branch_id[0]);
+                $data['info']['branch_name'] = $data['info']['branch_name'].'  /   '.$admin['username'];
+            }
+        }
 		
 		$data['info']['role_name'] = '';
 		$user = Dever::db('work/user')->find(array('mobile'=>$data['info']['mobile']));