feat: 【后端API】小程序仅显示自动派单的订单；后台跟进列表增加当前进度相关字段

application/services/OrderDispatchService.php

@@ -26,6 +26,7 @@ class OrderDispatchService extends BaseService
                 )->field('id,order_no,item_id,item_title,receive_type,address,lng,lat,plan_time,online_amount,discount_amount,area_id,status,coupon_id');
             }])
             ->where('status', OrderDispatch::STATUS_TOGET)
+            ->where('type', '<>', 1)
             ->where('worker_id', $workerId)
             ->field(['id', 'order_id', 'status', 'remark', 'create_time'])
             ->order('id desc')
@@ -88,6 +89,7 @@ class OrderDispatchService extends BaseService
                     }
                 ])->field('id,order_no,item_id,item_title,receive_type,address,lng,lat,plan_time,online_amount,discount_amount,area_id,customer,tel,status,coupon_id');
             }])
+            ->where('type', '<>', 1)
             ->where('worker_id', $workerId);
 
         switch ($type) {

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

@@ -109,6 +109,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
 
                         // {field: 'is_notice', title: __('Is_notice'), searchList: {"0":__('Is_notice 0'),"1":__('Is_notice 1')}, formatter: Table.api.formatter.normal},
                         // {field: 'admin_id', title: __('Admin_id')},
+                        {
+                            field: 'is_finish_today',
+                            title: '今日完成',
+                            searchList: {
+                                '0':'不能',
+                                "1": '能',
+                            },
+                            formatter: Table.api.formatter.label,
+                            custom: {
+                                '0': 'warning',
+                                '1': 'success',
+                            },
+                        },
+                        {field: 'estimated_finish_time', title: __('师傅预估完成时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'work_progress', title: __('当前施工进度'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false},