diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php index fb193dd..54b54d3 100644 --- a/application/admin/controller/orders/Configorder.php +++ b/application/admin/controller/orders/Configorder.php @@ -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; diff --git a/application/admin/lang/en/orders/income.php b/application/admin/lang/en/orders/income.php index 2b58ba9..13dfad4 100644 --- a/application/admin/lang/en/orders/income.php +++ b/application/admin/lang/en/orders/income.php @@ -13,7 +13,7 @@ return [ 'Amount' => '收款金额', 'Income_type' => '收款方式', 'Income_type 1' => '平台收款', - 'Income_type 2' => '线下收款', + 'Income_type 2' => '线下尾款', 'Admin_id' => '创建人ID', 'Admin_user' => '创建人', 'Payment_time' => '收款时间', diff --git a/application/admin/lang/zh-cn/orders/auditorder.php b/application/admin/lang/zh-cn/orders/auditorder.php index 8cb14e3..c23df85 100644 --- a/application/admin/lang/zh-cn/orders/auditorder.php +++ b/application/admin/lang/zh-cn/orders/auditorder.php @@ -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' => '退款金额', diff --git a/application/admin/lang/zh-cn/orders/configorder.php b/application/admin/lang/zh-cn/orders/configorder.php index 80e83dc..c565930 100644 --- a/application/admin/lang/zh-cn/orders/configorder.php +++ b/application/admin/lang/zh-cn/orders/configorder.php @@ -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' => '实际收款', diff --git a/application/admin/lang/zh-cn/orders/dispatch.php b/application/admin/lang/zh-cn/orders/dispatch.php index 17e3b46..7e30552 100644 --- a/application/admin/lang/zh-cn/orders/dispatch.php +++ b/application/admin/lang/zh-cn/orders/dispatch.php @@ -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' => '实际收款', diff --git a/application/admin/lang/zh-cn/orders/dispatch2.php b/application/admin/lang/zh-cn/orders/dispatch2.php index 5d96287..dd75a8c 100644 --- a/application/admin/lang/zh-cn/orders/dispatch2.php +++ b/application/admin/lang/zh-cn/orders/dispatch2.php @@ -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' => '实际收款', diff --git a/application/admin/lang/zh-cn/orders/income.php b/application/admin/lang/zh-cn/orders/income.php index ffaca18..1731c83 100644 --- a/application/admin/lang/zh-cn/orders/income.php +++ b/application/admin/lang/zh-cn/orders/income.php @@ -19,7 +19,7 @@ return [ 'Amount' => '收款金额', 'Income_type' => '收款方式', 'Income_type 1' => '平台收款', - 'Income_type 2' => '线下收款', + 'Income_type 2' => '线下尾款', 'Admin_id' => '创建人ID', 'Admin_user' => '创建人', 'Payment_time' => '收款时间', diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html index f364e58..a063836 100644 --- a/application/admin/view/orders/configorder/edit.html +++ b/application/admin/view/orders/configorder/edit.html @@ -1,5 +1,16 @@
+ + {notempty name='row.audit_remark'} +
+ +
+
{$row.audit_remark|htmlentities}
+
+
+ {/notempty} + +
@@ -38,10 +49,17 @@
+
+ +
+ +
+
+
- +
@@ -66,18 +84,6 @@ --> - {notempty name='row.audit_admin_id'} - -
- -
- -
-
- - {/notempty} - -
diff --git a/application/admin/view/orders/dispatch/add.html b/application/admin/view/orders/dispatch/add.html index 47b59d9..0198677 100644 --- a/application/admin/view/orders/dispatch/add.html +++ b/application/admin/view/orders/dispatch/add.html @@ -13,7 +13,7 @@

订单详情: {$row.detail}

订单备注: {$row.remark}

- +
diff --git a/application/admin/view/orders/dispatch2/add.html b/application/admin/view/orders/dispatch2/add.html index 47b59d9..0198677 100644 --- a/application/admin/view/orders/dispatch2/add.html +++ b/application/admin/view/orders/dispatch2/add.html @@ -13,7 +13,7 @@

订单详情: {$row.detail}

订单备注: {$row.remark}

- +
diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html index f402e54..232dc7e 100644 --- a/application/admin/view/orders/dispatch2/edit.html +++ b/application/admin/view/orders/dispatch2/edit.html @@ -79,7 +79,7 @@
- +
@@ -88,7 +88,7 @@ {if $row['is_receipt']==0 }
- +
@@ -98,9 +98,9 @@ {if $row['is_receipt']==1 }
- +
- +
diff --git a/public/assets/js/backend/orders/auditorder.js b/public/assets/js/backend/orders/auditorder.js index d8fd511..3ca18b4 100644 --- a/public/assets/js/backend/orders/auditorder.js +++ b/public/assets/js/backend/orders/auditorder.js @@ -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}, diff --git a/public/assets/js/backend/orders/configorder.js b/public/assets/js/backend/orders/configorder.js index 4b740b7..991e878 100644 --- a/public/assets/js/backend/orders/configorder.js +++ b/public/assets/js/backend/orders/configorder.js @@ -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},