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-12 18:46:27 +08:00
parent fc98c2b222
commit d4521e4410
13 changed files with 102 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/behavior/OrderDispatchLog.php
View File

@ -21,8 +21,8 @@ class OrderDispatchLog
'dispatch_id' => $dispatch->id, 'dispatch_id' => $dispatch->id,
'order_id' => $dispatch->order_id, 'order_id' => $dispatch->order_id,
'worker_id' => $dispatch->worker_id, 'worker_id' => $dispatch->worker_id,
'order_status' => $dispatch->status, 'status' => $dispatch->status,
'order_status_text' => $statusList[$dispatch->status], 'status_text' => $statusList[$dispatch->status],
'remark' => $remark, 'remark' => $remark,
]; ];
\app\admin\model\OrderDispatchLog::create($data); \app\admin\model\OrderDispatchLog::create($data);

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

@ -92,7 +92,7 @@ class Auditorder extends Backend
*/ */
public function edit($ids = null) public function edit($ids = null)
{ {
$row = $this->model->get($ids); $row = $this->model->get($ids,['dispatch']);
if (!$row) { if (!$row) {
$this->error(__('No Results were found')); $this->error(__('No Results were found'));
} }

3
application/admin/controller/orders/Configorder.php
View File

@ -91,7 +91,7 @@ class Configorder extends Backend
*/ */
public function edit($ids = null) public function edit($ids = null)
{ {
$row = $this->model->get($ids); $row = $this->model->get($ids,['dispatch']);
if (!$row) { if (!$row) {
$this->error(__('No Results were found')); $this->error(__('No Results were found'));
} }
@ -128,6 +128,7 @@ class Configorder extends Backend
'offline_amount' => $params['offline_amount'], 'offline_amount' => $params['offline_amount'],
'refund_amount' => $params['refund_amount'], 'refund_amount' => $params['refund_amount'],
'cost' => $params['cost'], 'cost' => $params['cost'],
'offline_amount_type'=> $params['offline_amount_type']
]; ];
$last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2); $last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2);

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

@ -202,7 +202,7 @@ class Dispatch2 extends Backend
$this->error(__('You have no permission')); $this->error(__('You have no permission'));
} }
$order = Order::where('id',$row->id)->find(); $order = Order::where('id',$row->order_id)->find();
if(empty($order)){ if(empty($order)){
$this->error(__('未找到关联订单')); $this->error(__('未找到关联订单'));

3
application/admin/lang/zh-cn/orders/dispatch2.php
View File

@ -85,5 +85,6 @@ return [
'Order.audit_admin_id' => '审核员', 'Order.audit_admin_id' => '审核员',
'Order.create_time' => '录单时间', 'Order.create_time' => '录单时间',
'Order.update_time' => '更新时间', 'Order.update_time' => '更新时间',
'Order.delete_time' => '删除时间' 'Order.delete_time' => '删除时间',
]; ];

1
application/admin/model/Order.php
View File

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

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

@ -29,7 +29,8 @@ class OrderDispatch extends Model
protected $append = [ protected $append = [
'type_text', 'type_text',
'status_text', 'status_text',
'is_notice_text' 'is_notice_text',
'offline_total_type_text'
]; ];
const STATUS_TOGET = 0; //待接 const STATUS_TOGET = 0; //待接
@ -62,7 +63,7 @@ class OrderDispatch extends Model
public function getOfflineTotalTypeList() public function getOfflineTotalTypeList()
{ {
return ['0' => __('Offline_total_type 0'), '1'=> __('Offline_total_type 1'),'2' => __('Offline_total_type 2')]; return ['0' => __('无'), '1'=> __('师傅收'),'2' => __('公司收')];
} }
@ -89,6 +90,12 @@ class OrderDispatch extends Model
return $list[$value] ?? ''; return $list[$value] ?? '';
} }
public function getOfflineTotalTypeTextAttr($value,$data){
$value = $value ?: ($data['offline_total_type'] ?? '');
$list = $this->getOfflineTotalTypeList();
return $list[$value] ?? '';
}
public function deleteStatusList(){ public function deleteStatusList(){
return [ return [

155
application/admin/view/orders/auditorder/edit.html
View File

@ -1,123 +1,85 @@
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<table class="table"> <div class="form-group">
<tr> <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
<td class="text-right"> <div class="col-xs-12 col-sm-8">
{:__('Order_no')} <input id="c-order_no" class="form-control" readonly type="text" value=" {$row.order_no|htmlentities}">
</td> </div>
<td> </div>
{$row.order_no|htmlentities}
</td>
</tr>
<tr> <div class="form-group">
<td class="text-right"> <label class="control-label col-xs-12 col-sm-2">{:__('Item_title')}:</label>
{:__('Customer')} <div class="col-xs-12 col-sm-8">
</td> <input id="c-item_title" readonly class="form-control" type="text" value="{$row.item_title|htmlentities}">
<td> </div>
{$row.customer|htmlentities} </div>
</td>
</tr>
<tr> <div class="form-group">
<td class="text-right"> <label class="control-label col-xs-12 col-sm-2">{:__('Detail')}:</label>
{:__('Tel')} <div class="col-xs-12 col-sm-8">
</td> <input id="c-detail" readonly class="form-control" type="text" value="{$row.detail|htmlentities}">
<td> </div>
{$row.tel|htmlentities} </div>
</td>
</tr>
<tr>
<td class="text-right">
{:__('Address')}
</td>
<td>
{$row.address|htmlentities}
</td>
</tr>
<tr>
<td class="text-right">
{:__('Order_item')}
</td>
<td>
{$row.order_item|htmlentities}
</td>
</tr>
<tr>
<td class="text-right">
{:__('Detail')}
</td>
<td>
{$row.detail|htmlentities}
</td>
</tr>
<tr>
<td class="text-right">
{:__('Remark')}
</td>
<td>
{$row.remark|htmlentities}
</td>
</tr>
<tr>
<td class="text-right">
{:__('Remark')}
</td>
<td>
{$row.remark|htmlentities}
</td>
</tr>
</table>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Customer')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-customer" class="form-control" readonly type="text" value="{$row.customer|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Tel')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-tel" class="form-control" readonly type="text" value=" {$row.tel|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-address" class="form-control" readonly type="text" value="{$row.address|htmlentities}">
</div>
</div>
<!--
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<div class="input-group"> <div class="input-group">
<input disabled id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}"> <input disabled id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
<div class="input-group-addon no-border no-padding"> <div class="input-group-addon no-border no-padding">
<span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span> <span><button disabled type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span> <span><button disabled type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div> </div>
<span class="msg-box n-right" for="c-images"></span> <span class="msg-box n-right" for="c-images"></span>
</div> </div>
<ul class="row list-inline faupload-preview" id="p-images"></ul> <ul class="row list-inline faupload-preview" id="p-images"></ul>
</div> </div>
</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" readonly data-rule="required" class="form-control" step="0.01" name="row[total]" type="number" value="{$row.total|htmlentities}">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Online_amount')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Online_amount')}:</label>
<div class="col-xs-12 col-sm-8"> <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}"> <input id="c-online_amount" readonly class="form-control" step="0.01" type="number" value="{$row.online_amount|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label>
<div class="col-xs-12 col-sm-8"> <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}"> <input id="c-online_amount_last" readonly class="form-control" step="0.01" type="number" value="{$row.online_amount_last|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-offline_amount" readonly data-rule="required" class="form-control" step="0.01" name="row[offline_amount]" type="number" value="{$row.offline_amount|htmlentities}"> <input id="c-offline_amount" readonly class="form-control" step="0.01" type="number" value="{$row.offline_amount|htmlentities}">
</div> </div>
</div> </div>
@ -125,22 +87,33 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
{:build_select('offline_amount_type',$offlineTotalTypeList,$row['dispatch']['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])} <input readonly class="form-control" value="{$row['offline_amount_type_text']}">
</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" readonly class="form-control" step="0.01" type="number" value="{$row.total|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-refund_amount" readonly data-rule="required" class="form-control" step="0.01" name="row[refund_amount]" type="number" value="{$row.refund_amount|htmlentities}"> <input id="c-refund_amount" readonly class="form-control" step="0.01" name="row[refund_amount]" type="number" value="{$row.refund_amount|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Real_amount')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Real_amount')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-real_amount" readonly data-rule="required" class="form-control" step="0.01" name="row[real_amount]" type="number" value="{$row.real_amount|htmlentities}"> <input id="c-real_amount" readonly class="form-control" step="0.01" name="row[real_amount]" type="number" value="{$row.real_amount|htmlentities}">
</div> </div>
</div> </div>
@ -148,13 +121,13 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-cost" readonly data-rule="required" class="form-control" step="0.01" name="row[cost]" type="number" value="{$row.cost|htmlentities}"> <input id="c-cost" readonly class="form-control" step="0.01" name="row[cost]" type="number" value="{$row.cost|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Performance')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Performance')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-performance" readonly data-rule="required" class="form-control" step="0.01" name="row[performance]" type="number" value="{$row.performance|htmlentities}"> <input id="c-performance" readonly class="form-control" step="0.01" name="row[performance]" type="number" value="{$row.performance|htmlentities}">
</div> </div>
</div> </div>
@ -164,7 +137,7 @@
<label class="control-label col-xs-12 col-sm-2">{:__('审核状态')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('审核状态')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<div class="radio"> <div class="radio" data-rule="required">
<label for="row[audit_status]-0"><input id="row[audit_status]-0" name="row[audit_status]" type="radio" value="0" /> 不通过</label> <label for="row[audit_status]-0"><input id="row[audit_status]-0" name="row[audit_status]" type="radio" value="0" /> 不通过</label>
<label for="row[audit_status]-1"><input id="row[audit_status]-1" name="row[audit_status]" type="radio" value="1" checked/> 通过</label> <label for="row[audit_status]-1"><input id="row[audit_status]-1" name="row[audit_status]" type="radio" value="1" checked/> 通过</label>
@ -177,7 +150,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<textarea class="form-control" placeholder="审核备注" name="row[audit_remark]" >{$row.audit_remark|htmlentities}</textarea> <textarea data-rule="required" class="form-control" placeholder="审核备注" name="row[audit_remark]" >{$row.audit_remark|htmlentities}</textarea>
</div> </div>
</div> </div>

4
application/admin/view/orders/auditorder/index.html
View File

@ -18,7 +18,7 @@
<div class="widget-body no-padding"> <div class="widget-body no-padding">
<div id="toolbar" class="toolbar"> <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-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('orders/auditorder/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a> <!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('orders/auditorder/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/auditorder/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a> <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('orders/auditorder/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/auditorder/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a> <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('orders/auditorder/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
@ -30,7 +30,7 @@
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li> <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
{/foreach} {/foreach}
</ul> </ul>
</div> </div>-->
</div> </div>

11
application/admin/view/orders/configorder/edit.html
View File

@ -5,7 +5,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<div class="alert alert-danger">{$row.audit_remark|htmlentities}</div> <div class="alert alert-warning">{$row.audit_remark|htmlentities}<br/><span style="font-size: 12px;">(审核未通过，请重新配置)</span></div>
</div> </div>
</div> </div>
{/notempty} {/notempty}
@ -14,14 +14,14 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-order_no" readonly data-rule="required" class="form-control" type="text" value="{$row.order_no|htmlentities}"> <input id="c-order_no" readonly class="form-control" type="text" value="{$row.order_no|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Item_title')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Item_title')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-item_title" data-rule="required" readonly class="form-control" type="text" value="{$row.item_title|htmlentities}"> <input id="c-item_title" readonly class="form-control" type="text" value="{$row.item_title|htmlentities}">
</div> </div>
</div> </div>
@ -52,7 +52,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label>
<div class="col-xs-12 col-sm-8"> <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.dispatch.online_amount|htmlentities}"> <input id="c-online_amount_last" data-rule="required" class="form-control" step="0.01" name="row[online_amount_last]" type="number" value="{$row.dispatch.online_total|htmlentities}">
</div> </div>
</div> </div>
@ -66,7 +66,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
{:build_select('offline_amount_type',$offlineTotalTypeList,$row['dispatch']['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])} {:build_select('row[offline_amount_type]',$offlineTotalTypeList,$row['dispatch']['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])}
</div> </div>
</div> </div>
@ -85,6 +85,7 @@
</div> </div>
</div> </div>
<!-- <div class="form-group"> <!-- <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Performance')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Performance')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">

8
application/admin/view/orders/dispatch2/edit.html
View File

@ -108,7 +108,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('线上尾款')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('线上尾款')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input name="row[online_total]" type="number" min="0" placeholder="请输入线上尾款金额" class="form-control" value="{$order.online_total|htmlentities}"> <input name="row[online_total]" data-rule="required" type="number" min="0" placeholder="请输入线上尾款金额" class="form-control" value="{$order.online_total|htmlentities}">
</div> </div>
</div> </div>
@ -120,9 +120,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Offline_total_type')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
{:build_select('offline_total_type',$offlineTotalTypeList,$row['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])}
{:build_select('row[offline_total_type]',$offlineTotalTypeList,$row['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])}
</div> </div>
</div> </div>

1
application/common/Logic/OrderLogic.php
View File

@ -51,6 +51,7 @@ class OrderLogic
$total = bcadd($order->online_amount,$offline_amount,2); $total = bcadd($order->online_amount,$offline_amount,2);
$orderUpdate['offline_amount'] = $offline_amount; $orderUpdate['offline_amount'] = $offline_amount;
$orderUpdate['total'] = $total; $orderUpdate['total'] = $total;
//$orderUpdate['offline_amount_type'] = $orderDispatch->offline_total_type;
} }
$order->allowField(true)->save($orderUpdate); $order->allowField(true)->save($orderUpdate);

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

@ -7,7 +7,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
extend: { extend: {
index_url: 'orders/dispatch2/index' + location.search, index_url: 'orders/dispatch2/index' + location.search,
//add_url: 'orders/dispatch/add', //add_url: 'orders/dispatch/add',
edit_url: 'orders/dispatch2/edit', // edit_url: 'orders/dispatch2/edit',
//del_url: 'orders/dispatc2h/del', //del_url: 'orders/dispatc2h/del',
multi_url: 'orders/dispatch2/multi', multi_url: 'orders/dispatch2/multi',
import_url: 'orders/dispatch2/import', import_url: 'orders/dispatch2/import',
@ -90,7 +90,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
align:'left', align:'left',
buttons: [ buttons: [
{ /* {
name: 'edit', name: 'edit',
text:"修改", text:"修改",
title:"", title:"",
@ -104,12 +104,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
} }
return false; return false;
} }
}, },*/
{ {
name: 'finish', name: 'finish',
text:"完成", text:"去完成",
title:"完成", title:"完成当前任务",
icon: 'fa fa-check', icon: 'fa fa-check',
url:'orders/dispatch2/finish', url:'orders/dispatch2/finish',
extend: 'data-toggle="tooltip" data-container="body"', extend: 'data-toggle="tooltip" data-container="body"',
@ -124,7 +124,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
{ {
name: 'addrecord', name: 'addrecord',
text:"备忘", text:"备忘",
title:"备忘", title:"添加备忘-跟进订单",
icon: 'fa fa-list', icon: 'fa fa-list',
url: 'orders/dispatchrecord/add', url: 'orders/dispatchrecord/add',
extend: 'data-toggle="tooltip" data-container="body"', extend: 'data-toggle="tooltip" data-container="body"',