hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sth

Browse Source
This commit is contained in:
xman 2025-04-22 13:49:15 +08:00
parent f5d92ae1fe
commit 3c829efb54
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/orders/Dispatch2.php
View File

@ -69,7 +69,7 @@ class Dispatch2 extends Backend
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$list = $this->model
->with(['order'])
->with(['orderb'])
->auth($this->auth)
->where($where)
->order($sort, $order)

2
application/admin/model/OrderDispatch.php
View File

@ -116,7 +116,7 @@ class OrderDispatch extends Model
}
public function order()
public function orderb()
{
return $this->belongsTo('Order', 'order_id', 'id', [], 'LEFT')->setEagerlyType(0);
}

9
application/common/command/CheckOrdeRecordCommand.php
View File

@ -2,6 +2,7 @@
namespace app\common\command;
use app\admin\model\Message;
use app\admin\model\OrderDispatch;
use app\admin\model\OrderDispatchRecord;
@ -33,7 +34,13 @@ class CheckOrdeRecordCommand extends Command
$dispatchIds[] = $item->dispatch_id;
//修改状态
if($item->need_notice == 1){ //需要通知
$dispatch = OrderDispatch::get($item->dispatch_id,['orderb']);
Message::create([
'to_id' => $dispatch->admin_id,
'type' => 1,
'title' => '派单任务跟进提醒',
'content' => '订单编号:'.$dispatch->orderb->order_no.'，请及时关注。'
]);
}
}
OrderDispatchRecord::whereIn('id',$ids)->update(['status'=>1]);

10
public/assets/js/backend/orders/dispatch2.js
View File

@ -96,12 +96,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
//{field: 'order.source_shop', title: __('Order.source_shop'), operate: '='},
// {field: 'order.source', title: __('Order.source')},
{field: 'order.customer', title: __('Order.customer'), operate: false},
{field: 'order.tel', title: __('Order.tel'), operate: '='},
{field: 'order.address', title: __('Order.address'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'orderb.customer', title: __('Order.customer'), operate: false},
{field: 'orderb.tel', title: __('Order.tel'), operate: '='},
{field: 'orderb.address', title: __('Order.address'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'order.item_title', title: __('Order.item_title'), operate: false},
{field: 'order.detail', title: __('Order.detail'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'orderb.item_title', title: __('Order.item_title'), operate: false},
{field: 'orderb.detail', title: __('Order.detail'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'order.images', title: __('Order.images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
{field: 'arrive_time', title: __('上门时间'), operate:false, addclass:'datetimerange', autocomplete:false},