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-12 10:36:03 +08:00
parent 765b2c05bb
commit 9dff94906d
4 changed files with 80 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/contract/ContractLists.php
View File

@ -38,7 +38,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['contract_name', 'contract_type'], '=' => ['contract_name', 'contract_type', 'contract_code'],
]; ];
} }

119
app/adminapi/logic/contract/ContractLogic.php
View File

@ -41,34 +41,34 @@ class ContractLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
Contract::create([ Contract::create([
'customer_id' => $params['customer_id'], 'customer_id' => $params['customer_id'] ?? 0,
'approve_id' => $params['approve_id'], 'approve_id' => $params['approve_id'] ?? 0,
'buy_bidding_document_id' => $params['buy_bidding_document_id'], 'buy_bidding_document_id' => $params['buy_bidding_document_id'] ?? 0,
'contract_name' => $params['contract_name'], 'contract_name' => $params['contract_name'] ?? '',
'contract_code' => $params['contract_code'], 'contract_code' => $params['contract_code'] ?? '',
'contract_type' => $params['contract_type'], 'contract_type' => $params['contract_type'] ?? 0,
'contract_pricing_method' => $params['contract_pricing_method'], 'contract_pricing_method' => $params['contract_pricing_method'] ?? 0,
'party_a' => $params['party_a'], 'party_a' => $params['party_a'] ?? '',
'party_a_contact_address' => $params['party_a_contact_address'], 'party_a_contact_address' => $params['party_a_contact_address'] ?? '',
'party_a_diretor' => $params['party_a_diretor'], 'party_a_diretor' => $params['party_a_diretor'] ?? '',
'party_a_phone' => $params['party_a_phone'], 'party_a_phone' => $params['party_a_phone'] ?? '',
'party_a_mobile' => $params['party_a_mobile'], 'party_a_mobile' => $params['party_a_mobile'] ?? '',
'party_a_email' => $params['party_a_email'], 'party_a_email' => $params['party_a_email'] ?? '',
'party_b' => $params['party_b'], 'party_b' => $params['party_b'] ?? '',
'party_b_contact_address' => $params['party_b_contact_address'], 'party_b_contact_address' => $params['party_b_contact_address'] ?? '',
'party_b_diretor' => $params['party_b_diretor'], 'party_b_diretor' => $params['party_b_diretor'] ?? '',
'party_b_phone' => $params['party_b_phone'], 'party_b_phone' => $params['party_b_phone'] ?? '',
'party_b_mobile' => $params['party_b_mobile'], 'party_b_mobile' => $params['party_b_mobile'] ?? '',
'party_b_email' => $params['party_b_email'], 'party_b_email' => $params['party_b_email'] ?? '',
'amount' => $params['amount'], 'amount' => $params['amount'] ?? 0,
'amount_daxie' => $params['amount_daxie'], 'amount_daxie' => $params['amount_daxie'] ?? '',
'business_director' => $params['business_director'], 'business_director' => $params['business_director'] ?? 0,
'contract_status' => $params['contract_status'], 'contract_status' => $params['contract_status'] ?? 0,
'expire' => $params['expire'], 'expire' => $params['expire'] ?? '',
'contract_date' => $params['contract_date'], 'contract_date' => $params['contract_date'] ?? '',
'main_content' => $params['main_content'], 'main_content' => $params['main_content'] ?? '',
'remark' => $params['remark'], 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] 'annex' => $params['annex'] ?? '',
]); ]);
Db::commit(); Db::commit();
@ -93,34 +93,34 @@ class ContractLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
Contract::where('approve_id', $params['approve_id'])->update([ Contract::where('approve_id', $params['approve_id'])->update([
'customer_id' => $params['customer_id'], 'customer_id' => $params['customer_id'] ?? 0,
'approve_id' => $params['approve_id'], 'approve_id' => $params['approve_id'] ?? 0,
'buy_bidding_document_id' => $params['buy_bidding_document_id'], 'buy_bidding_document_id' => $params['buy_bidding_document_id'] ?? 0,
'contract_name' => $params['contract_name'], 'contract_name' => $params['contract_name'] ?? '',
'contract_code' => $params['contract_code'], 'contract_code' => $params['contract_code'] ?? '',
'contract_type' => $params['contract_type'], 'contract_type' => $params['contract_type'] ?? 0,
'contract_pricing_method' => $params['contract_pricing_method'], 'contract_pricing_method' => $params['contract_pricing_method'] ?? 0,
'party_a' => $params['party_a'], 'party_a' => $params['party_a'] ?? '',
'party_a_contact_address' => $params['party_a_contact_address'], 'party_a_contact_address' => $params['party_a_contact_address'] ?? '',
'party_a_diretor' => $params['party_a_diretor'], 'party_a_diretor' => $params['party_a_diretor'] ?? '',
'party_a_phone' => $params['party_a_phone'], 'party_a_phone' => $params['party_a_phone'] ?? '',
'party_a_mobile' => $params['party_a_mobile'], 'party_a_mobile' => $params['party_a_mobile'] ?? '',
'party_a_email' => $params['party_a_email'], 'party_a_email' => $params['party_a_email'] ?? '',
'party_b' => $params['party_b'], 'party_b' => $params['party_b'] ?? '',
'party_b_contact_address' => $params['party_b_contact_address'], 'party_b_contact_address' => $params['party_b_contact_address'] ?? '',
'party_b_diretor' => $params['party_b_diretor'], 'party_b_diretor' => $params['party_b_diretor'] ?? '',
'party_b_phone' => $params['party_b_phone'], 'party_b_phone' => $params['party_b_phone'] ?? '',
'party_b_mobile' => $params['party_b_mobile'], 'party_b_mobile' => $params['party_b_mobile'] ?? '',
'party_b_email' => $params['party_b_email'], 'party_b_email' => $params['party_b_email'] ?? '',
'amount' => $params['amount'], 'amount' => $params['amount'] ?? 0,
'amount_daxie' => $params['amount_daxie'], 'amount_daxie' => $params['amount_daxie'] ?? '',
'business_director' => $params['business_director'], 'business_director' => $params['business_director'] ?? 0,
'contract_status' => $params['contract_status'], 'contract_status' => $params['contract_status'] ?? 0,
'expire' => $params['expire'], 'expire' => $params['expire'] ?? '',
'contract_date' => $params['contract_date'], 'contract_date' => $params['contract_date'] ?? '',
'main_content' => $params['main_content'], 'main_content' => $params['main_content'] ?? '',
'remark' => $params['remark'], 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] 'annex' => $params['annex'] ?? '',
]); ]);
Db::commit(); Db::commit();
@ -142,7 +142,7 @@ class ContractLogic extends BaseLogic
*/ */
public static function delete(array $params): bool public static function delete(array $params): bool
{ {
return Contract::destroy($params['approve_id']); return Contract::destroy($params['id']);
} }
@ -155,6 +155,9 @@ class ContractLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return Contract::findOrEmpty($params['approve_id'])->toArray(); $contract = Contract::findOrEmpty($params['id']);
$contract->custom = $contract->custom;
$contract->document = $contract->document;
return $contract->toArray();
} }
} }

13
app/adminapi/validate/contract/ContractValidate.php
View File

@ -31,7 +31,12 @@ class ContractValidate extends BaseValidate
* @var string[] * @var string[]
*/ */
protected $rule = [ protected $rule = [
'id' => 'require',
'approve_id' => 'require', 'approve_id' => 'require',
'customer_id' => 'require',
'buy_bidding_document_id' => 'require',
'contract_name' => 'require',
'contract_code' => 'require',
]; ];
@ -52,7 +57,7 @@ class ContractValidate extends BaseValidate
*/ */
public function sceneAdd() public function sceneAdd()
{ {
return $this->remove('approve_id', true); return $this->remove('id', true);
} }
@ -64,7 +69,7 @@ class ContractValidate extends BaseValidate
*/ */
public function sceneEdit() public function sceneEdit()
{ {
return $this->only(['approve_id']); return $this->only(['id', 'approve_id', 'customer_id', 'buy_bidding_document_id', 'contract_name', 'contract_code']);
} }
@ -76,7 +81,7 @@ class ContractValidate extends BaseValidate
*/ */
public function sceneDelete() public function sceneDelete()
{ {
return $this->only(['approve_id']); return $this->only(['id']);
} }
@ -88,7 +93,7 @@ class ContractValidate extends BaseValidate
*/ */
public function sceneDetail() public function sceneDetail()
{ {
return $this->only(['approve_id']); return $this->only(['id']);
} }
} }

9
app/common/model/contract/Contract.php
View File

@ -30,5 +30,14 @@ class Contract extends BaseModel
protected $name = 'contract'; protected $name = 'contract';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
public function custom()
{
return $this->belongsTo(\app\common\model\custom\Custom::class, 'customer_id');
}
public function document()
{
return $this->belongsTo(\app\common\model\bid\BidBuyBiddingDocument::class, 'buy_bidding_document_id');
}
} }