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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-03-09 16:54:24 +08:00
parent 2320ab0960 61b73497a6
commit 89c03c417d
6 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
View File

@ -12,8 +12,8 @@
<div style="flex: 1"> <div style="flex: 1">
<div style="display: flex; width: 100%; justify-content: space-between"> <div style="display: flex; width: 100%; justify-content: space-between">
<p style="padding-right: 80px; width: 400px">{{ userDetail?.realName }} <p style="padding-right: 80px; width: 400px">{{ userDetail?.realName }}
<nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xl"> </nz-badge> <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xs"> </nz-badge>
<nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"> </nz-badge> <nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xs"> </nz-badge>
</p> </p>
<div style="margin-right: 24px"> <div style="margin-right: 24px">
<button *ngIf="userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzType="primary" <button *ngIf="userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzType="primary"

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

@ -12,8 +12,8 @@
<div style="flex: 1"> <div style="flex: 1">
<div style="display: flex;width: 100%;justify-content: space-between;"> <div style="display: flex;width: 100%;justify-content: space-between;">
<p style="padding-right: 80px; width: 400px;">{{ userDetail?.realName }} <p style="padding-right: 80px; width: 400px;">{{ userDetail?.realName }}
<nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xl"></nz-badge> <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xs"></nz-badge>
<nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"></nz-badge> <nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xs"></nz-badge>
</p> </p>
<div style="margin-right: 24px;"> <div style="margin-right: 24px;">
<button *ngIf="userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzType="primary" <button *ngIf="userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzType="primary"
@ -217,7 +217,7 @@
<input nz-input type="text" [(ngModel)]="licenseDetail.licenseNo" [readonly]="!isEditDriver" <input nz-input type="text" [(ngModel)]="licenseDetail.licenseNo" [readonly]="!isEditDriver"
[nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'"> [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
</sv> </sv>
<!-- <sv label="公司所在地" > <sv label="公司所在地" >
<ng-container *ngIf="isEditDriver; else cascaderelseTemplate"> <ng-container *ngIf="isEditDriver; else cascaderelseTemplate">
<nz-select [(ngModel)]="licenseDetail.regionCode"> <nz-select [(ngModel)]="licenseDetail.regionCode">
<ng-container *ngFor="let item of adressCodeList"> <ng-container *ngFor="let item of adressCodeList">
@ -228,7 +228,7 @@
<ng-template #cascaderelseTemplate> <ng-template #cascaderelseTemplate>
{{licenseDetail?.regionCodeName }} {{licenseDetail?.regionCodeName }}
</ng-template> </ng-template>
</sv> --> </sv>
<sv label="发证日期" col="2"> <sv label="发证日期" col="2">
<nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" " <nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
[nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;"

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

@ -323,7 +323,12 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
return; return;
} }
} }
if (!licenseDetail.licenseNo || !licenseDetail.regionCode || !licenseDetail.validStartTime) { if (!driverDetail.licenseNo || !driverDetail.driverModel || !driverDetail.validStartTime || !driverDetail.signingOrganization || !driverDetail.certificatePhotoWatermark) {
this.service.msgSrv.warning('请完善驾驶证信息');
return;
}
if (!licenseDetail.licenseNo || !licenseDetail.validStartTime || !licenseDetail.certificatePhotoWatermark) {
this.service.msgSrv.warning('请完善从业资格证信息'); this.service.msgSrv.warning('请完善从业资格证信息');
return; return;
} }

6
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-29 15:22:34 * @Date: 2021-11-29 15:22:34
* @LastEditTime : 2022-02-18 16:29:43 * @LastEditTime : 2022-03-09 16:04:08
* @LastEditors : Shiming * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\driver\\driver-config\\driver-config.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\driver\\driver-config\\driver-config.component.html
@ -30,8 +30,8 @@
</nz-card> </nz-card>
<nz-card> <nz-card>
<!-- 数据列表 --> <!-- 数据列表 -->
<st #st [columns]="columns" [data]="service.$api_configPage" [req]="{ params: reqParams }" <st #st [columns]="columns" [scroll]="{ x: '1200px' }"[data]="service.$api_configPage" [req]="{ params: reqParams }"
[loading]="service.http.loading"> [loading]="service.http.loading" [page]={}>
<ng-template st-row="monthFreightAmount" let-item let-index="index"> <ng-template st-row="monthFreightAmount" let-item let-index="index">
<div>{{item?.monthFreightAmount | currency}}</div> <div>{{item?.monthFreightAmount | currency}}</div>
</ng-template> </ng-template>

15
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
View File

@ -103,16 +103,17 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
private initST(): STColumn[] { private initST(): STColumn[] {
return [ return [
// { title: '', type: 'checkbox', className: 'text-center' }, // { title: '', type: 'checkbox', className: 'text-center' },
{ title: '司机姓名', className: 'text-center', index: 'name' }, { title: '司机姓名', className: 'text-center', width: '170px', index: 'name' },
{ title: '手机号', className: 'text-center', index: 'mobile' }, { title: '手机号', className: 'text-center', width: '170px', index: 'mobile' },
{ title: '类型', className: 'text-center', render: 'isCaptain' }, { title: '类型', className: 'text-center', width: '170px',render: 'isCaptain' },
{ title: '月承运金额上限（元）', className: 'text-center', render: 'monthFreightAmount' }, { title: '月承运金额上限（元）', className: 'text-center', width: '200px', render: 'monthFreightAmount' },
{ title: '日提现金额上限（元）', className: 'text-center', render: 'dayWithdrawalAmount' }, { title: '日提现金额上限（元）', className: 'text-center', width: '200px', render: 'dayWithdrawalAmount' },
{ title: '月提现金额上限（元）', className: 'text-center', render: 'monthWithdrawalAmount' }, { title: '月提现金额上限（元）', className: 'text-center', width: '200px', render: 'monthWithdrawalAmount' },
{ title: '月收款金额上限（元）', className: 'text-center', render: 'monthReceivableAmount' }, { title: '月收款金额上限（元）', className: 'text-center', width: '200px', render: 'monthReceivableAmount' },
{ {
title: '操作', title: '操作',
width: '170px', width: '170px',
fixed: 'right',
className: 'text-center', className: 'text-center',
buttons: [ buttons: [
{ {

2
src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-25 16:03:45 * @Date : 2022-01-25 16:03:45
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-01 15:31:23 * @LastEditTime : 2022-03-09 16:17:28
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->