|
|
@@ -317,8 +317,12 @@ class Project extends Base
|
|
|
}
|
|
|
$value['good_name'] = isset($good['good_name'])?$good['good_name']:"";
|
|
|
$value['brand_id'] = isset($good['brand_id'])?$good['brand_id']:"";
|
|
|
- $value['specinfo'] = isset($good['specinfo'])?$good['specinfo']:"";
|
|
|
+ $brand = Db::name("brand")->where(['id'=>$value["brand_id"]])->find();
|
|
|
+ $value['brand_name'] =isset($brand['brand_name']) ? $brand['brand_name']:"";
|
|
|
+ $value['specinfo'] = isset($good['specinfo'])?json_decode($good['specinfo'],true):"";
|
|
|
$value['unit_id'] = isset($good['unit_id'])?$good['unit_id']:"";
|
|
|
+ $unit = Db::name("unit")->where(['id'=>$value["unit_id"]])->find();
|
|
|
+ $value["unit_name"]=isset($unit['unit'])?$unit['unit']:"";
|
|
|
$value['cost_desc'] = isset($good['cost_desc'])?$good['cost_desc']:"";
|
|
|
$value['work_day'] = isset($good['work_day'])?$good['work_day']:"";
|
|
|
$value['good_img'] = isset($good['good_img'])?$good['good_img']:"";
|
