候补与日程表

application/admin/controller/Lessonslot.php

@@ -203,7 +203,25 @@ class Lessonslot extends Backend
     {
         $where = [];
 
-        $list = Db::name('lesson_slot')
+        $coach_id = input('coach_id','');
+        $lesson_id = input('lesson_id','');
+        $danceroom_id = input('danceroom_id',0);
+        $starttime = input('starttime',date('Y-m-d'),'strtotime');//默认看今天
+        $endtime = input('endtime',date('Y-m-d 23:59:59'),'strtotime');
+
+        if(!empty($coach_id)){
+            $where['coach_id'] = ['IN',$coach_id];
+        }
+        if(!empty($lesson_id)){
+            $where['lesson_id'] = ['IN',$lesson_id];
+        }
+        if(!empty($danceroom_id)){
+            $where['danceroom_id'] = $danceroom_id;
+        }
+        $where['starttime'] = ['BETWEEN',[$starttime,$endtime]];
+
+
+        $list = Db::name('lesson_slot')->alias('slot')
             ->where($where)
             ->order('id desc')
             ->select();

application/admin/lang/zh-cn/lessonslot.php

@@ -7,6 +7,7 @@ return [
     'Endtime'                => '结束时间',
     'Num_min'                => '最少人数(取消）',
     'Num_max'                => '最多人数',
+    'Waitnum_max'            => '候补最多人数',
     'Coach_ids'              => '选择教练',
     'Lesson_id'              => '课程id',
     'Address'                => '地址',

application/admin/view/lessonslot/add.html

@@ -31,6 +31,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Waitnum_max')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-waitnum_max" class="form-control" name="row[waitnum_max]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Coach_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-coach_ids" data-rule="required" data-source="coach/index" data-field="nickname"  class="form-control selectpage" name="row[coach_ids]" type="text" value="">
@@ -43,6 +49,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Danceroom_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-danceroom_id" data-rule="required" data-source="danceroom/index" class="form-control selectpage" name="row[danceroom_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-address" class="form-control" name="row[address]" type="text">
@@ -108,12 +120,7 @@
             <input id="c-cancel_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[cancel_time]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>-->
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Danceroom_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-danceroom_id" data-rule="required" data-source="danceroom/index" class="form-control selectpage" name="row[danceroom_id]" type="text" value="">
-        </div>
-    </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/lessonslot/edit.html

@@ -31,6 +31,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Waitnum_max')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-waitnum_max" class="form-control" name="row[waitnum_max]" type="number" value="{$row.waitnum_max|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Coach_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-coach_ids" data-rule="required" data-source="coach/index" data-field="nickname"  class="form-control selectpage" name="row[coach_ids]" type="text" value="{$row.coach_ids|htmlentities}">
@@ -43,6 +49,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Danceroom_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-danceroom_id" data-rule="required" data-source="danceroom/index" class="form-control selectpage" name="row[danceroom_id]" type="text" value="{$row.danceroom_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-address" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">
@@ -108,12 +120,7 @@
             <input id="c-cancel_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[cancel_time]" type="text" value="{:$row.cancel_time?datetime($row.cancel_time):''}">
         </div>
     </div>-->
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Danceroom_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-danceroom_id" data-rule="required" data-source="danceroom/index" class="form-control selectpage" name="row[danceroom_id]" type="text" value="{$row.danceroom_id|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/lessonslot.js

@@ -33,6 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'num_min', title: __('Num_min')},
                         {field: 'num_max', title: __('Num_max')},
+                        {field: 'waitnum_max', title: __('Waitnum_max')},
                         {field: 'coach_ids', title: __('Coach_ids'), operate: 'LIKE'},
                         {field: 'coach.nickname', title: __('Coach.nickname'), operate: 'LIKE'},