From d9e862abe6e77fff2145fdaa9d7fa32ca2287bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=9F=E5=B7=9D=E4=B8=9C?= Date: Fri, 30 May 2025 14:04:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=80=90=E5=90=8E=E7=AB=AFAPI=E3=80=91?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BB=85=E6=98=BE=E7=A4=BA=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B4=BE=E5=8D=95=E7=9A=84=E8=AE=A2=E5=8D=95=EF=BC=9B?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=B7=9F=E8=BF=9B=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BD=93=E5=89=8D=E8=BF=9B=E5=BA=A6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/services/OrderDispatchService.php | 2 ++ public/assets/js/backend/orders/dispatch2.js | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/application/services/OrderDispatchService.php b/application/services/OrderDispatchService.php index 64fb368..d7e7cc1 100644 --- a/application/services/OrderDispatchService.php +++ b/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) { diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js index 8b229e9..3be37b6 100644 --- a/public/assets/js/backend/orders/dispatch2.js +++ b/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},