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

Merge pull request 'fixed' (#94) from zhangwei into dev

Browse Source 
Reviewed-on: #94
This commit is contained in:
weiz 2023-12-29 14:32:20 +08:00
commit f357e5a7a8
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/logic/contract/AdministrativeContractLogic.php
View File

@ -44,7 +44,7 @@ class AdministrativeContractLogic extends BaseLogic
'org_id' => $params['org_id'] ?? 0,
'dept_id' => $params['dept_id'] ?? 0,
'supplier_id' => $params['supplier_id'] ?? 0,
'contract_no' => $params['contract_no'] ?? '',
'contract_no' => data_unique_code('XZHT'),
'contract_name' => $params['contract_name'] ?? '',
'procurement_type' => $params['procurement_type'] ?? 0,
'asset_apply_no' => $params['asset_apply_no'] ?? '',
@ -84,7 +84,6 @@ class AdministrativeContractLogic extends BaseLogic
'org_id' => $params['org_id'] ?? 0,
'dept_id' => $params['dept_id'] ?? 0,
'supplier_id' => $params['supplier_id'] ?? 0,
'contract_no' => $params['contract_no'] ?? '',
'contract_name' => $params['contract_name'] ?? '',
'procurement_type' => $params['procurement_type'] ?? 0,
'asset_apply_no' => $params['asset_apply_no'] ?? '',

1
app/adminapi/validate/contract/AdministrativeContractValidate.php
View File

@ -33,7 +33,6 @@ class AdministrativeContractValidate extends BaseValidate
protected $rule = [
'id' => 'require',
'supplier_id' => 'require',
'contract_no' => 'require',
'contract_name' => 'require',
];