lizhen_gitee 1 gadu atpakaļ
vecāks
revīzija
c55007b927

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

@@ -51,15 +51,14 @@ class Packagedelay extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['user','order'])
+                    ->with(['order'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
                 
-                $row->getRelation('user')->visible(['firstname','lastname']);
-				$row->getRelation('order')->visible(['order_no']);
+                $row->getRelation('order')->visible(['order_no']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -6,7 +6,7 @@ return [
     'Name'             => '姓名',
     'Mobile'           => '手机号',
     'Email'            => '电子邮箱',
-    'Package_order_id' => '套餐id',
+    'Package_order_id' => '套餐订单id',
     'Delay_week'       => '延长几周',
     'Reason'           => '原因',
     'Reason_files'     => '医疗文件或支持文件',
@@ -19,7 +19,5 @@ return [
     'Status 2'         => '审核驳回',
     'Audittime'        => '审核时间',
     'Auditremark'      => '审核备注',
-    'User.firstname'   => '名',
-    'User.lastname'    => '姓',
     'Order.order_no'   => '订单号'
 ];

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

@@ -57,12 +57,6 @@ class Packagedelay extends Model
     }
 
 
-    public function user()
-    {
-        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
-
-
     public function order()
     {
         return $this->belongsTo('Packageorder', 'package_order_id', 'id', [], 'LEFT')->setEagerlyType(0);

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

@@ -42,8 +42,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         {field: 'audittime', title: __('Audittime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'auditremark', title: __('Auditremark'), operate: 'LIKE'},
-                        {field: 'user.firstname', title: __('User.firstname'), operate: 'LIKE'},
-                        {field: 'user.lastname', title: __('User.lastname'), operate: 'LIKE'},
                         {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]