sth
This commit is contained in:
xman
parent
fc98c2b222
commit
d4521e4410
|
|
@ -21,8 +21,8 @@ class OrderDispatchLog
|
|||
'dispatch_id' => $dispatch->id,
|
||||
'order_id' => $dispatch->order_id,
|
||||
'worker_id' => $dispatch->worker_id,
|
||||
'order_status' => $dispatch->status,
|
||||
'order_status_text' => $statusList[$dispatch->status],
|
||||
'status' => $dispatch->status,
|
||||
'status_text' => $statusList[$dispatch->status],
|
||||
'remark' => $remark,
|
||||
];
|
||||
\app\admin\model\OrderDispatchLog::create($data);
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ class Auditorder extends Backend
|
|||
*/
|
||||
public function edit($ids = null)
|
||||
{
|
||||
$row = $this->model->get($ids);
|
||||
$row = $this->model->get($ids,['dispatch']);
|
||||
if (!$row) {
|
||||
$this->error(__('No Results were found'));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ class Configorder extends Backend
|
|||
*/
|
||||
public function edit($ids = null)
|
||||
{
|
||||
$row = $this->model->get($ids);
|
||||
$row = $this->model->get($ids,['dispatch']);
|
||||
if (!$row) {
|
||||
$this->error(__('No Results were found'));
|
||||
}
|
||||
|
|
@ -128,6 +128,7 @@ class Configorder extends Backend
|
|||
'offline_amount' => $params['offline_amount'],
|
||||
'refund_amount' => $params['refund_amount'],
|
||||
'cost' => $params['cost'],
|
||||
'offline_amount_type'=> $params['offline_amount_type']
|
||||
];
|
||||
|
||||
$last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2);
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ class Dispatch2 extends Backend
|
|||
$this->error(__('You have no permission'));
|
||||
}
|
||||
|
||||
$order = Order::where('id',$row->id)->find();
|
||||
$order = Order::where('id',$row->order_id)->find();
|
||||
|
||||
if(empty($order)){
|
||||
$this->error(__('未找到关联订单'));
|
||||
|
|
|
|||
|
|
@ -85,5 +85,6 @@ return [
|
|||
'Order.audit_admin_id' => '审核员',
|
||||
'Order.create_time' => '录单时间',
|
||||
'Order.update_time' => '更新时间',
|
||||
'Order.delete_time' => '删除时间'
|
||||
'Order.delete_time' => '删除时间',
|
||||
|
||||
];
|
||||
|
|
|
|||
|
|
@ -221,4 +221,5 @@ class Order extends Model
|
|||
return $query;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@ class OrderDispatch extends Model
|
|||
protected $append = [
|
||||
'type_text',
|
||||
'status_text',
|
||||
'is_notice_text'
|
||||
'is_notice_text',
|
||||
'offline_total_type_text'
|
||||
];
|
||||
|
||||
const STATUS_TOGET = 0; //待接
|
||||
|
|
@ -62,7 +63,7 @@ class OrderDispatch extends Model
|
|||
|
||||
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] ?? '';
|
||||
}
|
||||
|
||||
public function getOfflineTotalTypeTextAttr($value,$data){
|
||||
$value = $value ?: ($data['offline_total_type'] ?? '');
|
||||
$list = $this->getOfflineTotalTypeList();
|
||||
return $list[$value] ?? '';
|
||||
}
|
||||
|
||||
|
||||
public function deleteStatusList(){
|
||||
return [
|
||||
|
|
|
|||
|
|
@ -1,123 +1,85 @@
|
|||
|
||||
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
|
||||
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td class="text-right">
|
||||
{:__('Order_no')}
|
||||
</td>
|
||||
<td>
|
||||
{$row.order_no|htmlentities}
|
||||
</td>
|
||||
</tr>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<input id="c-order_no" class="form-control" readonly type="text" value=" {$row.order_no|htmlentities}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<tr>
|
||||
<td class="text-right">
|
||||
{:__('Customer')}
|
||||
</td>
|
||||
<td>
|
||||
{$row.customer|htmlentities}
|
||||
</td>
|
||||
</tr>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Item_title')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<input id="c-item_title" readonly class="form-control" type="text" value="{$row.item_title|htmlentities}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<tr>
|
||||
<td class="text-right">
|
||||
{:__('Tel')}
|
||||
</td>
|
||||
<td>
|
||||
{$row.tel|htmlentities}
|
||||
</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">{:__('Detail')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<input id="c-detail" readonly class="form-control" type="text" value="{$row.detail|htmlentities}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<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">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<div class="input-group">
|
||||
<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">
|
||||
<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 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="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="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>
|
||||
<span class="msg-box n-right" for="c-images"></span>
|
||||
</div>
|
||||
<ul class="row list-inline faupload-preview" id="p-images"></ul>
|
||||
</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">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Online_amount')}:</label>
|
||||
<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 class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label>
|
||||
<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 class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount')}:</label>
|
||||
<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>
|
||||
|
||||
|
|
@ -125,22 +87,33 @@
|
|||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label>
|
||||
<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 class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label>
|
||||
<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 class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Real_amount')}:</label>
|
||||
<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>
|
||||
|
||||
|
|
@ -148,13 +121,13 @@
|
|||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
|
||||
<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 class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Performance')}:</label>
|
||||
<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>
|
||||
|
||||
|
|
@ -164,7 +137,7 @@
|
|||
<label class="control-label col-xs-12 col-sm-2">{:__('审核状态')}:</label>
|
||||
<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]-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">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label>
|
||||
<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>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<div class="widget-body no-padding">
|
||||
<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-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-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>
|
||||
{/foreach}
|
||||
</ul>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label>
|
||||
<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>
|
||||
{/notempty}
|
||||
|
|
@ -14,14 +14,14 @@
|
|||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
|
||||
<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 class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Item_title')}:</label>
|
||||
<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>
|
||||
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label>
|
||||
<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>
|
||||
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label>
|
||||
<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>
|
||||
|
||||
|
|
@ -85,6 +85,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- <div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Performance')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('线上尾款')}:</label>
|
||||
<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>
|
||||
|
||||
|
|
@ -120,9 +120,11 @@
|
|||
</div>
|
||||
|
||||
<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">
|
||||
{: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>
|
||||
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ class OrderLogic
|
|||
$total = bcadd($order->online_amount,$offline_amount,2);
|
||||
$orderUpdate['offline_amount'] = $offline_amount;
|
||||
$orderUpdate['total'] = $total;
|
||||
//$orderUpdate['offline_amount_type'] = $orderDispatch->offline_total_type;
|
||||
}
|
||||
$order->allowField(true)->save($orderUpdate);
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
|
|||
extend: {
|
||||
index_url: 'orders/dispatch2/index' + location.search,
|
||||
//add_url: 'orders/dispatch/add',
|
||||
edit_url: 'orders/dispatch2/edit',
|
||||
// edit_url: 'orders/dispatch2/edit',
|
||||
//del_url: 'orders/dispatc2h/del',
|
||||
multi_url: 'orders/dispatch2/multi',
|
||||
import_url: 'orders/dispatch2/import',
|
||||
|
|
@ -90,7 +90,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
|
|||
|
||||
align:'left',
|
||||
buttons: [
|
||||
{
|
||||
/* {
|
||||
name: 'edit',
|
||||
text:"修改",
|
||||
title:"",
|
||||
|
|
@ -104,12 +104,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
|
|||
}
|
||||
return false;
|
||||
}
|
||||
},
|
||||
},*/
|
||||
|
||||
{
|
||||
name: 'finish',
|
||||
text:"完成",
|
||||
title:"完成",
|
||||
text:"去完成",
|
||||
title:"完成当前任务",
|
||||
icon: 'fa fa-check',
|
||||
url:'orders/dispatch2/finish',
|
||||
extend: 'data-toggle="tooltip" data-container="body"',
|
||||
|
|
@ -124,7 +124,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
|
|||
{
|
||||
name: 'addrecord',
|
||||
text:"备忘",
|
||||
title:"备忘",
|
||||
title:"添加备忘-跟进订单",
|
||||
icon: 'fa fa-list',
|
||||
url: 'orders/dispatchrecord/add',
|
||||
extend: 'data-toggle="tooltip" data-container="body"',
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user