0302

app/admin/controller/Good.php

@@ -144,6 +144,7 @@ class Good extends \app\BaseController
             $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
             $value['company'] = isset($company['company'])?$company['company']:"";
             $value['stock_total'] = Db::name("good_stock")->where(['spuCode'=>$value['spuCode'],"is_del"=>0])->sum("usable_stock");
+            $value['status']=$value['exam_status'];
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);

app/admin/controller/Goodup.php

@@ -79,7 +79,7 @@ class Goodup extends BaseController
                 $value['company'] = isset($company['company'])?$company['company']:"";
                 $supplier = Db::name("supplier")->where(['code'=>$value['supplierNo']])->find();
                 $value['supplier_name']=isset($supplier['name'])?$supplier['name']:"";
-                $value['status']=$value['exam_status'];
+//                $value['status']=$value['exam_status'];
                 $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);