sth

application/admin/controller/orders/Revisitorder.php

@@ -3,9 +3,8 @@
 namespace app\admin\controller\orders;
 
 use app\admin\model\Order;
+use app\admin\model\OrderReview;
 use app\common\controller\Backend;
-use think\exception\DbException;
-use think\response\Json;
 
 /**
  * 订单列管理
@@ -24,7 +23,7 @@ class Revisitorder extends Backend
     public function _initialize()
     {
         parent::_initialize();
-        $this->model = new Order();
+        $this->model = new \app\admin\model\Order();
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 
@@ -39,31 +38,53 @@ class Revisitorder extends Backend
 
     /**
      * 查看
-     *
-     * @return string|Json
-     * @throws \think\Exception
-     * @throws DbException
      */
     public function index()
     {
+        //当前是否为关联查询
+        $this->relationSearch = true;
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
-        if (false === $this->request->isAjax()) {
-            return $this->view->fetch();
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    //->with(['orderreview'])
+                    ->where($where)
+                    ->where('status',Order::STATUS_FINISHED)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            $reviewIds = [];
+            foreach ($list as $row) {
+                $row->review= null;
+                if($row->revisit_id){
+                    $reviewIds[] = $row->revisit_id;
+                }
+            }
+
+            if(!empty($reviewIds)){
+                $reviews = OrderReview::whereIn('id',$reviewIds)->select()->toArray();
+                $reviews = array_column($reviews,null,'id');
+            }
+
+            if(!empty($reviews)){
+                foreach ($list as $row) {
+                    if($row->revisit_id && isset($reviews[$row->revisit_id])){
+                        $row->review = $reviews[$row->revisit_id];
+                    }
+                }
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
         }
-        //如果发送的来源是 Selectpage，则转发到 Selectpage
-        if ($this->request->request('keyField')) {
-            return $this->selectpage();
-        }
-        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
-        $list = $this->model
-            ->scope('tab',Order::TAB_REVIEW)
-            ->where($where)
-            ->order($sort, $order)
-            ->paginate($limit);
-        $result = ['total' => $list->total(), 'rows' => $list->items()];
-        return json($result);
+        return $this->view->fetch();
     }
 
-
 }

application/admin/lang/zh-cn/orders/revisitorder.php

@@ -1,50 +1,72 @@
 <?php
 
 return [
-    'Id'               => 'ID',
-    'Order_no'         => '订单编号',
-    'Customer'         => '客户姓名',
-    'Tel'              => '客户电话',
-    'Status'           => '订单状态',
-    'Status 10'        => '未派单',
-    'Set status to 10' => '设为未派单',
-    'Status 20'        => '已派单',
-    'Set status to 20' => '设为已派单',
-    'Status 30'        => '进行中',
-    'Set status to 30' => '设为进行中',
-    'Status 40'        => '待配置',
-    'Set status to 40' => '设为待配置',
-    'Status 41'        => '审核驳回',
-    'Set status to 41' => '设为审核驳回',
-    'Status 50'        => '待财务审核',
-    'Set status to 50' => '设为待财务审核',
-    'Status 60'        => '已完成',
-    'Set status to 60' => '设为已完成',
-    'Status -10'       => '取消',
-    'Set status to -10'=> '设为取消',
-    'Area_id'          => '地域',
-    'Address'          => '详细地址',
-    'Lng'              => '经度',
-    'Lat'              => '纬度',
-    'Work_tel_id'      => '工作机',
-    'Source_shop'      => '来源店铺',
-    'Source'           => '订单来源',
-    'Source_uid'       => '来源UID',
-    'Item_id'          => '服务ID',
-    'Item_title'       => '服务名称',
-    'Detail'           => '订单详情',
-    'Remark'           => '订单备注',
-    'Images'           => '图片',
-    'Plan_time'        => '预约时间',
-    'Admin_id'         => '录单员ID',
-    'Total'            => '总收款',
-    'Cost'             => '师傅成本',
-    'Performance'      => '预计利润',
-    'Cancel_reason_id' => '取消原因',
-    'Cancel_detail'    => '取消详情',
-    'Audit_remark'     => '审核备注',
-    'Audit_admin_id'   => '审核员',
-    'Create_time'      => '录单时间',
-    'Update_time'      => '更新时间',
-    'Delete_time'      => '删除时间'
+    'Id'                    => 'ID',
+    'Order_no'              => '订单号',
+    'Customer'              => '客户姓名',
+    'Tel'                   => '客户电话',
+    'Status'                => '订单状态',
+    'Status 0'              => '草稿',
+    'Set status to 0'       => '设为草稿',
+    'Status 10'             => '未派单',
+    'Set status to 10'      => '设为未派单',
+    'Status 20'             => '已派单',
+    'Set status to 20'      => '设为已派单',
+    'Status 30'             => '进行中',
+    'Set status to 30'      => '设为进行中',
+    'Status 40'             => '待验收',
+    'Set status to 40'      => '设为待验收',
+    'Status 50'             => '待财务审核',
+    'Set status to 50'      => '设为待财务审核',
+    'Status 60'             => '已完成',
+    'Set status to 60'      => '设为已完成',
+    'Status -10'            => '取消',
+    'Set status to -10'     => '设为取消',
+    'Area_id'               => '地域',
+    'Address'               => '详细地址',
+    'Lng'                   => '经度',
+    'Lat'                   => '纬度',
+    'Work_tel_id'           => '工作机',
+    'Source_shop'           => '来源店铺',
+    'Source'                => '订单来源',
+    'Source_uid'            => '来源UID',
+    'Item_id'               => '服务ID',
+    'Item_title'            => '服务名称',
+    'Detail'                => '订单详情',
+    'Remark'                => '订单备注',
+    'Images'                => '图片',
+    'Plan_time'             => '客户预约时间',
+    'Admin_id'              => '录单员ID',
+    'Coupon_id'             => '优惠码id',
+    'Total'                 => '总收款',
+    'Online_amount'         => '线上收款',
+    'Offline_amount'        => '线下尾款',
+    'Online_amount_last'    => '线上尾款',
+    'Offline_amount_type'   => '线下尾款类型',
+    'Offline_amount_type 1' => '师傅收',
+    'Offline_amount_type 2' => '公司收',
+    'Discount_amount'       => '优惠抵扣',
+    'Refund_amount'         => '总退款额',
+    'Real_amount'           => '实际收款',
+    'Cost'                  => '师傅成本',
+    'Performance'           => '预计利润',
+    'Cancel_reason_id'      => '取消原因',
+    'Cancel_detail'         => '取消详情',
+    'Audit_remark'          => '审核备注',
+    'Audit_admin_id'        => '审核员',
+    'Create_time'           => '录单时间',
+    'Update_time'           => '更新时间',
+    'Delete_time'           => '删除时间',
+    'Dispatch_type'         => '1 手动派单 2自动排单',
+    'Receive_type'          => '1 定金 2全款',
+    'Revisit_id'            => '回访ID',
+    'Dispatch_admin_id'     => '派单员',
+    'Dispatch_admin_user'   => '派单员',
+    'Review.order_id'       => '订单ID',
+    'Review.worker_id'      => '师傅ID',
+    'Review.pt_star'        => '平台评分',
+    'Review.worker_star'    => '师傅评分',
+    'Review.remark'         => '备注',
+    'Review.admin_id'       => '回访人',
+    'Review.admin_user'     => '回访人'
 ];

application/admin/model/Order.php

@@ -221,5 +221,4 @@ class Order extends Model
         return $query;
     }
 
-
 }

application/admin/view/orders/revisitorder/add.html

@@ -24,7 +24,7 @@
             
             <div class="radio">
             {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="10"}checked{/in} /> {$vo}</label> 
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="0"}checked{/in} /> {$vo}</label> 
             {/foreach}
             </div>
 
@@ -122,12 +122,66 @@
             <input id="c-plan_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[plan_time]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Coupon_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-coupon_id" data-rule="required" data-source="coupon/index" class="form-control selectpage" name="row[coupon_id]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Total')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-total" data-rule="required" class="form-control" step="0.01" name="row[total]" type="number" value="0.00">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Online_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-online_amount" data-rule="required" class="form-control" step="0.01" name="row[online_amount]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-offline_amount" data-rule="required" class="form-control" step="0.01" name="row[offline_amount]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-online_amount_last" data-rule="required" class="form-control" step="0.01" name="row[online_amount_last]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-offline_amount_type" data-rule="required" class="form-control selectpicker" name="row[offline_amount_type]">
+                {foreach name="offlineAmountTypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Discount_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-discount_amount" data-rule="required" class="form-control" step="0.01" name="row[discount_amount]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-refund_amount" data-rule="required" class="form-control" step="0.01" name="row[refund_amount]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-real_amount" data-rule="required" class="form-control" step="0.01" name="row[real_amount]" type="number" value="0.00">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -182,6 +236,36 @@
             <input id="c-delete_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[delete_time]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dispatch_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dispatch_type" class="form-control" name="row[dispatch_type]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Receive_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-receive_type" class="form-control" name="row[receive_type]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Revisit_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-revisit_id" data-rule="required" data-source="order/review/index" class="form-control selectpage" name="row[revisit_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dispatch_admin_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dispatch_admin_id" data-rule="required" data-source="dispatch/admin/index" class="form-control selectpage" name="row[dispatch_admin_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dispatch_admin_user')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dispatch_admin_user" class="form-control" name="row[dispatch_admin_user]" type="text">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/orders/revisitorder/edit.html

@@ -122,12 +122,66 @@
             <input id="c-plan_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[plan_time]" type="text" value="{$row.plan_time}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Coupon_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-coupon_id" data-rule="required" data-source="coupon/index" class="form-control selectpage" name="row[coupon_id]" type="text" value="{$row.coupon_id|htmlentities}">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Total')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-total" data-rule="required" class="form-control" step="0.01" name="row[total]" type="number" value="{$row.total|htmlentities}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Online_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-online_amount" data-rule="required" class="form-control" step="0.01" name="row[online_amount]" type="number" value="{$row.online_amount|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-offline_amount" data-rule="required" class="form-control" step="0.01" name="row[offline_amount]" type="number" value="{$row.offline_amount|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-online_amount_last" data-rule="required" class="form-control" step="0.01" name="row[online_amount_last]" type="number" value="{$row.online_amount_last|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-offline_amount_type" data-rule="required" class="form-control selectpicker" name="row[offline_amount_type]">
+                {foreach name="offlineAmountTypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.offline_amount_type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Discount_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-discount_amount" data-rule="required" class="form-control" step="0.01" name="row[discount_amount]" type="number" value="{$row.discount_amount|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-refund_amount" data-rule="required" class="form-control" step="0.01" name="row[refund_amount]" type="number" value="{$row.refund_amount|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-real_amount" data-rule="required" class="form-control" step="0.01" name="row[real_amount]" type="number" value="{$row.real_amount|htmlentities}">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -182,6 +236,36 @@
             <input id="c-delete_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[delete_time]" type="text" value="{$row.delete_time}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dispatch_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dispatch_type" class="form-control" name="row[dispatch_type]" type="number" value="{$row.dispatch_type|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Receive_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-receive_type" class="form-control" name="row[receive_type]" type="number" value="{$row.receive_type|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Revisit_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-revisit_id" data-rule="required" data-source="order/review/index" class="form-control selectpage" name="row[revisit_id]" type="text" value="{$row.revisit_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dispatch_admin_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dispatch_admin_id" data-rule="required" data-source="dispatch/admin/index" class="form-control selectpage" name="row[dispatch_admin_id]" type="text" value="{$row.dispatch_admin_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Dispatch_admin_user')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-dispatch_admin_user" class="form-control" name="row[dispatch_admin_user]" type="text" value="{$row.dispatch_admin_user|htmlentities}">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/orders/revisitorder/index.html

@@ -1,6 +1,6 @@
 <div class="panel panel-default panel-intro">
     
-    <div class="panel-heading">
+<!--    <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
             <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
@@ -8,7 +8,7 @@
             <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
             {/foreach}
         </ul>
-    </div>
+    </div>-->
 
 
     <div class="panel-body">
@@ -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('orders/revisitorder/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                  <!--      <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('orders/revisitorder/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('orders/revisitorder/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('orders/revisitorder/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
@@ -30,7 +30,7 @@
                                 {/foreach}
                             </ul>
                         </div>
-
+-->
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"

public/assets/js/backend/orders/dispatch2.js

@@ -123,8 +123,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
                                 },
                                 {
                                     name: 'addrecord',
-                                    text:"备忘",
-                                    title:"添加备忘-跟进订单",
+                                    text:"去跟进",
+                                    title:"添加跟进信息",
                                     icon: 'fa fa-list',
                                     url: 'orders/dispatchrecord/add',
                                     extend: 'data-toggle="tooltip" data-container="body"',

public/assets/js/backend/orders/revisitorder.js

@@ -6,7 +6,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.init({
                 extend: {
                     index_url: 'orders/revisitorder/index' + location.search,
-                    add_url: 'orders/revisitorder/add',
+                 //   add_url: 'orders/revisitorder/add',
                     edit_url: 'orders/revisitorder/edit',
                    // del_url: 'orders/revisitorder/del',
                     multi_url: 'orders/revisitorder/multi',
@@ -24,59 +24,61 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                commonSearch:false,
+                search:false,
                 columns: [
                     [
-                       // {checkbox: true},
+                      //  {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
                         {field: 'customer', title: __('Customer'), operate: 'LIKE'},
                         {field: 'tel', title: __('Tel'), operate: 'LIKE'},
-                        {field: 'status', title: __('Status'), searchList: {"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"41":__('Status 41'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status},
-                        {field: 'area_id', title: __('Area_id')},
+                       // {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status},
+                     //   {field: 'area_id', title: __('Area_id'), operate: 'LIKE'},
                         {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'lng', title: __('Lng'), operate:'BETWEEN'},
-                        {field: 'lat', title: __('Lat'), operate:'BETWEEN'},
-                        {field: 'work_tel_id', title: __('Work_tel_id')},
+
                         {field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'},
                         {field: 'source', title: __('Source')},
-                        {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'},
-                        {field: 'item_id', title: __('Item_id')},
+
                         {field: 'item_title', title: __('Item_title'), operate: 'LIKE'},
                         {field: 'detail', title: __('Detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
-                        {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
-                        {field: 'admin_id', title: __('Admin_id')},
-                        {field: 'total', title: __('Total'), operate:'BETWEEN'},
-                        {field: 'cost', title: __('Cost'), operate:'BETWEEN'},
-                        {field: 'performance', title: __('Performance'), operate:'BETWEEN'},
-                        {field: 'cancel_reason_id', title: __('Cancel_reason_id')},
-                        {field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'audit_admin_id', title: __('Audit_admin_id')},
+                       // {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                      //  {field: 'admin_id', title: __('Admin_id')},
+                      //  {field: 'coupon_id', title: __('Coupon_id')},
+                      //   {field: 'total', title: __('Total'), operate:'BETWEEN'},
+                      //   {field: 'online_amount', title: __('Online_amount'), operate:'BETWEEN'},
+                      //   {field: 'offline_amount', title: __('Offline_amount'), operate:'BETWEEN'},
+                      //   {field: 'online_amount_last', title: __('Online_amount_last'), operate:'BETWEEN'},
+                      //   {field: 'offline_amount_type', title: __('Offline_amount_type'), searchList: {"1":__('Offline_amount_type 1'),"2":__('Offline_amount_type 2')}, formatter: Table.api.formatter.normal},
+                      //   {field: 'discount_amount', title: __('Discount_amount'), operate:'BETWEEN'},
+                      //   {field: 'refund_amount', title: __('Refund_amount'), operate:'BETWEEN'},
+                      //   {field: 'real_amount', title: __('Real_amount'), operate:'BETWEEN'},
+                      //   {field: 'cost', title: __('Cost'), operate:'BETWEEN'},
+                      //   {field: 'performance', title: __('Performance'), operate:'BETWEEN'},
+                      //   {field: 'cancel_reason_id', title: __('Cancel_reason_id')},
+                      //   {field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                      //   {field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                      //   {field: 'audit_admin_id', title: __('Audit_admin_id')},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
-                        {field: 'delete_time', title: __('Delete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
-                            align:'left',
-                            buttons:[
-                                {
-                                    name: 'edit',
-                                    text:"回访",
-                                    title:"回访",
-                                    icon: 'fa fa-pencil',
-                                    //title: __('Edit'),
-                                    extend: 'data-toggle="tooltip" data-container="body"',
-                                    classname: 'btn btn-xs btn-info btn-editone',
-                                    visible:function(row){
-                                        if(row.revisit_id <= 0){
-                                            return true;
-                                        }
-                                        return false;
-                                    }
-                                },
-                            ]
-                        }
+                        // {field: 'delete_time', title: __('Delete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        // {field: 'dispatch_type', title: __('Dispatch_type')},
+                        // {field: 'receive_type', title: __('Receive_type')},
+                        // {field: 'revisit_id', title: __('Revisit_id')},
+                        // {field: 'dispatch_admin_id', title: __('Dispatch_admin_id')},
+                        // {field: 'dispatch_admin_user', title: __('Dispatch_admin_user'), operate: 'LIKE'},
+                        // {field: 'review.id', title: __('Review.id')},
+                        //{field: 'review.order_id', title: __('Review.order_id')},
+                       // {field: 'review.worker_id', title: __('Review.worker_id')},
+                        {field: 'review.pt_star', title: __('Review.pt_star')},
+                        {field: 'review.worker_star', title: __('Review.worker_star')},
+                        {field: 'review.remark', title: __('Review.remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        //{field: 'review.admin_id', title: __('Review.admin_id')},
+                        {field: 'review.admin_user', title: __('Review.admin_user'), operate: 'LIKE'},
+                        {field: 'review.create_time', title: __('回访时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });