Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-03-30 15:56:51 +08:00
parent 791b19ff68 a5cc8bd34a
commit dfb734529d
11 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -28,7 +28,7 @@
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="false">
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="orderStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
@ -42,6 +42,13 @@
<ng-template st-row="amount" let-item let-index="index">
<div class="text-right">{{item?.amount | currency :' '}}</div>
</ng-template>
<ng-template st-row="car" let-item let-index="index">
<a (click)="viewAuditResult(item)">查看轨迹</a>
</ng-template>
<ng-template st-row="driver" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">查看轨迹</a>
</ng-template>
</st>
</nz-card>
<ng-template #extraTemplate>

10
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -267,7 +267,7 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', },
{ title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
{ title: '本地校验66', render: 'localValid', className: 'text-center', width: '120px', },
{ title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
{
title: '订单号',
render: 'billComplianceVOS',
@ -285,12 +285,12 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
{ title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
{ title: '发货时间', render: 'driver', className: 'text-center', width: '180px' },
{ title: '发货时间', render: 'driver2', className: 'text-center', width: '180px' },
{ title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
{ title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
{ title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' },
{ title: '收货方名称', render: 'driver1', className: 'text-center', width: '150px' },
{ title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
{ title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
@ -302,8 +302,8 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' },
{ title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
{ title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
];

41
src/app/routes/download/components/list/list.component.ts
View File

@ -8,7 +8,7 @@ import { DownloadService } from '../../services/download.service';
@Component({
selector: 'app-download-center-components-list',
templateUrl: './list.component.html',
templateUrl: './list.component.html'
})
export class DownloadComponentsListComponent implements OnInit {
ui: SFUISchema = {};
@ -24,7 +24,7 @@ export class DownloadComponentsListComponent implements OnInit {
get reqParams() {
const params = Object.assign({}, this.sf?.value || {});
delete params._$expand;
return { ...params };
return { ...params, createTime: params?.createTime?.start, applyEndTime: params?.createTime?.end };
}
/**
@ -49,23 +49,18 @@ export class DownloadComponentsListComponent implements OnInit {
properties: {
_$expand: {
type: 'boolean',
ui: { hidden: true },
ui: { hidden: true }
},
applyStartTime: {
createTime: {
type: 'string',
title: '创建时间',
ui: {
widget: 'date',
format: 'yyyy-MM-dd',
end: 'applyEndTime',
} as SFDateWidgetSchema,
},
applyEndTime: {
type: 'string',
title: '',
ui: { widget: 'date', end: 'end' } as SFDateWidgetSchema,
},
},
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
}
}
};
this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 } } };
}
@ -87,8 +82,8 @@ export class DownloadComponentsListComponent implements OnInit {
enum: {
0: '生成中',
1: '已完成',
2: '失败',
},
2: '失败'
}
},
{ title: '下载次数', index: 'downloadCount', width: '120px', className: 'text-center' },
{ title: '创建时间', index: 'createTime', width: '120px', className: 'text-center' },
@ -98,10 +93,8 @@ export class DownloadComponentsListComponent implements OnInit {
fixed: 'right',
width: '170px',
className: 'text-center',
buttons: [
{ text: '下载', click: (_record) => this.download(_record)},
],
},
buttons: [{ text: '下载', click: _record => this.download(_record) }]
}
];
}
@ -115,12 +108,12 @@ export class DownloadComponentsListComponent implements OnInit {
nzTitle: '<i>删除确认</i>',
nzContent: `<b>即将删除 当前行数据,请仔细核对,避免误操作！<br>是否删除？</br>`,
nzOnOk: () =>
this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe((res) => {
this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe(res => {
if (res) {
this.service.msgSrv.success('数据删除成功！');
this.st?.reload();
}
}),
})
});
}
download(record: STData) {
@ -129,7 +122,7 @@ export class DownloadComponentsListComponent implements OnInit {
this.service.encodeUrlHeader(this.service.$api_download_file, headers),
{},
{ fileKey: record.fileUniqueKey },
'POST',
'POST'
);
}
}

2
src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
View File

@ -12,7 +12,7 @@
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<!-- <button nz-button> 导出</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

2
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
View File

@ -99,7 +99,7 @@
<div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="false" (click)="costST?.load(1)">查询</button>
<button nz-button (click)="resetSF(2)">重置</button>
<button nz-button> 导出</button>
<!-- <button nz-button> 导出</button> -->
</div>
</div>

2
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
View File

@ -83,7 +83,7 @@
class="text-right">
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<!-- <button nz-button> 导出</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

2
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
View File

@ -20,7 +20,7 @@
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<!-- <button nz-button> 导出</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

11
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
View File

@ -119,17 +119,18 @@ export class InvoiceRequestedComponent {
this.service.msgSrv.warning('请选择开票申请');
return;
}
if (item.find(item => item.sts !== '1')) {
this.service.msgSrv.warning('请勿选择非待处理订单');
return;
}
// if (item.find(item => item.sts !== '1')) {
// this.service.msgSrv.warning('请勿选择非待处理订单');
// return;
// }
const modal = this.nzModalService.create({
nzTitle: '修改地址',
nzContent: UpdateAddressModalComponent,
nzOkLoading: this.service.http.loading,
nzOnOk: component => {
if (!component.sf.valid) {
this.service.msgSrv.warning('表单校验错误');
component.sf.validator({ emitError: true });
// this.service.msgSrv.warning('表单校验错误');
return false;
}
this.service

2
src/app/routes/usercenter/components/driver/detail/detail.component.html
View File

@ -334,7 +334,7 @@
{{ userIdentityDetail?.name }}
</se>
<se [col]="1" label="备注" required>
<textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" maxlength="120" [(ngModel)]="approvalOpinion"></textarea>
<textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" maxlength="120" [(ngModel)]="approvalOpinion" placeholder="请输入驳回原因"></textarea>
</se>
</div>
</div>

36
src/app/routes/usercenter/components/driver/detail/detail.component.ts
View File

@ -23,7 +23,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
detailData: any;
userDetail: any;
contencarModel: any;
changeSub = new Subject<string>();
facetext: any;
faceStatus: any = 0;
userIdentityDetail: any = {};
@ -76,7 +75,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
ngOnInit() {
this.initData();
this.initDetailByCode();
this.changeEndKmAction()
}
initData() {
// 获取司机头部信息
@ -191,6 +189,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
nzContent: this.redectModal,
nzOnOk: () => {
if (!this.approvalOpinion) {
this.service.msgSrv.warning('请填写备注');
return false;
}
this.adjuctUser(
@ -209,25 +208,22 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
/** 审核通过驾驶员信息 */
approveDriver() {
this.nzModalService.confirm({
nzTitle: '审核通过',
nzContent: `<p>驾驶证号：${this.driverDetail?.licenseNo}</p><p>从业资格证号：${this.licenseDetail?.licenseNo}</p><p>是否确认通过审核`,
nzOnOk: () => {
this.changeEndKmAction()
this.adjuctDriverLicense(
{
approvalStatus: 20,
appUserId: this.userDetail?.appUserId
},
'审核成功'
);
}
});
}
changeEndKmAction() {
this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => {
this.adjuctDriverLicense(
{
approvalStatus: 20,
appUserId: this.userDetail?.appUserId
},
'审核成功'
);
})
}
/** 驳回驾驶员信息 */
rejectedDriver() {
this.approvalOpinion = '';
@ -331,16 +327,22 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
return;
}
}
if (!driverDetail.licenseNo || !driverDetail.driverModel || !driverDetail.validStartTime || !driverDetail.signingOrganization || !driverDetail.certificatePhotoWatermark) {
if (
!driverDetail.licenseNo ||
!driverDetail.driverModel ||
!driverDetail.validStartTime ||
!driverDetail.signingOrganization ||
!driverDetail.certificatePhotoWatermark
) {
this.service.msgSrv.warning('请完善驾驶证信息');
return;
}
if (!licenseDetail.licenseNo || !licenseDetail.validStartTime || !licenseDetail.certificatePhotoWatermark) {
if (!licenseDetail.licenseNo || !licenseDetail.validStartTime || !licenseDetail.certificatePhotoWatermark) {
this.service.msgSrv.warning('请完善从业资格证信息');
return;
}
const params: any = {
userId: this.route.snapshot.params.id,
mobile: this.userDetail?.phone,