后台号源管理 ，增加号源类型显示， 预约人信息展示

Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php

@@ -130,15 +130,29 @@ class PlanController extends Controller
     $pageSize = request('pageSize');
     $searchInfo = request('searchInfo');
     $list = DB::table('plans as a')
-      //  ->leftJoin('plan_type as b','a.plan_type','=','b.id')
-      // ->select('a.*','b.name as plan_type_name')
+       ->select('a.*','b.name as username','b.phone')
+      ->leftJoin('orders as b', 'a.id', '=', 'b.plan_id')
       ->where(['a.is_del' => 0]);
+
     if (!isset($searchInfo['date'])) {
       $searchInfo['date'] = date('Y-m-d');
     }
     $list = $list->where(['a.date' => $searchInfo['date']]);
     $count = $list->count();
     $list = $list->orderBy('a.id', 'asc')->get();
+    $plan_model=DB::table('plan_model_time')
+      ->select('plan_model_time.*', 'plan_type.name as plan_type_name')
+      ->leftJoin('plan_type', 'plan_type.id', '=', 'plan_model_time.plan_type_id')
+      ->get();
+    foreach ($list as $k => $v) {
+      $list[$k]->plan_type_name = '';
+      foreach ($plan_model as $k1 => $v1) {
+        if ($v1->model_id == $v->model_id) {
+          $list[$k]->plan_type_name = $v1->plan_type_name;
+          break;
+        }
+      }
+    }
     return \Yz::Return(true, '查询完成', ['list' => $list, 'count' => $count, 'date' => $searchInfo['date']]);
   }
 

admin/src/views/PlanMngr/Plan.vue

@@ -30,8 +30,15 @@
 					<el-tag><span v-if="item.sex===1 || item.sex===0">男</span><span v-if="item.sex===0"> | </span><span v-if="item.sex===2 || item.sex===0">女</span></el-tag>
 					
 				</div>
-				<div style="text-align: center;">{{item.time}}</div>
-				<div>.</div>
+				<div style="text-align: center;">
+					<div>{{item.time}}</div>
+					<div style="font-size: 12px;">{{item.plan_type_name}}</div>
+				</div>
+				<div>
+					<div v-if="item.status==2 && item.username" style="font-size: 12px; padding-left: 8px;">
+						体检人：{{item.username}} {{item.phone}} 
+					</div>
+				</div>
 			</div>
 			 <el-empty v-if="list.length===0" description="暂无数据" />
 		</div>