课程表重建

application/admin/controller/Lessonslot.php

@@ -55,7 +55,7 @@ class Lessonslot extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['coach','lesson'])
+                    ->with(['coach','lesson','danceroom'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
@@ -64,6 +64,7 @@ class Lessonslot extends Backend
                 
                 $row->getRelation('coach')->visible(['nickname']);
 				$row->getRelation('lesson')->visible(['name','name_en']);
+				$row->getRelation('danceroom')->visible(['name','name_en']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -1,30 +1,33 @@
 <?php
 
 return [
-    'Id'              => 'id',
-    'Starttime'       => '开始时间',
-    'Hours'           => '小时数',
-    'Endtime'         => '结束时间',
-    'Num_min'         => '最少人数(取消）',
-    'Num_max'         => '最多人数',
-    'Coach_ids'       => '选择教练',
-    'Lesson_id'       => '课程id',
-    'Address'         => '地址',
-    'Status'          => '状态',
-    'Status 0'        => '报名中',
-    'Status 20'       => '已点名',
-    'Status 30'       => '已取消',
-    'Remark'          => '备注说明',
-    'Notice_status'   => '计划任务',
-    'Notice_status 0' => '未通知',
-    'Notice_status 1' => '已通知',
-    'Finishtime'      => '点名时间',
-    'Cancel_reason'   => '取消原因',
-    'Cancel_time'     => '取消时间',
-    'Is_show'       => '是否显示',
-    'Is_show 1'     => '上架',
-    'Is_show 0'     => '下架',
-    'Coach.nickname'  => '教练昵称',
-    'Lesson.name'     => '课程标题',
-    'Lesson.name_en'  => '课程标题(en)'
+    'Id'                     => 'id',
+    'Starttime'              => '开始时间',
+    'Hours'                  => '小时数',
+    'Endtime'                => '结束时间',
+    'Num_min'                => '最少人数(取消）',
+    'Num_max'                => '最多人数',
+    'Coach_ids'              => '选择教练',
+    'Lesson_id'              => '课程id',
+    'Address'                => '地址',
+    'Status'                 => '状态',
+    'Status 0'               => '报名中',
+    'Status 20'              => '已点名',
+    'Status 30'              => '已取消',
+    'Remark'                 => '备注说明',
+    'Notice_status'          => '计划任务',
+    'Notice_status 0'        => '未通知',
+    'Notice_status 1'        => '已通知',
+    'Finishtime'             => '点名时间',
+    'Cancel_reason'          => '取消原因',
+    'Cancel_time'            => '取消时间',
+    'Is_show'                => '是否显示',
+    'Is_show 1'              => '上架',
+    'Is_show 0'              => '下架',
+    'Danceroom_id'           => '舞蹈室id',
+    'Coach.nickname'         => '教练昵称',
+    'Lesson.name'            => '课程标题',
+    'Lesson.name_en'         => '课程标题(en)',
+    'Danceroom.name'         => '舞蹈室',
+    'Danceroom.name_en'      => '舞蹈室(en)'
 ];

application/admin/model/Lessonslot.php

@@ -143,4 +143,10 @@ class Lessonslot extends Model
     {
         return $this->belongsTo('Lesson', 'lesson_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
+
+
+    public function danceroom()
+    {
+        return $this->belongsTo('Danceroom', 'danceroom_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

application/admin/view/lessonslot/add.html

@@ -108,6 +108,12 @@
             <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

@@ -108,6 +108,12 @@
             <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

@@ -47,8 +47,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'cancel_reason', title: __('Cancel_reason'), operate: 'LIKE'},
                         {field: 'cancel_time', title: __('Cancel_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal},
-
-
+//                        {field: 'cancel_notice_status', title: __('Cancel_notice_status'), searchList: {"0":__('Cancel_notice_status 0'),"1":__('Cancel_notice_status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'danceroom_id', title: __('Danceroom_id')},
+                        {field: 'danceroom.name', title: __('Danceroom.name'), operate: 'LIKE'},
+                        {field: 'danceroom.name_en', title: __('Danceroom.name_en'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table,
                             buttons:[
                                 {