This commit is contained in:
wangshiming
2022-03-25 18:06:02 +08:00
parent 9020192e82
commit 64f178c81c
2 changed files with 17 additions and 9 deletions

View File

@ -450,7 +450,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
{
text: '取消订单',
click: _record => this.cancellation(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2',
iif: item => item.billStatus !== '6' && item.overallPaymentStatus !== '2',
acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] }
},
{

View File

@ -8,8 +8,10 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzImageService } from 'ng-zorro-antd/image';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { Subject } from 'rxjs';
import { ImageViewComponent } from 'src/app/shared/components/imagelist';
import { UsermanageService } from '../../../services/usercenter.service';
import { debounceTime } from 'rxjs/operators';
@Component({
selector: 'app-usercenter-components-driver-detail',
@ -21,6 +23,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
detailData: any;
userDetail: any;
contencarModel: any;
changeSub = new Subject<string>();
facetext: any;
faceStatus: any = 0;
userIdentityDetail: any = {};
@ -73,6 +76,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
ngOnInit() {
this.initData();
this.initDetailByCode();
this.changeEndKmAction()
}
initData() {
// 获取司机头部信息
@ -209,17 +213,21 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
nzTitle: '审核通过',
nzContent: `<p>驾驶证号:${this.driverDetail?.licenseNo}</p><p>从业资格证号:${this.licenseDetail?.licenseNo}</p><p>是否确认通过审核`,
nzOnOk: () => {
this.adjuctDriverLicense(
{
approvalStatus: 20,
appUserId: this.userDetail?.appUserId
},
'审核成功'
);
this.changeEndKmAction()
}
});
}
changeEndKmAction() {
this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => {
this.adjuctDriverLicense(
{
approvalStatus: 20,
appUserId: this.userDetail?.appUserId
},
'审核成功'
);
})
}
/** 驳回驾驶员信息 */
rejectedDriver() {
this.approvalOpinion = '';