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-18 11:59:16 +08:00
parent 6417f82028
commit 44f21c4247
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/adminapi/lists/cost/CostBudgetLists.php
View File

@ -15,7 +15,7 @@
namespace app\adminapi\lists\cost; namespace app\adminapi\lists\cost;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\cost\CostBudget; use app\common\model\cost\CostBudget;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
@ -38,7 +38,7 @@ class CostBudgetLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['years', 'document_preparation_time'], '=' => ['years', 'document_preparation_time'],
]; ];
} }
@ -58,7 +58,13 @@ class CostBudgetLists extends BaseAdminDataLists implements ListsSearchInterface
->field(['id', 'years', 'document_preparation_time', 'total', 'remark', 'annex']) ->field(['id', 'years', 'document_preparation_time', 'total', 'remark', 'annex'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()->each(function($item, $key){
//关联数据 供应商后续添加
$item['approve_no'] = '付款单号';
$item['approve_step'] = '流程步骤';
$item['approve_settle_status'] = 1;
return $item;
})
->toArray(); ->toArray();
} }

22
app/adminapi/logic/cost/CostBudgetLogic.php
View File

@ -41,11 +41,12 @@ class CostBudgetLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
CostBudget::create([ CostBudget::create([
'years' => $params['years'], 'approve_id' => $params['approve_id'] ?? 0,
'document_preparation_time' => $params['document_preparation_time'], 'years' => $params['years'] ?? '',
'total' => $params['total'], 'document_preparation_time' => $params['document_preparation_time'] ?? '',
'remark' => $params['remark'], 'total' => $params['total'] ?? 0,
'annex' => $params['annex'], 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ?? '',
]); ]);
Db::commit(); Db::commit();
@ -70,11 +71,12 @@ class CostBudgetLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
CostBudget::where('id', $params['id'])->update([ CostBudget::where('id', $params['id'])->update([
'years' => $params['years'], 'approve_id' => $params['approve_id'] ?? 0,
'document_preparation_time' => $params['document_preparation_time'], 'years' => $params['years'] ?? '',
'total' => $params['total'], 'document_preparation_time' => $params['document_preparation_time'] ?? '',
'remark' => $params['remark'], 'total' => $params['total'] ?? 0,
'annex' => $params['annex'], 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ?? '',
]); ]);
Db::commit(); Db::commit();

2
app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
View File

@ -166,7 +166,7 @@ class FinanceInvoiceApplyLogic extends BaseLogic
$financeInvoiceApply->document = BidBuyBiddingDocument::findOrEmpty($financeInvoiceApply->contract->buy_bidding_document_id); $financeInvoiceApply->document = BidBuyBiddingDocument::findOrEmpty($financeInvoiceApply->contract->buy_bidding_document_id);
} }
if (!empty($financeInvoiceApply->document->project_id)) { if (!empty($financeInvoiceApply->document->project_id)) {
$financeInvoiceApply->project = Custom::findOrEmpty($financeInvoiceApply->document->project_id); $financeInvoiceApply->project = Project::findOrEmpty($financeInvoiceApply->document->project_id);
} }
return $financeInvoiceApply->toArray(); return $financeInvoiceApply->toArray();
} }