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

修复上传合同bug

Browse Source
This commit is contained in:
unknown 2023-10-13 10:12:16 +08:00
parent 73649e2e28
commit ae7499bd05
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/contract/VehicleContractController.php
View File

@ -41,7 +41,7 @@ class VehicleContractController extends BaseAdminController
'status' => 1,
];
//判断合同类型
if($vehicle_contract['type'] == 0){
if($vehicle_contract['type'] == 0 && $vehicle_contract['contract_logistic_id'] != 0){
$data['cars_info'] = $params['cars'];
}
if(!empty($vehicle_contract['contract_logistic_id'])){

3
app/api/controller/VehicleController.php
View File

@ -199,7 +199,7 @@ class VehicleController extends BaseApiController
}
//小组服务公司租赁申请
public function rentApply() {
public function rentApply() {
//验证请求类型
if(!$this->request->isPost()){
return $this->fail('请求类型错误');
@ -730,6 +730,7 @@ class VehicleController extends BaseApiController
}
//如果有租赁车俩和上传自有车辆,但没有购买镇街公司租赁的车辆 则先向镇街公司发起解约合同
if(!$xzRentCars->isEmpty() && $zjRentCars->isEmpty()){
dump(333);die;
//获取自有车辆或以租赁车辆信息
//生成本地解约合同
VehicleContract::create([