mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新细节

Browse Source
This commit is contained in:
yaooo 2023-12-16 09:59:01 +08:00
parent 1aaadbb107
commit c27b1adbf9
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/adminapi/lists/contract/ProcurementContractLists.php
View File

@ -72,7 +72,6 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
->select()->each(function($item, $key){ ->select()->each(function($item, $key){
//关联数据 供应商后续添加 //关联数据 供应商后续添加
$item['supplier_name'] = '供应商名称'; $item['supplier_name'] = '供应商名称';
$item['contract_type'] = '1';
$item['approve_no'] = '付款单号'; $item['approve_no'] = '付款单号';
$item['approve_step'] = '流程步骤'; $item['approve_step'] = '流程步骤';
$item['approve_settle_status'] = 1; $item['approve_settle_status'] = 1;

1
app/adminapi/lists/contract/SubcontractingContractLists.php
View File

@ -74,7 +74,6 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
->select()->each(function($item, $key){ ->select()->each(function($item, $key){
//关联数据 供应商后续添加 //关联数据 供应商后续添加
$item['supplier_name'] = '供应商名称'; $item['supplier_name'] = '供应商名称';
$item['contract_type'] = '1';
$item['approve_no'] = '付款单号'; $item['approve_no'] = '付款单号';
$item['approve_step'] = '流程步骤'; $item['approve_step'] = '流程步骤';
$item['approve_settle_status'] = 1; $item['approve_settle_status'] = 1;

2
app/adminapi/logic/contract/SubcontractingContractLogic.php
View File

@ -165,7 +165,7 @@ class SubcontractingContractLogic extends BaseLogic
public static function detail($params): array public static function detail($params): array
{ {
$subcontractingContract = ProcurementContract::findOrEmpty($params['id']); $subcontractingContract = ProcurementContract::findOrEmpty($params['id']);
$procurementContract->supplier = null; $subcontractingContract->supplier = null;
$subcontractingContract->custom = null; $subcontractingContract->custom = null;
if (!empty($subcontractingContract->project->custom_id)) { if (!empty($subcontractingContract->project->custom_id)) {
$subcontractingContract->custom = Custom::findOrEmpty($subcontractingContract->project->custom_id); $subcontractingContract->custom = Custom::findOrEmpty($subcontractingContract->project->custom_id);

5
app/common/model/contract/ProcurementContract.php
View File

@ -39,6 +39,11 @@ class ProcurementContract extends BaseModel
{ {
return $this->hasMany(\app\common\model\contract\ProcurementContractDetail::class, 'procurement_contract_id', 'id'); 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) public function getSigningDateAttr($value)
{ {