text
This commit is contained in:
xman
parent
65aea57786
commit
066c6fb584
|
|
@ -122,18 +122,20 @@ class Configorder extends Backend
|
|||
|
||||
$data = [
|
||||
'status' => Order::STATUS_AUDITING,
|
||||
'online_amount_last' => $params['online_amount_last'],
|
||||
'offline_amount' => $params['offline_amount'],
|
||||
'refund_amount' => $params['refund_amount'],
|
||||
'cost' => $params['cost'],
|
||||
];
|
||||
|
||||
$data['total'] = bcadd($row->online_amount,$params['offline_amount'],2);
|
||||
$last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2);
|
||||
|
||||
$data['total'] = bcadd($row->online_amount,$last_amount,2);
|
||||
$data['real_amount'] = bcsub($data['total'],$params['refund_amount'],2);
|
||||
$data['performance'] = bcsub($data['real_amount'],$params['cost'],2);
|
||||
$result = $row->allowField(true)->save($data);
|
||||
|
||||
//日志
|
||||
|
||||
$params['order'] = $row;
|
||||
$params['role'] = 1;
|
||||
$params['auth'] = $this->auth;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ return [
|
|||
'Amount' => '收款金额',
|
||||
'Income_type' => '收款方式',
|
||||
'Income_type 1' => '平台收款',
|
||||
'Income_type 2' => '线下收款',
|
||||
'Income_type 2' => '线下尾款',
|
||||
'Admin_id' => '创建人ID',
|
||||
'Admin_user' => '创建人',
|
||||
'Payment_time' => '收款时间',
|
||||
|
|
|
|||
|
|
@ -39,8 +39,9 @@ return [
|
|||
'Plan_time' => '预约时间',
|
||||
'Admin_id' => '录单员ID',
|
||||
'Total' => '总收款',
|
||||
'Online_amount' => '线上收款',
|
||||
'Offline_amount' => '线下收款',
|
||||
'Online_amount' => '线上预付',
|
||||
'Online_amount_last' => '线上尾款',
|
||||
'Offline_amount' => '线下尾款',
|
||||
'Discount_amount' => '优惠抵扣',
|
||||
'Real_amount' => '实际收款',
|
||||
'Refund_amount' => '退款金额',
|
||||
|
|
|
|||
|
|
@ -39,8 +39,9 @@ return [
|
|||
'Admin_id' => '录单员ID',
|
||||
'Coupon_id' => '优惠码id',
|
||||
'Total' => '总收款',
|
||||
'Online_amount' => '线上收款',
|
||||
'Offline_amount' => '线下收款',
|
||||
'Online_amount' => '线上预付',
|
||||
'Online_amount_last' => '线上尾款',
|
||||
'Offline_amount' => '线下尾款',
|
||||
'Discount_amount' => '优惠抵扣',
|
||||
'Refund_amount' => '退款金额',
|
||||
'Real_amount' => '实际收款',
|
||||
|
|
|
|||
|
|
@ -65,8 +65,8 @@ return [
|
|||
'Order.admin_id' => '录单员ID',
|
||||
'Order.coupon_id' => '优惠码id',
|
||||
'Order.total' => '总收款',
|
||||
'Order.online_amount' => '线上收款',
|
||||
'Order.offline_amount' => '线下收款',
|
||||
'Order.online_amount' => '线上预付',
|
||||
'Order.offline_amount' => '线下尾款',
|
||||
'Order.discount_amount' => '优惠抵扣',
|
||||
'Order.refund_amount' => '退款金额',
|
||||
'Order.real_amount' => '实际收款',
|
||||
|
|
|
|||
|
|
@ -65,8 +65,8 @@ return [
|
|||
'Order.admin_id' => '录单员ID',
|
||||
'Order.coupon_id' => '优惠码id',
|
||||
'Order.total' => '总收款',
|
||||
'Order.online_amount' => '线上收款',
|
||||
'Order.offline_amount' => '线下收款',
|
||||
'Order.online_amount' => '线上预付',
|
||||
'Order.offline_amount' => '线下尾款',
|
||||
'Order.discount_amount' => '优惠抵扣',
|
||||
'Order.refund_amount' => '退款金额',
|
||||
'Order.real_amount' => '实际收款',
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ return [
|
|||
'Amount' => '收款金额',
|
||||
'Income_type' => '收款方式',
|
||||
'Income_type 1' => '平台收款',
|
||||
'Income_type 2' => '线下收款',
|
||||
'Income_type 2' => '线下尾款',
|
||||
'Admin_id' => '创建人ID',
|
||||
'Admin_user' => '创建人',
|
||||
'Payment_time' => '收款时间',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,16 @@
|
|||
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
|
||||
|
||||
|
||||
{notempty name='row.audit_remark'}
|
||||
<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>
|
||||
</div>
|
||||
{/notempty}
|
||||
|
||||
|
||||
<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">
|
||||
|
|
@ -38,10 +49,17 @@
|
|||
</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" readonly class="form-control" step="0.01" name="row[online_amount_last]" 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" 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" name="row[offline_amount]" type="number" value="{$row.offline_amount|htmlentities}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -66,18 +84,6 @@
|
|||
</div>
|
||||
-->
|
||||
|
||||
{notempty name='row.audit_admin_id'}
|
||||
|
||||
<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">
|
||||
<input id="c-Audit_remark" readonly class="form-control" type="text" value="{$row.audit_remark|htmlentities}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/notempty}
|
||||
|
||||
|
||||
<div class="form-group layer-footer">
|
||||
<label class="control-label col-xs-12 col-sm-2"></label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<p><strong>订单详情:</strong> {$row.detail}</p>
|
||||
<p><strong>订单备注:</strong> {$row.remark}</p>
|
||||
<!-- <p><strong>收款方式:</strong> {$row.receive_type == 1 ? '定金':'全款'}</p>-->
|
||||
<!-- <p><strong>线上收款:</strong> {$row.online_amount}</p>-->
|
||||
<!-- <p><strong>线上预付:</strong> {$row.online_amount}</p>-->
|
||||
</div>
|
||||
<form id="add-form" class="form-horizontal col-xs-12" role="form" data-toggle="validator" method="POST" action="">
|
||||
<div class="form-group">
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<p><strong>订单详情:</strong> {$row.detail}</p>
|
||||
<p><strong>订单备注:</strong> {$row.remark}</p>
|
||||
<!-- <p><strong>收款方式:</strong> {$row.receive_type == 1 ? '定金':'全款'}</p>-->
|
||||
<!-- <p><strong>线上收款:</strong> {$row.online_amount}</p>-->
|
||||
<!-- <p><strong>线上预付:</strong> {$row.online_amount}</p>-->
|
||||
</div>
|
||||
<form id="add-form" class="form-horizontal col-xs-12" role="form" data-toggle="validator" method="POST" action="">
|
||||
<div class="form-group">
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
|
||||
|
||||
<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">
|
||||
<input readonly type="text" class="form-control" value="{$order.online_amount|htmlentities}">
|
||||
</div>
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
{if $row['is_receipt']==0 }
|
||||
|
||||
<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">
|
||||
<input readonly class="form-control" name="row[total]" type="text" value="无需收款">
|
||||
</div>
|
||||
|
|
@ -98,9 +98,9 @@
|
|||
|
||||
{if $row['is_receipt']==1 }
|
||||
<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">
|
||||
<input id="c-total" data-rule="required" placeholder="请输入线下收款金额" class="form-control" name="row[total]" type="number" min="0" value="{$row.total|htmlentities}">
|
||||
<input id="c-total" data-rule="required" placeholder="请输入线下尾款金额" class="form-control" name="row[total]" type="number" min="0" value="{$row.total|htmlentities}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|||
// {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
|
||||
{field: 'admin_id', title: __('Admin_id')},
|
||||
{field: 'online_amount', title: __('Online_amount'), operate:false},
|
||||
{field: 'online_amount_last', title: __('Online_amount_last'), operate:false},
|
||||
{field: 'offline_amount', title: __('Offline_amount'), operate:false},
|
||||
{field: 'total', title: __('Total'), operate:'BETWEEN'},
|
||||
{field: 'discount_amount', title: __('Discount_amount'), operate:false},
|
||||
|
|
|
|||
|
|
@ -43,16 +43,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|||
{field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'},
|
||||
// {field: 'source', title: __('Source')},
|
||||
// {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'},
|
||||
{field: 'item_title', title: __('Item_title'), operate: 'LIKE'},
|
||||
{field: 'item_title', title: __('Item_title'), operate: false},
|
||||
|
||||
{field: 'total', title: __('Total'), operate:'BETWEEN'},
|
||||
{field: 'online_amount', title: __('Online_amount'), operate:'BETWEEN'},
|
||||
{field: 'offline_amount', title: __('Offline_amount'), operate:'BETWEEN'},
|
||||
{field: 'online_amount', title: __('Online_amount'), operate:false},
|
||||
{field: 'online_amount_last', title: __('Online_amount_last'), operate:false},
|
||||
{field: 'offline_amount', title: __('Offline_amount'), operate:false},
|
||||
|
||||
{field: 'refund_amount', title: __('Refund_amount'), operate:'BETWEEN'},
|
||||
{field: 'real_amount', title: __('Real_amount'), operate:'BETWEEN'},
|
||||
{field: 'cost', title: __('Cost'), operate:'BETWEEN'},
|
||||
{field: 'performance', title: __('Performance'), operate:'BETWEEN'},
|
||||
{field: 'refund_amount', title: __('Refund_amount'), operate:false},
|
||||
{field: 'real_amount', title: __('Real_amount'), operate:false},
|
||||
{field: 'cost', title: __('Cost'), operate:false},
|
||||
{field: 'performance', title: __('Performance'), operate:false},
|
||||
|
||||
// {field: 'dispatch_type', title: __('Dispatch_type')},
|
||||
{field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user