diff --git a/admin/controllers/items/Cost.php b/admin/controllers/items/Cost.php index 9378256a..6d355fcc 100644 --- a/admin/controllers/items/Cost.php +++ b/admin/controllers/items/Cost.php @@ -556,7 +556,7 @@ class Cost extends HD_Controller{ 'order_time' => '订单日期', 'price_floor' => '商务政策低价', // 商务政策销售价 - 'profix_car_1' => '直营店分润', + 'profix_car_1' => '品牌店分润', 'profix_car_1_not' => '渠道分润', 'company_name' => '车辆归属', // 进货地(车辆归属) diff --git a/admin/views/auto/business/get.php b/admin/views/auto/business/get.php index 82dcc11f..d94afeb5 100644 --- a/admin/views/auto/business/get.php +++ b/admin/views/auto/business/get.php @@ -10,7 +10,7 @@ -
+
@@ -153,7 +153,7 @@ var vue_obj; $(function(){ vue_obj = new Vue({ - el: '#vue-edit', + el: '#vue-edit-business', data: { info:{'brand_id':'','s_id':'','v_id':''}, statusAry:[], diff --git a/admin/views/items/cost/get.php b/admin/views/items/cost/get.php index a4114f66..4d3f0bc0 100644 --- a/admin/views/items/cost/get.php +++ b/admin/views/items/cost/get.php @@ -79,7 +79,11 @@
- +
@@ -155,12 +159,7 @@
- - + 商务政策
@@ -527,7 +526,7 @@
- +
diff --git a/common/models/items/Items_cost_model.php b/common/models/items/Items_cost_model.php index 307f9b30..d8213ee6 100644 --- a/common/models/items/Items_cost_model.php +++ b/common/models/items/Items_cost_model.php @@ -63,9 +63,9 @@ class Items_cost_model extends HD_Model //【单车总毛利】(整车采购毛利+水平业务总毛利) $car_price = $car_profit_price + $srv_price; - //【直营店单车毛利/代理店单车毛利/合伙店采购毛利】(根据门店类型取, 商务政策分润 - 选装金额 - 选装工时费 - 促销成本 + 水平业务总毛利 + (实际售价入 - 商务政策底价)) + //【品牌店单车毛利/代理店单车毛利/合伙店采购毛利】(根据门店类型取, 商务政策分润 - 选装金额 - 选装工时费 - 促销成本 + 水平业务总毛利 + (实际售价入 - 商务政策底价)) $dl_car_price = $srv_json['profix_car']-$cost_json['select_price']-$cost_json['labor_price'] - $promotion_price + $srv_price + ($row['price']-$srv_json['price_floor']); - //【品牌单车总毛利】(单车总毛利 - 直营店单车毛利/代理店单车毛利/合伙店采购毛利) + //【品牌单车总毛利】(单车总毛利 - 品牌店单车毛利/代理店单车毛利/合伙店采购毛利) $brand_car_price = $car_price - $dl_car_price; $data = [ 'sale_price' => $sale_price,