diff --git a/app/adminapi/lists/contract/SubcontractingContractLists.php b/app/adminapi/lists/contract/SubcontractingContractLists.php index 634e5f2f6..131f16902 100644 --- a/app/adminapi/lists/contract/SubcontractingContractLists.php +++ b/app/adminapi/lists/contract/SubcontractingContractLists.php @@ -69,7 +69,7 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea ->where($this->searchWhere)->where($this->querySearch()) ->whereNull('pc.delete_time') ->leftJoin('project p','p.id = pc.project_id') - ->field('pc.*, p.name as project_name') + ->field('pc.*, p.name as project_name, p.project_code') ->limit($this->limitOffset, $this->limitLength) ->order(['pc.id' => 'desc']) ->select()->each(function($item, $key){ diff --git a/app/adminapi/logic/contract/ContractLogic.php b/app/adminapi/logic/contract/ContractLogic.php index ac52ef63c..47c10eb20 100644 --- a/app/adminapi/logic/contract/ContractLogic.php +++ b/app/adminapi/logic/contract/ContractLogic.php @@ -43,6 +43,8 @@ class ContractLogic extends BaseLogic Db::startTrans(); try { Contract::create([ + 'org_id' => $params['org_id'] ?? 0, + 'dept_id' => $params['dept_id'] ?? 0, 'customer_id' => $params['customer_id'] ?? 0, 'approve_id' => $params['approve_id'] ?? 0, 'buy_bidding_document_id' => $params['buy_bidding_document_id'] ?? 0, @@ -95,6 +97,8 @@ class ContractLogic extends BaseLogic Db::startTrans(); try { Contract::where('approve_id', $params['approve_id'])->update([ + 'org_id' => $params['org_id'] ?? 0, + 'dept_id' => $params['dept_id'] ?? 0, 'customer_id' => $params['customer_id'] ?? 0, 'approve_id' => $params['approve_id'] ?? 0, 'buy_bidding_document_id' => $params['buy_bidding_document_id'] ?? 0, @@ -167,6 +171,8 @@ class ContractLogic extends BaseLogic if (!empty($contract->project->custom_id)) { $contract->custom = Custom::findOrEmpty($contract->project->custom_id); } + $contract->org; + $contract->dept; return $contract->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/contract/ProcurementContractLogic.php b/app/adminapi/logic/contract/ProcurementContractLogic.php index 29cb2ab2e..19334dabf 100644 --- a/app/adminapi/logic/contract/ProcurementContractLogic.php +++ b/app/adminapi/logic/contract/ProcurementContractLogic.php @@ -43,6 +43,8 @@ class ProcurementContractLogic extends BaseLogic Db::startTrans(); try { $procurementContract = ProcurementContract::create([ + 'org_id' => $params['org_id'] ?? 0, + 'dept_id' => $params['dept_id'] ?? 0, 'supplier_id' => $params['supplier_id'] ?? 0, 'approve_id' => $params['approve_id'] ?? 0, 'project_id' => $params['project_id'] ?? 0, @@ -96,6 +98,8 @@ class ProcurementContractLogic extends BaseLogic Db::startTrans(); try { ProcurementContract::where('id', $params['id'])->update([ + 'org_id' => $params['org_id'] ?? 0, + 'dept_id' => $params['dept_id'] ?? 0, 'supplier_id' => $params['supplier_id'] ?? 0, 'approve_id' => $params['approve_id'] ?? 0, 'project_id' => $params['project_id'] ?? 0, @@ -171,6 +175,8 @@ class ProcurementContractLogic extends BaseLogic $procurementContract->pay_plan = json_decode($procurementContract->pay_plan, true); $procurementContract->project; $procurementContract->material; + $procurementContract->org; + $procurementContract->dept; return $procurementContract->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/contract/SubcontractingContractLogic.php b/app/adminapi/logic/contract/SubcontractingContractLogic.php index c5f88bef8..fd9c9fdcb 100644 --- a/app/adminapi/logic/contract/SubcontractingContractLogic.php +++ b/app/adminapi/logic/contract/SubcontractingContractLogic.php @@ -44,6 +44,8 @@ class SubcontractingContractLogic extends BaseLogic Db::startTrans(); try { $subcontractingContract = ProcurementContract::create([ + 'org_id' => $params['org_id'] ?? 0, + 'dept_id' => $params['dept_id'] ?? 0, 'project_id' => $params['project_id'] ?? 0, 'approve_id' => $params['approve_id'] ?? 0, 'contract_cate' => 2, @@ -99,6 +101,8 @@ class SubcontractingContractLogic extends BaseLogic Db::startTrans(); try { ProcurementContract::where('id', $params['id'])->update([ + 'org_id' => $params['org_id'] ?? 0, + 'dept_id' => $params['dept_id'] ?? 0, 'project_id' => $params['project_id'] ?? 0, 'approve_id' => $params['approve_id'] ?? 0, 'contract_cate' => 2, @@ -174,6 +178,8 @@ class SubcontractingContractLogic extends BaseLogic $subcontractingContract->pay_plan = json_decode($subcontractingContract->pay_plan, true); $subcontractingContract->project; $subcontractingContract->work; + $subcontractingContract->org; + $subcontractingContract->dept; return $subcontractingContract->toArray(); } } \ No newline at end of file diff --git a/app/common/model/contract/Contract.php b/app/common/model/contract/Contract.php index 8cf78e289..29203fabf 100644 --- a/app/common/model/contract/Contract.php +++ b/app/common/model/contract/Contract.php @@ -39,5 +39,15 @@ class Contract extends BaseModel { return $this->belongsTo(\app\common\model\bid\BidBuyBiddingDocument::class, 'buy_bidding_document_id'); } + + public function org() + { + return $this->hasOne(\app\common\model\dept\Orgs::class, 'id', 'org_id'); + } + + public function dept() + { + return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id'); + } } \ No newline at end of file diff --git a/app/common/model/contract/ProcurementContract.php b/app/common/model/contract/ProcurementContract.php index e40680ffc..7e5ca91f9 100644 --- a/app/common/model/contract/ProcurementContract.php +++ b/app/common/model/contract/ProcurementContract.php @@ -44,6 +44,16 @@ class ProcurementContract extends BaseModel { return $this->hasMany(\app\common\model\contract\SubcontractingContractDetail::class, 'subcontracting_contract_id', 'id'); } + + public function org() + { + return $this->hasOne(\app\common\model\dept\Orgs::class, 'id', 'org_id'); + } + + public function dept() + { + return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id'); + } public function getSigningDateAttr($value) {