diff --git a/admin/controllers/items/Cost.php b/admin/controllers/items/Cost.php index ad9b3a2e..9aaba34c 100644 --- a/admin/controllers/items/Cost.php +++ b/admin/controllers/items/Cost.php @@ -55,6 +55,7 @@ class Cost extends HD_Controller{ if ($params['vin']) { //$where["item_id in(select id from lc_items where vin like '%{$params['vin']}%')"] = null; + $params['vin'] = trim($params['vin']); $where_items = $where_items." and vin like '%{$params['vin']}%'"; } if ($where_items != $where_items_default){ @@ -446,6 +447,31 @@ class Cost extends HD_Controller{ $factory_price = floatval($objWorksheet->getCell('G' . $_row)->getValue()); //厂家补贴 $other_in_price = floatval($objWorksheet->getCell('H' . $_row)->getValue()); //其他收入 $other_out_price = floatval($objWorksheet->getCell('I' . $_row)->getValue()); //其他支出 + $business_product = $objWorksheet->getCell('J' . $_row)->getValue(); //保险公司 + $business_price = floatval($objWorksheet->getCell('K' . $_row)->getValue()); //商业险金额 + $business_fd = floatval($objWorksheet->getCell('L' . $_row)->getValue()); //商业险返点 + $business_ins_price = floatval($objWorksheet->getCell('M' . $_row)->getValue()); //商业险佣金 + $insurance_price = floatval($objWorksheet->getCell('N' . $_row)->getValue()); //交强险金额 + $insurance_fd = floatval($objWorksheet->getCell('O' . $_row)->getValue()); //交强险返点 + $insurance_ins_price = floatval($objWorksheet->getCell('P' . $_row)->getValue()); //交强险佣金 + $accident_price = floatval($objWorksheet->getCell('Q' . $_row)->getValue()); //意外险金额 + $accident_fd = floatval($objWorksheet->getCell('R' . $_row)->getValue()); //意外险返点 + $accident_ins_price = floatval($objWorksheet->getCell('S' . $_row)->getValue()); //意外险佣金 + $back_price = floatval($objWorksheet->getCell('T' . $_row)->getValue()); //客户退点金额 + $fee_carno = floatval($objWorksheet->getCell('U' . $_row)->getValue()); //挂牌收入 + $cb_fee_carno = floatval($objWorksheet->getCell('V' . $_row)->getValue()); //挂牌成本 + $loan_product = $objWorksheet->getCell('W' . $_row)->getValue(); //按揭银行 + $loan_num = floatval($objWorksheet->getCell('X' . $_row)->getValue()); //按揭期数 + $loan_price = floatval($objWorksheet->getCell('Y' . $_row)->getValue()); //按揭金额 + $loan_fd = floatval($objWorksheet->getCell('Z' . $_row)->getValue()); //按揭返点 + $loan_srv_price = floatval($objWorksheet->getCell('AA' . $_row)->getValue()); //按揭佣金 + $loan_srv = floatval($objWorksheet->getCell('AB' . $_row)->getValue()); //按揭手续费 + $loan_offset_price = floatval($objWorksheet->getCell('AC' . $_row)->getValue()); //解抵服务费 + $loan_subsidy_price = floatval($objWorksheet->getCell('AD' . $_row)->getValue()); //利息补贴收入 + $loan_in_price = floatval($objWorksheet->getCell('AE' . $_row)->getValue()); //其他收入金额 + $loan_out_price = floatval($objWorksheet->getCell('AF' . $_row)->getValue()); //其他支出金额 + $commission_price = floatval($objWorksheet->getCell('AG' . $_row)->getValue()); //利息补贴收入 + $res_item = 0; if ($item['buy_price'] != $buy_price){ $res_item = $this->items_model->update(array('buy_price'=>$buy_price),['id'=>$item['id']]); @@ -459,6 +485,30 @@ class Cost extends HD_Controller{ $srv_json['other_in_price'] = $other_in_price ? $other_in_price : 0; $srv_json['other_out_price'] = $other_out_price ? $other_out_price : 0; + $srv_json['business_product'] = $business_product ? $business_product : ''; + $srv_json['business_price'] = $business_price ? $business_price : 0; + $srv_json['business_fd'] = $business_fd ? $business_fd : 0; + $srv_json['business_ins_price'] = $business_ins_price ? $business_ins_price : 0; + $srv_json['insurance_price'] = $insurance_price ? $insurance_price : 0; + $srv_json['insurance_fd'] = $insurance_fd ? $insurance_fd : 0; + $srv_json['insurance_ins_price'] = $insurance_ins_price ? $insurance_ins_price : 0; + $srv_json['accident_price'] = $accident_price ? $accident_price : 0; + $srv_json['accident_fd'] = $accident_fd ? $accident_fd : 0; + $srv_json['accident_ins_price'] = $accident_ins_price ? $accident_ins_price : 0; + $srv_json['back_price'] = $back_price ? $back_price : 0; + $srv_json['fee_carno'] = $fee_carno ? $fee_carno : 0; + $srv_json['cb_fee_carno'] = $cb_fee_carno ? $cb_fee_carno : 0; + $srv_json['loan_product'] = $loan_product ? $loan_product : ''; + $srv_json['loan_num'] = $loan_num ? $loan_num : 0; + $srv_json['loan_price'] = $loan_price ? $loan_price : 0; + $srv_json['loan_fd'] = $loan_fd ? $loan_fd : 0; + $srv_json['loan_srv_price'] = $loan_srv_price ? $loan_srv_price : 0; + $srv_json['loan_srv'] = $loan_srv ? $loan_srv : 0; + $srv_json['loan_offset_price'] = $loan_offset_price ? $loan_offset_price : 0; + $srv_json['loan_subsidy_price'] = $loan_subsidy_price ? $loan_subsidy_price : 0; + $srv_json['loan_in_price'] = $loan_in_price ? $loan_in_price : 0; + $srv_json['loan_out_price'] = $loan_out_price ? $loan_out_price : 0; + $srv_json['commission_price'] = $commission_price ? $commission_price : 0; $data = [ 'cost_json' => json_encode($cost_json,JSON_UNESCAPED_UNICODE), diff --git a/admin/views/items/cost/get.php b/admin/views/items/cost/get.php index 16194516..f53c01b3 100644 --- a/admin/views/items/cost/get.php +++ b/admin/views/items/cost/get.php @@ -455,7 +455,7 @@