diff --git a/app/adminapi/lists/contract/ProcurementContractLists.php b/app/adminapi/lists/contract/ProcurementContractLists.php index 7e02f21f0..e2688d0d4 100644 --- a/app/adminapi/lists/contract/ProcurementContractLists.php +++ b/app/adminapi/lists/contract/ProcurementContractLists.php @@ -72,7 +72,6 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch ->select()->each(function($item, $key){ //关联数据 供应商后续添加 $item['supplier_name'] = '供应商名称'; - $item['contract_type'] = '1'; $item['approve_no'] = '付款单号'; $item['approve_step'] = '流程步骤'; $item['approve_settle_status'] = 1; diff --git a/app/adminapi/lists/contract/SubcontractingContractLists.php b/app/adminapi/lists/contract/SubcontractingContractLists.php index dc3452399..f0459394f 100644 --- a/app/adminapi/lists/contract/SubcontractingContractLists.php +++ b/app/adminapi/lists/contract/SubcontractingContractLists.php @@ -74,7 +74,6 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea ->select()->each(function($item, $key){ //关联数据 供应商后续添加 $item['supplier_name'] = '供应商名称'; - $item['contract_type'] = '1'; $item['approve_no'] = '付款单号'; $item['approve_step'] = '流程步骤'; $item['approve_settle_status'] = 1; diff --git a/app/adminapi/logic/contract/SubcontractingContractLogic.php b/app/adminapi/logic/contract/SubcontractingContractLogic.php index 68b7730b2..68a596ecc 100644 --- a/app/adminapi/logic/contract/SubcontractingContractLogic.php +++ b/app/adminapi/logic/contract/SubcontractingContractLogic.php @@ -165,7 +165,7 @@ class SubcontractingContractLogic extends BaseLogic public static function detail($params): array { $subcontractingContract = ProcurementContract::findOrEmpty($params['id']); - $procurementContract->supplier = null; + $subcontractingContract->supplier = null; $subcontractingContract->custom = null; if (!empty($subcontractingContract->project->custom_id)) { $subcontractingContract->custom = Custom::findOrEmpty($subcontractingContract->project->custom_id); diff --git a/app/common/model/contract/ProcurementContract.php b/app/common/model/contract/ProcurementContract.php index add84bae9..e40680ffc 100644 --- a/app/common/model/contract/ProcurementContract.php +++ b/app/common/model/contract/ProcurementContract.php @@ -39,6 +39,11 @@ class ProcurementContract extends BaseModel { return $this->hasMany(\app\common\model\contract\ProcurementContractDetail::class, 'procurement_contract_id', 'id'); } + + public function work() + { + return $this->hasMany(\app\common\model\contract\SubcontractingContractDetail::class, 'subcontracting_contract_id', 'id'); + } public function getSigningDateAttr($value) {