|
@@ -1376,6 +1376,13 @@ class Sale extends Base
|
|
|
$supplier = Db::name("customer_info")->where(["companyNo" => $value['customer_code']])->find();
|
|
|
$value['customerName'] = isset($supplier['companyName']) ? $supplier['companyName'] : "";
|
|
|
}
|
|
|
+ $value['useage']="";
|
|
|
+ if($value['use_order']!=0){
|
|
|
+ $use =Db::name("order_use")->where(["id"=>$value['use_order']])->find();
|
|
|
+ $value['useage'] = isset($use['order_use']) ?$use['order_use']:"";
|
|
|
+ }else{
|
|
|
+ $value['use_order']='';
|
|
|
+ }
|
|
|
$data[] = $value;
|
|
|
}
|
|
|
return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);
|
|
@@ -1625,6 +1632,8 @@ class Sale extends Base
|
|
|
if($einfo['use_order']!=0){
|
|
|
$use =Db::name("order_use")->where(["id"=>$einfo['use_order']])->find();
|
|
|
$einfo['useage'] = isset($use['order_use']) ?$use['order_use']:"";
|
|
|
+ }else{
|
|
|
+ $einfo['use_order']='';
|
|
|
}
|
|
|
$einfo['companyName'] = isset($in['companyName']) ? $in['companyName'] : "";
|
|
|
$einfo['addrs'] = $addrs;
|