diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php index cfd42235..c39e67e8 100644 --- a/admin/controllers/items/goods/Goods.php +++ b/admin/controllers/items/goods/Goods.php @@ -9,7 +9,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class Goods extends HD_Controller { private $packAry = array(0 => '无', 1 => '是'); - private $statusAry = array(0 => '下架', 1 => '正常', 2 => '已售'); + private $statusAry = array(0 => '下架', 1 => '未售', 2 => '已售'); public function __construct() { @@ -307,9 +307,8 @@ class Goods extends HD_Controller $cor_id = $objWorksheet->getCell('D' . $_row)->getValue(); //车身颜色id $incor_id = $objWorksheet->getCell('E' . $_row)->getValue(); //内饰颜色id $stdard_num = $objWorksheet->getCell('G' . $_row)->getValue(); //合格证号 - $frame_num = $objWorksheet->getCell('H' . $_row)->getValue(); //车架号 - $pro_time = $objWorksheet->getCell('I' . $_row)->getValue(); //生产时间 - $ori_price = $objWorksheet->getCell('J' . $_row)->getValue(); //指导价 + $pro_time = $objWorksheet->getCell('H' . $_row)->getValue(); //生产时间 + $ori_price = $objWorksheet->getCell('I' . $_row)->getValue(); //平台价 $re_b = $this->mdAutoBrand->get(array('name' => $brand_id)); $brand_id = $re_b ? $re_b['id'] : 0; $re_s = $this->mdAutoSeries->get(array('brand_id' => $brand_id, 'name' => $s_id)); @@ -321,8 +320,18 @@ class Goods extends HD_Controller $re_a2 = $this->mdAutoAttr->get(array('s_id' => $s_id, 'type' => 2, 'title' => $incor_id)); $incor_id = $re_a2 ? $re_a2['id'] : 0; $pro_time = $pro_time ? gmdate("Y/m/d H:i:s", PHPExcel_Shared_Date::ExcelToPHP($pro_time)) : ''; - $addData = array('brand_id' => $brand_id, 's_id' => $s_id, 'v_id' => $v_id, 'cor_id' => $cor_id, 'incor_id' => $incor_id - , 'ori_price' => $ori_price, 'vin' => $vin, 'stdard_num' => $stdard_num, 'pro_time' => $pro_time, 'c_time' => time()); + $addData = array( + 'brand_id' => $brand_id, + 's_id' => $s_id, + 'v_id' => $v_id, + 'cor_id' => $cor_id, + 'incor_id' => $incor_id, + 'ori_price' => $ori_price, + 'vin' => $vin, + 'stdard_num' => $stdard_num, + 'pro_time' => $pro_time, + 'c_time' => time() + ); $id = $this->mdItems->add($addData); if ($id) { $j++; diff --git a/admin/views/auto/attr/edit.php b/admin/views/auto/attr/edit.php index 80e42f98..4ccf9e04 100755 --- a/admin/views/auto/attr/edit.php +++ b/admin/views/auto/attr/edit.php @@ -49,21 +49,6 @@ - -
diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php index 006b01c4..3bb3926b 100644 --- a/admin/views/items/goods/lists.php +++ b/admin/views/items/goods/lists.php @@ -75,7 +75,7 @@ 市场平台价 折扣% 采购成本 - 采购状态 + 车辆状态 diff --git a/www/admin/temp/goods.xlsx b/www/admin/temp/goods.xlsx index 50eb3e0a..09d06d22 100644 Binary files a/www/admin/temp/goods.xlsx and b/www/admin/temp/goods.xlsx differ