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-13 11:03:36 +08:00
parent 25cefd1633
commit 734265d495
4 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
namespace app\adminapi\lists\contract; namespace app\adminapi\lists\contract;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\contract\SubcontractingContractNegotiation; use app\common\model\contract\SubcontractingContractNegotiation;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
@ -38,7 +38,7 @@ class SubcontractingContractNegotiationLists extends BaseAdminDataLists implemen
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['contract_id', 'negotiation_name', 'negotiation_no', 'negotiation_type'], '=' => ['subcontracting_contract_id', 'negotiation_name', 'negotiation_no', 'negotiation_type'],
]; ];
} }
@ -55,7 +55,7 @@ class SubcontractingContractNegotiationLists extends BaseAdminDataLists implemen
public function lists(): array public function lists(): array
{ {
return SubcontractingContractNegotiation::where($this->searchWhere) return SubcontractingContractNegotiation::where($this->searchWhere)
->field(['id', 'contract_id', 'negotiation_name', 'negotiation_no', 'negotiation_amount', 'negotiation_type', 'warranty_amount', 'Warranty_expire_date', 'negotiation_content', 'negotiation_detail', 'negotiation_quotation', 'negotiation_basis']) ->field(['*'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()

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

@ -41,17 +41,17 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
SubcontractingContractNegotiation::create([ SubcontractingContractNegotiation::create([
'contract_id' => $params['contract_id'], 'subcontracting_contract_id' => $params['subcontracting_contract_id'] ?? 0,
'negotiation_name' => $params['negotiation_name'], 'negotiation_name' => $params['negotiation_name'] ?? '',
'negotiation_no' => $params['negotiation_no'], 'negotiation_no' => $params['negotiation_no'] ?? '',
'negotiation_amount' => $params['negotiation_amount'], 'negotiation_amount' => $params['negotiation_amount'] ?? 0,
'negotiation_type' => $params['negotiation_type'], 'negotiation_type' => $params['negotiation_type'] ?? 0,
'warranty_amount' => $params['warranty_amount'], 'warranty_amount' => $params['warranty_amount'] ?? 0,
'Warranty_expire_date' => $params['Warranty_expire_date'], 'Warranty_expire_date' => $params['Warranty_expire_date'] ?? '',
'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'], 'negotiation_quotation' => $params['negotiation_quotation'] ?? '',
'negotiation_basis' => $params['negotiation_basis'], 'negotiation_basis' => $params['negotiation_basis'] ?? '',
]); ]);
Db::commit(); Db::commit();
@ -76,17 +76,17 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
SubcontractingContractNegotiation::where('id', $params['id'])->update([ SubcontractingContractNegotiation::where('id', $params['id'])->update([
'contract_id' => $params['contract_id'], 'subcontracting_contract_id' => $params['subcontracting_contract_id'] ?? 0,
'negotiation_name' => $params['negotiation_name'], 'negotiation_name' => $params['negotiation_name'] ?? '',
'negotiation_no' => $params['negotiation_no'], 'negotiation_no' => $params['negotiation_no'] ?? '',
'negotiation_amount' => $params['negotiation_amount'], 'negotiation_amount' => $params['negotiation_amount'] ?? 0,
'negotiation_type' => $params['negotiation_type'], 'negotiation_type' => $params['negotiation_type'] ?? 0,
'warranty_amount' => $params['warranty_amount'], 'warranty_amount' => $params['warranty_amount'] ?? 0,
'Warranty_expire_date' => $params['Warranty_expire_date'], 'Warranty_expire_date' => $params['Warranty_expire_date'] ?? '',
'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'], 'negotiation_quotation' => $params['negotiation_quotation'] ?? '',
'negotiation_basis' => $params['negotiation_basis'], 'negotiation_basis' => $params['negotiation_basis'] ?? '',
]); ]);
Db::commit(); Db::commit();
@ -121,6 +121,8 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return SubcontractingContractNegotiation::findOrEmpty($params['id'])->toArray(); $subcontractingContractNegotiation = SubcontractingContractNegotiation::findOrEmpty($params['id']);
$subcontractingContractNegotiation->contract = $subcontractingContractNegotiation->contract;
return $subcontractingContractNegotiation->toArray();
} }
} }

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

@ -31,7 +31,10 @@ class SubcontractingContractNegotiationValidate extends BaseValidate
* @var string[] * @var string[]
*/ */
protected $rule = [ protected $rule = [
'id' => 'require', 'id' => 'require',
'subcontracting_contract_id' => 'require',
'negotiation_name' => 'require',
'negotiation_amount' => 'require',
]; ];
@ -40,7 +43,7 @@ class SubcontractingContractNegotiationValidate extends BaseValidate
* @var string[] * @var string[]
*/ */
protected $field = [ protected $field = [
'id' => 'id', 'id' => 'id',
]; ];
@ -55,7 +58,6 @@ class SubcontractingContractNegotiationValidate extends BaseValidate
return $this->remove('id', true); return $this->remove('id', true);
} }
/** /**
* @notes 编辑场景 * @notes 编辑场景
* @return SubcontractingContractNegotiationValidate * @return SubcontractingContractNegotiationValidate
@ -64,7 +66,7 @@ class SubcontractingContractNegotiationValidate extends BaseValidate
*/ */
public function sceneEdit() public function sceneEdit()
{ {
return $this->only(['id']); return $this->only(['id', 'subcontracting_contract_id', 'negotiation_name', 'negotiation_amount']);
} }

4
app/common/model/contract/SubcontractingContractNegotiation.php
View File

@ -30,5 +30,9 @@ class SubcontractingContractNegotiation extends BaseModel
protected $name = 'subcontracting_contract_negotiation'; protected $name = 'subcontracting_contract_negotiation';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
public function contract()
{
return $this->belongsTo(\app\common\model\contract\SubcontractingContract::class, 'subcontracting_contract_id');
}
} }