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

Merge pull request 'zhangwei' (#193) from zhangwei into dev

Browse Source 
Reviewed-on: #193
This commit is contained in:
weiz 2024-01-18 10:48:12 +08:00
commit 9788376a47
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/adminapi/validate/project/ProjectSubcontractSettlementValidate.php
View File

@ -41,7 +41,7 @@ class ProjectSubcontractSettlementValidate extends BaseValidate
'settlement_amount_uppercase' => 'require',
'remaining_amount' => 'require|float|egt:0',
'settlement_date' => 'require|dateFormat:Y-m-d',
'annex' => 'checkFile'
'annex' => 'checkAnnex'
];
protected $message = [
@ -118,7 +118,7 @@ class ProjectSubcontractSettlementValidate extends BaseValidate
public function checkContract($value,$rule,$data): bool|string
{
$contract = SubcontractingContract::where('id',$value)->where('contract_type',2)->findOrEmpty();
$contract = SubcontractingContract::where('id',$value)->findOrEmpty();
if($contract->isEmpty()){
return '合同不存在';
}
@ -128,12 +128,11 @@ class ProjectSubcontractSettlementValidate extends BaseValidate
return true;
}
public function checkFile($value): bool|string
public function checkAnnex($value): bool|string
{
if($value != ''){
$file = $value;//json_decode($value,true);
if(empty($file)){
return '附件必须是json数组';
if(!empty($value) && $value != ''){
if(empty($value) || !is_array($value)){
return '附件格式错误';
}
}
return true;