Browse Source

用户学生重建

lizhen_gitee 1 year ago
parent
commit
c60aed8700

+ 3 - 2
application/admin/controller/Userstudent.php

@@ -52,14 +52,15 @@ class Userstudent extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['school','classes'])
+                    ->with(['user','school','classes'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
                 
-                $row->getRelation('school')->visible(['schoolname']);
+                $row->getRelation('user')->visible(['username','nickname']);
+				$row->getRelation('school')->visible(['schoolname']);
 				$row->getRelation('classes')->visible(['classname']);
             }
 

+ 3 - 1
application/admin/lang/zh-cn/userstudent.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'Id'                => '自增ID',
+    'Id'                => 'ID',
     'User_id'           => '用户ID',
     'Realname'          => '姓名',
     'Gender'            => '性别',
@@ -15,6 +15,8 @@ return [
     'Is_default'        => '默认',
     'Is_default 1'      => '是',
     'Is_default 0'      => '否',
+    'User.username'     => '用户名',
+    'User.nickname'     => '昵称',
     'School.schoolname' => '学校名',
     'Classes.classname' => '班级名'
 ];

+ 6 - 0
application/admin/model/Userstudent.php

@@ -60,6 +60,12 @@ class Userstudent extends Model
 
 
 
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
     public function school()
     {
         return $this->belongsTo('School', 'school_id', 'id', [], 'LEFT')->setEagerlyType(0);

+ 2 - 0
public/assets/js/backend/userstudent.js

@@ -37,6 +37,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'idcard', title: __('Idcard'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
                         {field: 'is_default', title: __('Is_default'), searchList: {"1":__('Is_default 1'),"0":__('Is_default 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'school.schoolname', title: __('School.schoolname'), operate: 'LIKE'},
                         {field: 'classes.classname', title: __('Classes.classname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}