diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php index e901e14..28da150 100644 --- a/application/admin/controller/orders/Configorder.php +++ b/application/admin/controller/orders/Configorder.php @@ -130,13 +130,16 @@ class Configorder extends Backend 'cost' => $params['cost'], 'offline_amount_type'=> $params['offline_amount_type'], 'amount_images' => $params['amount_images'], + 'material_cost' => $params['material_cost'] ]; $last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2); + $cost = bcadd($params['cost'],$params['material_cost'],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); + $data['performance'] = bcsub($data['real_amount'],$cost,2); $result = $row->allowField(true)->save($data); //日志 diff --git a/application/admin/lang/zh-cn/order.php b/application/admin/lang/zh-cn/order.php index acac87c..8b92b5f 100644 --- a/application/admin/lang/zh-cn/order.php +++ b/application/admin/lang/zh-cn/order.php @@ -50,6 +50,7 @@ return [ 'Performance' => '利润', 'Sb_amount' => '垫付', 'Real_amount' => '实付', + 'Material_cost' => '材料成本', 'Cancel_reason_id' => '取消原因', 'Cancel_detail' => '取消详情', 'Abolish_reason_id' => '作废原因', diff --git a/application/admin/lang/zh-cn/orders/dispatch2.php b/application/admin/lang/zh-cn/orders/dispatch2.php index 6e51aa0..99d8bfa 100644 --- a/application/admin/lang/zh-cn/orders/dispatch2.php +++ b/application/admin/lang/zh-cn/orders/dispatch2.php @@ -30,6 +30,7 @@ return [ 'Total' => '线下尾款', 'Online' => '线上尾款', 'Amount' => '预计佣金', + 'Material_cost' => '材料成本', 'Offline_total_type' => '线下尾款类型', 'Offline_total_type 0' => '无', 'Offline_total_type 1' => '师傅收', diff --git a/application/admin/view/orders/auditorder/edit.html b/application/admin/view/orders/auditorder/edit.html index 5bf96d4..0178695 100644 --- a/application/admin/view/orders/auditorder/edit.html +++ b/application/admin/view/orders/auditorder/edit.html @@ -135,6 +135,14 @@ + +
+ +
+ +
+
+
diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html index ec04046..d9ab802 100644 --- a/application/admin/view/orders/configorder/edit.html +++ b/application/admin/view/orders/configorder/edit.html @@ -97,6 +97,15 @@
+
+ +
+ +
+
+ + + {/if} @@ -149,6 +158,14 @@ + +
+ +
+ +
+
+ {/if} diff --git a/public/assets/js/backend/orders/auditorder.js b/public/assets/js/backend/orders/auditorder.js index c065fb2..3f0b050 100644 --- a/public/assets/js/backend/orders/auditorder.js +++ b/public/assets/js/backend/orders/auditorder.js @@ -82,6 +82,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'real_amount', title: __('Real_amount'), operate:false}, {field: 'refund_amount', title: __('Refund_amount'), operate:false}, {field: 'cost', title: __('Cost'), operate:false}, + {field: 'material_cost', title: __('材料成本'), operate:false}, {field: 'performance', title: __('Performance'), operate:false}, // {field: 'cancel_reason_id', title: __('Cancel_reason_id')}, //{field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, diff --git a/public/assets/js/backend/orders/configorder.js b/public/assets/js/backend/orders/configorder.js index 29b5285..cfecc17 100644 --- a/public/assets/js/backend/orders/configorder.js +++ b/public/assets/js/backend/orders/configorder.js @@ -59,6 +59,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'refund_amount', title: __('Refund_amount'), operate:false}, {field: 'real_amount', title: __('Real_amount'), operate:false}, {field: 'cost', title: __('Cost'), operate:false}, + {field: 'material_cost', title: __('材料成本'), operate:false}, {field: 'performance', title: __('Performance'), operate:false}, // {field: 'dispatch_type', title: __('Dispatch_type')},