更新合同
This commit is contained in:
parent
b8a929560b
commit
31d49064d8
@ -18,7 +18,7 @@ namespace app\adminapi\lists\contract;
|
||||
use app\adminapi\lists\BaseAdminDataLists;
|
||||
use app\common\model\contract\ProcurementContract;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
|
||||
use think\facade\Db;
|
||||
|
||||
/**
|
||||
* 采购合同列表
|
||||
@ -63,11 +63,21 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
|
||||
*/
|
||||
public function lists(): array
|
||||
{
|
||||
return ProcurementContract::where($this->searchWhere)->where($this->querySearch())
|
||||
->field(['*'])
|
||||
return Db::name('ProcurementContract')->alias('pc')
|
||||
->where($this->searchWhere)->where($this->querySearch())
|
||||
->leftJoin('project p','p.id = pc.project_id')
|
||||
->field('pc.*, p.name as project_name')
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['id' => 'desc'])
|
||||
->select()
|
||||
->order(['pc.id' => 'desc'])
|
||||
->select()->each(function($item, $key){
|
||||
//关联数据 供应商后续添加
|
||||
$item['supplier_name'] = '供应商名称';
|
||||
$item['contract_type'] = '1';
|
||||
$item['approve_no'] = '付款单号';
|
||||
$item['approve_step'] = '流程步骤';
|
||||
$item['approve_settle_status'] = 1;
|
||||
return $item;
|
||||
})
|
||||
->toArray();
|
||||
}
|
||||
|
||||
|
@ -162,6 +162,7 @@ class ProcurementContractLogic extends BaseLogic
|
||||
public static function detail($params): array
|
||||
{
|
||||
$procurementContract = ProcurementContract::findOrEmpty($params['id']);
|
||||
$procurementContract->supplier = null;
|
||||
$procurementContract->custom = null;
|
||||
if (!empty($procurementContract->project->custom_id)) {
|
||||
$procurementContract->custom = Custom::findOrEmpty($procurementContract->project->custom_id);
|
||||
|
@ -165,6 +165,7 @@ class SubcontractingContractLogic extends BaseLogic
|
||||
public static function detail($params): array
|
||||
{
|
||||
$subcontractingContract = ProcurementContract::findOrEmpty($params['id']);
|
||||
$procurementContract->supplier = null;
|
||||
$subcontractingContract->custom = null;
|
||||
if (!empty($subcontractingContract->project->custom_id)) {
|
||||
$subcontractingContract->custom = Custom::findOrEmpty($subcontractingContract->project->custom_id);
|
||||
|
Loading…
x
Reference in New Issue
Block a user