lizhen_gitee 1 год назад
Родитель
Сommit
2f53c812c2

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

@@ -60,8 +60,8 @@ class Order extends Backend
 
             foreach ($list as $row) {
                 $row->getRelation('company')->visible(['name']);
-				$row->getRelation('staff')->visible(['truename']);
-				$row->getRelation('user')->visible(['nickname']);
+				$row->getRelation('staff')->visible(['truename','mobile']);
+				$row->getRelation('user')->visible(['nickname','mobile']);
 				$row->getRelation('pre_order')->visible(['pre_order_no']);
 				$row->getRelation('servicetype')->visible(['title']);
             }

+ 5 - 3
application/admin/lang/zh-cn/order.php

@@ -42,9 +42,11 @@ return [
     'Next_date'          => '下次保养日期',
     'Next_carlicheng'    => '汽车公里数',
     'Pay_order_id'       => '支付ID',
-    'Company.name'       => '店名称',
+    'Company.name'       => '店名称',
     'Staff.truename'     => '员工姓名',
-    'User.nickname'      => '昵称',
+    'Staff.mobile'       => '员工手机',
+    'User.nickname'      => '用户昵称',
+    'User.mobile'        => '用户手机',
     'Order.pre_order_no' => '预约单号',
-    'Servicetype.title'  => '标题'
+    'Servicetype.title'  => '服务类型'
 ];

+ 2 - 2
application/admin/view/order/index.html

@@ -17,7 +17,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
@@ -28,7 +28,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

+ 12 - 10
public/assets/js/backend/order.js

@@ -24,32 +24,34 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                search:false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'orderno', title: __('Orderno'), operate: 'LIKE'},
                         {field: 'ordertype', title: __('Ordertype'), searchList: {"1":__('Ordertype 1'),"2":__('Ordertype 2'),"3":__('Ordertype 3')}, formatter: Table.api.formatter.normal},
-                        {field: 'company_id', title: __('Company_id'), operate:false, visible:false},
+                        {field: 'company_id', title: __('Company_id')},
                         {field: 'company.name', title: __('Company.name'), operate: 'LIKE'},
-                        {field: 'staff_id', title: __('Staff_id'), operate:false, visible:false},
+//                        {field: 'staff_id', title: __('Staff_id'), operate:false, visible:false},
                         {field: 'staff.truename', title: __('Staff.truename'), operate: 'LIKE'},
-                        {field: 'user_id', title: __('User_id'), operate:false, visible:false},
+                        {field: 'staff.mobile', title: __('Staff.mobile'), operate: 'LIKE'},
+//                        {field: 'user_id', title: __('User_id'), operate:false, visible:false},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
                         {field: 'user_name', title: __('User_name'), operate: 'LIKE'},
-                        {field: 'user_car_id', title: __('User_car_id'), operate: false, visible: false},
+//                        {field: 'user_car_id', title: __('User_car_id'), operate: false, visible: false},
                         {field: 'user_car_number', title: __('User_car_number'), operate: 'LIKE'},
                         {field: 'user_mobile', title: __('User_mobile'), operate: 'LIKE'},
                         {field: 'user_address', title: __('User_address'), operate: 'LIKE'},
-                        {field: 'pre_order_id', title: __('Pre_order_id'), operate:false, visible:false},
+//                        {field: 'pre_order_id', title: __('Pre_order_id'), operate:false, visible:false},
                         {field: 'pre_order.pre_order_no', title: __('Order.pre_order_no'), operate: 'LIKE'},
-                        {field: 'servicetype_id', title: __('Servicetype_id'), operate:false, visible:false},
+//                        {field: 'servicetype_id', title: __('Servicetype_id'), operate:false, visible:false},
                         {field: 'servicetype.title', title: __('Servicetype.title'), operate: 'LIKE'},
                         {field: 'server_time', title: __('Server_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'server_info', title: __('Server_info'), operate: 'LIKE'},
                         {field: 'server_images', title: __('Server_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
-                        {field: 'package_id', title: __('Package_id'), operate:false, visible:false},
-                        {field: 'package_endtime', title: __('Package_endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'package_id', title: __('Package_id'), operate:false, visible:false},
                         {field: 'status', title: __('Status'), searchList: {"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4')}, formatter: Table.api.formatter.status},
                         {field: 'pay_time', title: __('Pay_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'paytype', title: __('Paytype'), searchList: {"1":__('Paytype 1'),"2":__('Paytype 2'),"3":__('Paytype 3')}, formatter: Table.api.formatter.normal},
@@ -63,8 +65,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'finish_time', title: __('Finish_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'next_date', title: __('Next_date'), operate: 'LIKE'},
                         {field: 'next_carlicheng', title: __('Next_carlicheng'), operate: 'LIKE'},
-                        {field: 'pay_order_id', title: __('Pay_order_id'), operate: false, visible: false},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+//                        {field: 'pay_order_id', title: __('Pay_order_id'), operate: false, visible: false},
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });