学生排课，添加家长

app/common/model/Student.php

@@ -23,6 +23,9 @@ use support\Model;
  */
 class Student extends BaseModel
 {
-    
+    public function parent()
+    {
+        return $this->hasOne(StudentParent::class, 'id', 'parent_id')->bind(['parent_name']);
+    }
 
 }

app/common/service/TeacherScheduleTimeService.php

@@ -74,6 +74,11 @@ class TeacherScheduleTimeService
         }
     }
 
+    /**
+     * @desc 获取排课列表
+     * @param $request
+     * @return array
+     */
     public function getScheduleTime($request)
     {
         try {
@@ -87,8 +92,17 @@ class TeacherScheduleTimeService
             }
             $data = $request->get();
 
-            $schedule = TeacherScheduleTime::where(['teacher_id'=>$teacher->id, 'date'=>$data['schedule_date']])->select();
+            $schedule = TeacherScheduleTime::where(['teacher_id'=>$teacher->id, 'month'=>$data['month']])
+                ->field('id,teacher_id,date,time,hour,month,subject_id,is_publish')
+                ->with(['subject'])
+                ->select();
 
+//            foreach ($schedule as &$item){
+//                if(!$item->is_publish){
+//                    $item->subject_name = '';
+//                    $item->english_name = '';
+//                }
+//            }
 
             return [
                 'code' => ResponseCode::SUCCESS,

plugin/admin/app/controller/StudentController.php

@@ -2,6 +2,7 @@
 
 namespace plugin\admin\app\controller;
 
+use app\common\model\StudentParent;
 use app\constant\ResponseCode;
 use support\Request;
 use support\Response;
@@ -39,6 +40,39 @@ class StudentController extends Crud
         return view('student/index');
     }
 
+    public function select(Request $request): Response
+    {
+        try {
+
+            $data = $request->get();
+
+            $student = \app\common\model\Student::order('id asc');
+            if (isset($data['id']) && $data['id']) {
+                $student->where(['id' => $data['id']]);
+            }
+
+            $limit = (int)$request->get('limit', 10);
+            $limit = $limit <= 0 ? 10 : $limit;
+            $page = (int)$request->get('page');
+            $page = $page > 0 ? $page : 1;
+
+            $total = $student->count();
+            $list = $student->page($page, $limit)->with(['parent'])->select();
+
+            return json([
+                'code' => ResponseCode::WEB_API_SUCCESS,
+                'count' => $total,
+                'data' => $list,
+                'msg' => 'success'
+            ]);
+        } catch (Exception $e) {
+            return json([
+                'code' => ResponseCode::WEB_API_FAIL,
+                'msg' => $e->getMessage()
+            ]);
+        }
+    }
+
     /**
      * 插入
      * @param Request $request
@@ -64,7 +98,7 @@ class StudentController extends Crud
                 'password' => $password,
                 'salt' => $salt,
                 'avatar' => $request_data['avatar'],
-                'parent_id' => 0,
+                'parent_id' => $request_data['parent_id'],
             ]);
 
             return json([
@@ -73,7 +107,9 @@ class StudentController extends Crud
             ]);
 //            return parent::insert($request);
         }
-        return view('student/insert');
+
+        $parent = StudentParent::order('id asc')->field('id,parent_name,account')->select()->toArray();
+        return view('student/insert', ['parent' => $parent]);
     }
 
     /**
@@ -98,7 +134,7 @@ class StudentController extends Crud
                         'student_name' => $request_data['student_name'],
                         'account' => $request_data['account'],
                         'avatar' => $request_data['avatar'],
-                        'parent_id' => 0,
+                        'parent_id' => $request_data['parent_id'],
                     ];
                 } else {
                     $salt = random_str(16);
@@ -109,7 +145,7 @@ class StudentController extends Crud
                         'password' => $password,
                         'salt' => $salt,
                         'avatar' => $request_data['avatar'],
-                        'parent_id' => 0,
+                        'parent_id' => $request_data['parent_id'],
                     ];
                 }
 
@@ -128,7 +164,9 @@ class StudentController extends Crud
 
 //            return parent::update($request);
         }
-        return view('student/update');
+
+        $parent = StudentParent::order('id asc')->field('id,parent_name,account')->select()->toArray();
+        return view('student/update', ['parent' => $parent]);
     }
 
 

plugin/admin/app/view/student/index.html

@@ -102,7 +102,7 @@
                 hide: true
             }, {
                 title: "家长", align: "center",
-                field: "parent_id",
+                field: "parent_name",
             }, {
                 title: "创建时间", align: "center",
                 field: "created_at",
@@ -213,7 +213,7 @@
                 title: "新增",
                 shade: 0.1,
                 maxmin: true,
-                area: [common.isModile() ? "100%" : "500px", common.isModile() ? "100%" : "450px"],
+                area: [common.isModile() ? "100%" : "750px", common.isModile() ? "100%" : "700px"],
                 content: INSERT_URL
             });
         }
@@ -226,7 +226,7 @@
                 title: "修改",
                 shade: 0.1,
                 maxmin: true,
-                area: [common.isModile() ? "100%" : "500px", common.isModile() ? "100%" : "450px"],
+                area: [common.isModile() ? "100%" : "650px", common.isModile() ? "100%" : "700px"],
                 content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
             });
         }

plugin/admin/app/view/student/insert.html

@@ -66,7 +66,12 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">家长</label>
                         <div class="layui-input-block">
-                            <input type="text" name="parent_id" value="0" class="layui-input">
+                            <select lay-search="" name="parent_id">
+                                <option value="">请选择或搜索家长</option>
+                                {foreach $parent as $item}
+                                <option value="{$item['id']}">{$item['parent_name']}</option>
+                                {/foreach}
+                            </select>
                         </div>
                     </div>
                     

plugin/admin/app/view/student/update.html

@@ -55,10 +55,12 @@
                 <div class="layui-input-block">
                     <img class="img-3" src=""/>
                     <input type="text" style="display:none" name="avatar" value=""/>
-                            <button type="button" class="pear-btn pear-btn-primary pear-btn-sm" id="avatar"  permission="app.admin.upload.image">
+                    <button type="button" class="pear-btn pear-btn-primary pear-btn-sm" id="avatar"
+                            permission="app.admin.upload.image">
                         <i class="layui-icon layui-icon-upload"></i>上传图片
                     </button>
-                            <button type="button" class="pear-btn pear-btn-primary pear-btn-sm" id="attachment-choose-avatar"  permission="app.admin.upload.attachment">
+                    <button type="button" class="pear-btn pear-btn-primary pear-btn-sm" id="attachment-choose-avatar"
+                            permission="app.admin.upload.attachment">
                         <i class="layui-icon layui-icon-align-left"></i>选择图片
                     </button>
                 </div>
@@ -67,7 +69,13 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">家长</label>
                 <div class="layui-input-block">
-                            <input type="text" name="parent_id" value="" class="layui-input">
+<!--                    <input type="text" name="parent_id" value="" class="layui-input">-->
+                    <select lay-search="" name="parent_id">
+                        <option value="">请选择或搜索家长</option>
+                        {foreach $parent as $item}
+                        <option value="{$item['id']}">{$item['parent_name']}</option>
+                        {/foreach}
+                    </select>
                 </div>
             </div>