diff --git a/admin/controllers/biz/Seprice.php b/admin/controllers/biz/Seprice.php index 7b0f9c3f..96434782 100644 --- a/admin/controllers/biz/Seprice.php +++ b/admin/controllers/biz/Seprice.php @@ -83,16 +83,19 @@ class Seprice extends HD_Controller } $biz_id = $biz_row['id']; $biz_info_row = $this->biz_info_model->get(['biz_id'=>$biz_id]); + $jsondata = json_decode($biz_info_row['jsondata'],true); $info['money_json'] = [ 'rent' => $biz_info_row['rent'] ? $biz_info_row['rent'] : '', 'base_manager' => $biz_info_row['manager_wage'] ? $biz_info_row['manager_wage'] : '', - 'base_employees' => 0, + 'employee_wage' => $biz_info_row['employee_wage'] ? $biz_info_row['employee_wage'] : '', 'wat_ele' => $biz_info_row['wat_ele'] ? $biz_info_row['wat_ele'] : '', 'media' => $biz_info_row['margin'] ? $biz_info_row['margin'] : '', - 'marketing' => '', - 'drive' => '', 'commission' => $biz_info_row['commission'] ? $biz_info_row['commission'] : '', - 'trucking' => '' + 'num' => $biz_info_row['num'], + 'trucking' => '', + 'drive' => $jsondata['car_rent'] ? $jsondata['car_rent'] : '', + 'marketing' => $jsondata['marketing'] ? $jsondata['marketing'] : '', + 'door_step' => $jsondata['door_step'] ? $jsondata['door_step'] : '', ]; $info['year'] = date('Y'); $info['month'] = intval(date('m')); diff --git a/admin/controllers/biz/Settle.php b/admin/controllers/biz/Settle.php index 595e1991..c2412e4b 100644 --- a/admin/controllers/biz/Settle.php +++ b/admin/controllers/biz/Settle.php @@ -389,6 +389,7 @@ class Settle extends HD_Controller $temp['price_ml'] = $v['price_total'] - $temp['total_need']; $temp['profix_partner'] = $v['profix_partner'] + $v['profix_partner_oflow']; $temp['money_json'] = json_decode($v['money_json'],true); + $temp['price_all_after'] = sprintf("%.2f",$v['price_all']/1.13); $lists[] = $temp; } } diff --git a/admin/controllers/biz/Srv.php b/admin/controllers/biz/Srv.php index b15e52d7..be69cc0d 100644 --- a/admin/controllers/biz/Srv.php +++ b/admin/controllers/biz/Srv.php @@ -71,6 +71,8 @@ class Srv extends HD_Controller{ public function get(){ $biz_id = $_SESSION['srv_biz_id']; $id = $this->input->get('id'); + $type = $this->input->get('type'); + !$type && $type = 1; if(!$biz_id){ return $this->show_json(SYS_CODE_FAIL,'参数错误'); } @@ -78,7 +80,7 @@ class Srv extends HD_Controller{ $finances = $this->sys_finance_model->select(['status' => 1], '', 0, 0, 'id,title'); $info = [ 'biz_id' => $biz_id, - 'type' => 1, + 'type' => $type, 'is_def' => 0, 's_effect_time' => date('Y-m-d'), 'action' => 'biz/srv/add', @@ -127,6 +129,9 @@ class Srv extends HD_Controller{ $jsondata['rebate'] = $info['jsondata']['rebate']; $jsondata['finance_id'] = $info['jsondata']['finance_id']; $jsondata['finance_num'] = $info['jsondata']['finance_num']; + $finance = $this->sys_finance_model->get(['id'=>intval($jsondata['finance_id'])],'title'); + $jsondata['finance_title'] = $finance['title']; + $data['title'] = $jsondata['finance_title']; } //只能有一条默认 if($info['is_def']){ diff --git a/admin/controllers/biz/store/Store.php b/admin/controllers/biz/store/Store.php index 09b957ac..8fd8aa21 100755 --- a/admin/controllers/biz/store/Store.php +++ b/admin/controllers/biz/store/Store.php @@ -1035,6 +1035,7 @@ class Store extends HD_Controller $this->biz_info_model->add(['biz_id' => $biz_id, 'c_time' => time()]); $base_info = $this->biz_info_model->get(['biz_id' => $biz_id]); } + $jsondata = json_decode($base_info['jsondata'],true); $info = [ 'id' => $base_info['id'], 'biz_id' => $base_info['biz_id'], @@ -1053,6 +1054,9 @@ class Store extends HD_Controller 'type' => $base_info['type'], 'rate' => strlen($base_info['rate']) ? $base_info['rate'] : 0, 'biz_type' => $biz['type'], + 'car_rent' => $jsondata['car_rent'] ? $jsondata['car_rent'] : '', + 'marketing' => $jsondata['marketing'] ? $jsondata['marketing'] : '', + 'door_step' => $jsondata['door_step'] ? $jsondata['door_step'] : '', ]; $brands = []; $b_rows = $this->biz_trucking_model->select(['biz_id' => $base_info['biz_id'], 'status' => 1], '', '', '', 'auto_b_id,money'); @@ -1080,13 +1084,14 @@ class Store extends HD_Controller { $info = $this->input->post('info'); $brands = $this->input->post('brands'); - - if (!$this->biz_info_model->get(['id' => $info['id']])) { + $row = $this->biz_info_model->get(['id' => $info['id']]); + if (!$row) { return $this->show_json(SYS_CODE_FAIL, '错数错误！'); } if ($info['rate'] < 0 || $info['rate'] > 100) { return $this->show_json(SYS_CODE_FAIL, '分佣比例请填写0~100'); } + $jsondata = json_decode($row['jsondata'],true); $up_data = [ 'name' => $info['name'], 'mobile' => $info['mobile'], @@ -1103,6 +1108,10 @@ class Store extends HD_Controller 'rate' => $info['rate'], 'num' => $info['num'] ]; + $jsondata['car_rent'] = $info['car_rent'] ? $info['car_rent'] : ''; + $jsondata['marketing'] = $info['marketing'] ? $info['marketing'] : ''; + $jsondata['door_step'] = $info['door_step'] ? $info['door_step'] : ''; + $up_data['jsondata'] = json_encode($jsondata,JSON_UNESCAPED_UNICODE); $this->biz_info_model->update($up_data, ['id' => $info['id']]); $b_ids = array_column($brands, 'id'); if ($b_ids) { diff --git a/admin/views/biz/seprice/get.php b/admin/views/biz/seprice/get.php index 558f8c6e..d26f3dcf 100644 --- a/admin/views/biz/seprice/get.php +++ b/admin/views/biz/seprice/get.php @@ -18,12 +18,6 @@ -
- -
- -
-
@@ -31,15 +25,15 @@
- +
- +
- +
- +
@@ -52,19 +46,22 @@
-
- +
+
-
- 新增 - 销售薪资总和:{{info.money_json.base_employees}} -
-
- - 删除 -
+ +
+
+
+ +
+ +
+
+
+ +
+
diff --git a/admin/views/biz/settle/lists_static_brand.php b/admin/views/biz/settle/lists_static_brand.php index 1fef2f01..f091b67c 100644 --- a/admin/views/biz/settle/lists_static_brand.php +++ b/admin/views/biz/settle/lists_static_brand.php @@ -36,14 +36,15 @@ ID - 门店 - 单车总毛利 - 税后单车总毛利 - 水平业务总毛利 - 门店费用 - 其它费用 - 总利润 - 分润 + 门店 + 单车总毛利 + 税后单车总毛利 + 水平业务总毛利 + 税后水平业务总毛利 + 门店费用 + 其它费用 + 总利润 + 分润 时间 @@ -57,6 +58,7 @@ {{v.profix_car}} {{v.profix_car_after}} {{v.price_all}} + {{v.price_all_after}}