lizhen_gitee il y a 1 an
Parent
commit
40b96f4764

+ 2 - 1
application/admin/controller/Order.php

@@ -51,7 +51,7 @@ class Order extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['active','user','student','school','classes'])
+                    ->with(['active','user','student','school','grade','classes'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
@@ -62,6 +62,7 @@ class Order extends Backend
 				$row->getRelation('user')->visible(['username','nickname']);
 				$row->getRelation('student')->visible(['realname']);
 				$row->getRelation('school')->visible(['schoolname']);
+				$row->getRelation('grade')->visible(['gradename']);
 				$row->getRelation('classes')->visible(['classname']);
             }
 

+ 1 - 0
application/admin/lang/zh-cn/order.php

@@ -20,5 +20,6 @@ return [
     'User.nickname'     => '用户昵称',
     'Student.realname'  => '姓名',
     'School.schoolname' => '学校名',
+    'Grade.gradename'   => '年级名',
     'Classes.classname' => '班级名'
 ];

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

@@ -81,6 +81,12 @@ class Order extends Model
     }
 
 
+    public function grade()
+    {
+        return $this->belongsTo('Grade', 'student.grade_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
     public function classes()
     {
         return $this->belongsTo('Classes', 'student.classes_id', 'id', [], 'LEFT')->setEagerlyType(0);

+ 4 - 3
public/assets/js/backend/order.js

@@ -29,14 +29,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
 //                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
-                        {field: 'active_id', title: __('Active_id')},
+//                        {field: 'active_id', title: __('Active_id')},
                         {field: 'active.name', title: __('Active.name'), operate: 'LIKE'},
-                        {field: 'user_id', title: __('User_id')},
+//                        {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'student_id', title: __('Student_id')},
+//                        {field: 'student_id', title: __('Student_id')},
                         {field: 'student.realname', title: __('Student.realname'), operate: 'LIKE'},
                         {field: 'school.schoolname', title: __('School.schoolname'), operate: 'LIKE'},
+                        {field: 'grade.gradename', title: __('Grade.gradename'), operate: 'LIKE'},
                         {field: 'classes.classname', title: __('Classes.classname'), operate: 'LIKE'},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'pay_fee', title: __('Pay_fee'), operate:'BETWEEN'},