diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js
index 3be37b6..e1f06e3 100644
--- a/public/assets/js/backend/orders/dispatch2.js
+++ b/public/assets/js/backend/orders/dispatch2.js
@@ -93,6 +93,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
                                 return value;
                             }
                         }},
+                        {
+                            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: 'order.source_shop', title: __('Order.source_shop'), operate: '='},
                        // {field: 'order.source', title: __('Order.source')},
@@ -109,21 +124,6 @@ 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},