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

update

Browse Source
This commit is contained in:
weiz 2024-03-27 15:53:17 +08:00
parent 74e9697ba4
commit 2391b9bf71
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/financial/FinancialDepartmentIncomeSettlementDetailLists.php
View File

@ -58,7 +58,7 @@
public function lists(): array public function lists(): array
{ {
return FinancialDepartmentIncomeSettlementDetail::where($this->searchWhere) return FinancialDepartmentIncomeSettlementDetail::where($this->searchWhere)
->field(['id', 'department_income_settlement_id', 'dept_id', 'type', 'amount', 'settlement_amount', 'settlement_code']) ->field(['id', 'department_income_settlement_id', 'dept_id', 'type', 'amount', 'settlement_amount', 'settlement_code', 'remark'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($data) { ->select()->each(function ($data) {

2
app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php
View File

@ -163,7 +163,7 @@
$data['part_a'] = $contract['part_a']; $data['part_a'] = $contract['part_a'];
$data['create_date'] = $contract['create_date']; $data['create_date'] = $contract['create_date'];
$data['money'] = $contract['money']; $data['money'] = $contract['money'];
$data['contract_type'] = $contract['contract_type']; $data['contract_type'] = (string)$contract['contract_type'];
$data['contract_type_text'] = $contract->contract_type_text; $data['contract_type_text'] = $contract->contract_type_text;
return $data->toArray(); return $data->toArray();
} }

4
app/adminapi/validate/financial/FinancialBudgetDocValidate.php
View File

@ -70,7 +70,7 @@
*/ */
public function sceneAdd() public function sceneAdd()
{ {
return $this->only(['contract_id', 'name', 'issue_date', 'remark', 'create_user', 'create_time', 'annex']); return $this->only(['contract_id', 'name', 'issue_date', 'remark', 'create_user', 'create_time', 'annex', 'detail']);
} }
@ -82,7 +82,7 @@
*/ */
public function sceneEdit() public function sceneEdit()
{ {
return $this->only(['id', 'contract_id', 'name', 'issue_date', 'remark', 'create_user', 'create_time', 'annex']); return $this->only(['id', 'contract_id', 'name', 'issue_date', 'remark', 'create_user', 'create_time', 'annex', 'detail']);
} }

4
app/adminapi/validate/financial/FinancialDepartmentIncomeSettlementValidate.php
View File

@ -64,7 +64,7 @@
*/ */
public function sceneAdd() public function sceneAdd()
{ {
return $this->only(['budget_doc_id', 'desc', 'create_user', 'create_time']); return $this->only(['budget_doc_id', 'desc', 'create_user', 'create_time', 'detail']);
} }
@ -76,7 +76,7 @@
*/ */
public function sceneEdit() public function sceneEdit()
{ {
return $this->only(['id', 'budget_doc_id', 'desc', 'create_user', 'create_time']); return $this->only(['id', 'budget_doc_id', 'desc', 'create_user', 'create_time', 'detail']);
} }

4
app/adminapi/validate/financial/FinancialFeeApplicationValidate.php
View File

@ -64,7 +64,7 @@
*/ */
public function sceneAdd() public function sceneAdd()
{ {
return $this->only(['theme', 'days', 'create_user', 'create_time']); return $this->only(['theme', 'days', 'create_user', 'create_time', 'detail']);
} }
@ -76,7 +76,7 @@
*/ */
public function sceneEdit() public function sceneEdit()
{ {
return $this->only(['id', 'theme', 'days', 'create_user', 'create_time']); return $this->only(['id', 'theme', 'days', 'create_user', 'create_time', 'detail']);
} }