diff --git a/admin/src/app/views/classroom/components/classroom-edit.vue b/admin/src/app/views/classroom/components/classroom-edit.vue index a7df3ae7..6ac6a04f 100644 --- a/admin/src/app/views/classroom/components/classroom-edit.vue +++ b/admin/src/app/views/classroom/components/classroom-edit.vue @@ -52,7 +52,7 @@ v-for="(item, index) in headCoachList" :key="index" :label="item['name']" - :value="item['id']" + :value="String(item['id'])" /> @@ -96,10 +96,28 @@ v-for="(item, index) in assistantCoachList" :key="index" :label="item['name']" - :value="item['id']" + :value="String(item['id'])" /> + + + + + + + + -
- - - - -
-

第一步:选择审批配置

- - - - - - - - - - {{ config.config_name }} - {{ config.description }} - - - - -
- - -
-

第二步:填写人员信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-

第三步:提交申请

- - {{ form.useApproval ? '提交审批申请' : '直接添加人员' }} - - - 重置表单 - -
- - -
-

处理结果

- - -
-
- - - - -
- - - - -
-
-
- - - - - \ No newline at end of file diff --git a/niucloud/app/adminapi/controller/classroom/Classroom.php b/niucloud/app/adminapi/controller/classroom/Classroom.php index e7ddf1ac..4213f40d 100644 --- a/niucloud/app/adminapi/controller/classroom/Classroom.php +++ b/niucloud/app/adminapi/controller/classroom/Classroom.php @@ -63,6 +63,7 @@ class Classroom extends BaseAdminController ["age_group", ""], ["class_type", ""], ["assistant_coach", ""], + ["educational_id",""], ["status", ""], ["sort_order", 0], ["remarks", ""] @@ -86,6 +87,7 @@ class Classroom extends BaseAdminController ["age_group", ""], ["class_type", ""], ["assistant_coach", ""], + ["educational_id",""], ["status", ""], ["sort_order", 0], ["remarks", ""] diff --git a/niucloud/app/service/admin/classroom/ClassroomService.php b/niucloud/app/service/admin/classroom/ClassroomService.php index 91672484..801b2e85 100644 --- a/niucloud/app/service/admin/classroom/ClassroomService.php +++ b/niucloud/app/service/admin/classroom/ClassroomService.php @@ -41,7 +41,7 @@ class ClassroomService extends BaseAdminService */ public function getPage(array $where = []) { - $field = 'id,campus_id,campus_name,class_name,head_coach,age_group,class_type,assistant_coach,created_at,updated_at,deleted_at,status,sort_order,remarks'; + $field = 'id,campus_id,campus_name,class_name,educational_id,head_coach,age_group,class_type,assistant_coach,created_at,updated_at,deleted_at,status,sort_order,remarks'; $order = 'id desc'; $search_model = $this->model->withSearch(["campus_id", "class_name", "head_coach", "class_type", "assistant_coach", "created_at", "status"], $where)->with(['campus', 'personnel', 'personnel'])->field($field)->order($order); @@ -56,7 +56,7 @@ class ClassroomService extends BaseAdminService */ public function getInfo(int $id) { - $field = 'id,campus_id,campus_name,class_name,head_coach,age_group,class_type,assistant_coach,created_at,updated_at,deleted_at,status,sort_order,remarks'; + $field = 'id,campus_id,campus_name,class_name,educational_id,head_coach,age_group,class_type,assistant_coach,created_at,updated_at,deleted_at,status,sort_order,remarks'; $info = $this->model->field($field)->where([['id', "=", $id]])->with(['campus', 'personnel', 'personnel'])->findOrEmpty()->toArray(); $info['status'] = strval($info['status']); diff --git a/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php b/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php index fac1f822..41280e1d 100644 --- a/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php +++ b/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php @@ -420,7 +420,7 @@ class CustomerResourcesService extends BaseAdminService ->field("a.*,b.name,b.phone") ->where([ ['a.campus_id', '=', $campus_id], - ['a.role_id', '=', 5] +// ['a.role_id', '=', 5] ])->select()->toArray(); }