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-21 10:35:18 +08:00
parent 333b31c484
commit 1304767f52
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/lists/contract/SubcontractingContractNegotiationLists.php
View File

@ -64,10 +64,11 @@ class SubcontractingContractNegotiationLists extends BaseAdminDataLists implemen
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($data){ ->select()->each(function($data){
$subcontracting_contract = SubcontractingContract::field('supplier_id,contract_no')->where('id',$data['subcontracting_contract_id'])->findOrEmpty(); $subcontracting_contract = SubcontractingContract::field('supplier_id,contract_no,contract_name')->where('id',$data['subcontracting_contract_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
$supplier = Supplier::field('supplier_name,supplier_code')->where('id',$subcontracting_contract['supplier_id'])->findOrEmpty(); $supplier = Supplier::field('supplier_name,supplier_code')->where('id',$subcontracting_contract['supplier_id'])->findOrEmpty();
$data['contract_no'] = $subcontracting_contract['contract_no']; $data['contract_no'] = $subcontracting_contract['contract_no'];
$data['contract_name'] = $subcontracting_contract['contract_name'];
$data['supplier_name'] = $supplier['supplier_name']; $data['supplier_name'] = $supplier['supplier_name'];
$data['supplier_code'] = $supplier['supplier_code']; $data['supplier_code'] = $supplier['supplier_code'];
$data['project_code'] = $project['project_code']; $data['project_code'] = $project['project_code'];

6
app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
View File

@ -44,7 +44,7 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
$subcontracting_contract = SubcontractingContract::field('project_id')->where('id',$params['subcontracting_contract_id'])->findOrEmpty(); $subcontracting_contract = SubcontractingContract::field('project_id')->where('id',$params['subcontracting_contract_id'])->findOrEmpty();
Db::startTrans(); Db::startTrans();
try { try {
$res = SubcontractingContractNegotiation::create([ SubcontractingContractNegotiation::create([
'project_id' => $subcontracting_contract['project_id'], 'project_id' => $subcontracting_contract['project_id'],
'subcontracting_contract_id' => $params['subcontracting_contract_id'], 'subcontracting_contract_id' => $params['subcontracting_contract_id'],
'sign_date' => strtotime($params['sign_date']), 'sign_date' => strtotime($params['sign_date']),
@ -53,7 +53,7 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
'negotiation_amount' => $params['negotiation_amount'], 'negotiation_amount' => $params['negotiation_amount'],
'negotiation_type' => $params['negotiation_type'], 'negotiation_type' => $params['negotiation_type'],
'warranty_amount' => $params['warranty_amount'] ?? 0, 'warranty_amount' => $params['warranty_amount'] ?? 0,
'warranty_expire_date' => !empty($params['Warranty_expire_date']) ? strtotime($params['Warranty_expire_date']) : 0, 'warranty_expire_date' => !empty($params['warranty_expire_date']) ? strtotime($params['warranty_expire_date']) : 0,
'negotiation_content' => $params['negotiation_content'] ?? '', 'negotiation_content' => $params['negotiation_content'] ?? '',
'negotiation_detail' => $params['negotiation_detail'] ?? '', 'negotiation_detail' => $params['negotiation_detail'] ?? '',
'negotiation_quotation' => $params['negotiation_quotation'] ? json_encode($params['negotiation_quotation']) : null, 'negotiation_quotation' => $params['negotiation_quotation'] ? json_encode($params['negotiation_quotation']) : null,
@ -89,7 +89,7 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
'negotiation_amount' => $params['negotiation_amount'], 'negotiation_amount' => $params['negotiation_amount'],
'negotiation_type' => $params['negotiation_type'], 'negotiation_type' => $params['negotiation_type'],
'warranty_amount' => $params['warranty_amount'] ?? 0, 'warranty_amount' => $params['warranty_amount'] ?? 0,
'warranty_expire_date' => !empty($params['Warranty_expire_date']) ? strtotime($params['Warranty_expire_date']) : 0, 'warranty_expire_date' => !empty($params['warranty_expire_date']) ? strtotime($params['warranty_expire_date']) : 0,
'negotiation_content' => $params['negotiation_content'] ?? '', 'negotiation_content' => $params['negotiation_content'] ?? '',
'negotiation_detail' => $params['negotiation_detail'] ?? '', 'negotiation_detail' => $params['negotiation_detail'] ?? '',
'negotiation_quotation' => $params['negotiation_quotation'] ? json_encode($params['negotiation_quotation']) : null, 'negotiation_quotation' => $params['negotiation_quotation'] ? json_encode($params['negotiation_quotation']) : null,

12
app/adminapi/validate/contract/SubcontractingContractNegotiationValidate.php
View File

@ -96,7 +96,7 @@ class SubcontractingContractNegotiationValidate extends BaseValidate
*/ */
public function sceneDelete() public function sceneDelete()
{ {
return $this->only(['id']); return $this->only(['id'])->remove('id','checkData');
} }
@ -142,15 +142,5 @@ class SubcontractingContractNegotiationValidate extends BaseValidate
} }
return true; return true;
} }
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != ''){
if(!is_array($value)){
return '附件格式错误';
}
}
return true;
}
} }

2
app/adminapi/validate/contract/SubcontractingContractValidate.php
View File

@ -103,7 +103,7 @@ class SubcontractingContractValidate extends BaseValidate
*/ */
public function sceneDelete() public function sceneDelete()
{ {
return $this->only(['id']); return $this->only(['id'])->remove('id','checkData');
} }