Commit 27af59a3 authored by wxl's avatar wxl

no message

parent 746a0133
...@@ -564,12 +564,12 @@ class GoodsController extends AbstractActionController ...@@ -564,12 +564,12 @@ class GoodsController extends AbstractActionController
$arr['goodsPrice']=$val->getGoodsPrice(); $arr['goodsPrice']=$val->getGoodsPrice();
$arr['goodsRecommendPrice']=$val->getGoodsRecommendPrice(); $arr['goodsRecommendPrice']=$val->getGoodsRecommendPrice();
$arr['goodsSpec']=$val->getGoodsSpec(); $arr['goodsSpec']=$val->getGoodsSpec();
$arr['goodsCategoryName']=$val->getGoodsCategory()->getGoodsCategoryName(); $arr['goodsCategoryName']=$val->getGoodsCategory()?$val->getGoodsCategory()->getGoodsCategoryName():'';
$arr['brandName']=$val->getBrand()->getBrandName(); $arr['brandName']=$val->getBrand()?$val->getBrand()->getBrandName():'';
array_push($list,$arr); array_push($list,$arr);
} }
$columns=['goodsId','goodsName','goodsStock','goodsPrice','goodsRecommendPrice','goodsSpec','goodsCategoryName','brandName']; $columns=['goodsId','goodsName','goodsStock','goodsPrice','goodsRecommendPrice','goodsSpec','goodsCategoryName','brandName'];
$columns_CH="ID,商品名称,库存,采购价,建议售价,规格,分类,品牌"; $columns_CH="ID,商品名称,库存,采购价格,建议售价,商品规格,商品分类,商品品牌";
$this->goodsManager->export_excel($list,$columns,'商品导出',explode(",", $columns_CH)); $this->goodsManager->export_excel($list,$columns,'商品导出',explode(",", $columns_CH));
exit; exit;
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment