|
|
@@ -6,6 +6,7 @@ namespace app\admin\controller;
|
|
|
use app\admin\model\CgdInfo;use app\admin\model\InvoicePool;use app\admin\model\Pay;use app\admin\model\TradePool;use think\App;
|
|
|
use think\facade\Db;use think\facade\Validate;
|
|
|
class Sale extends Base{
|
|
|
+ #public $novalidate=["*"];
|
|
|
public function __construct(App $app) {parent::__construct($app);}
|
|
|
/** 获取列表
|
|
|
* @return \think\response\Json|void
|
|
|
@@ -422,7 +423,7 @@ class Sale extends Base{
|
|
|
$data[]=$temp;
|
|
|
}
|
|
|
if(isset($asscoinfo[2])){
|
|
|
- $uname = TradePool::where('invNo',$asscoinfo[1])->value('apply_name','');
|
|
|
+ $uname = TradePool::where('logNo',$asscoinfo[2])->value('apply_name','');
|
|
|
$temp=['type'=>'结算销售单资金认领','username'=> $uname,'orderCode'=>$asscoinfo[2],'companyName'=>$item['companyName']];
|
|
|
$data[]=$temp;
|
|
|
}
|
|
|
@@ -551,6 +552,6 @@ class Sale extends Base{
|
|
|
}
|
|
|
|
|
|
|
|
|
- empty($data)?$this->success("不存在对账订单",[],0):$this->error("存在对账业务数据",1005,$data);
|
|
|
+ empty($data)?$this->success("不存在对账订单"):$this->error("存在对账业务数据",1005,$data);
|
|
|
}
|
|
|
}
|
