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:
Taric Xin
2022-04-28 15:15:13 +08:00
parent 88e6dfcd65 c75121ec4d
commit 582795e28b
5 changed files with 114 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -10,9 +10,9 @@
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button> <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4> <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
</div> </div>
<div nz-row> <div class="common-order-header" nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div> <div class="common-grey">网络货运人：{{ i?.shipperAppUserName }}</div>
<div nz-col nzSpan="10"> <div>
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button> [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
@ -21,11 +21,11 @@
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button> [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
</div> </div>
</div> </div>
<div class="mt-sm mb-sm" nz-row> <!-- <div class="mt-sm mb-sm" nz-row>
<div> <div>
<b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b> <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
</div> </div>
</div> </div> -->
<nz-divider></nz-divider> <nz-divider></nz-divider>
<div sv-container> <div sv-container>
<sv label="项目">{{ i?.enterpriseProjectName }}</sv> <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
@ -41,9 +41,9 @@
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button> <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4> <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
</div> </div>
<div nz-row> <div class="common-order-header" nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div> <div class="common-grey">网络货运人：{{ i?.shipperAppUserName }}</div>
<div nz-col nzSpan="10"> <div>
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button> [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
@ -52,13 +52,13 @@
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button> [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
</div> </div>
</div> </div>
<div class="mt-sm mb-sm" nz-row> <!-- <div class="mt-sm mb-sm" nz-row>
<div> <div>
<b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b> <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
</div> </div>
</div> </div> -->
<nz-divider></nz-divider> <nz-divider class="divider-margin"></nz-divider>
<div sv-container> <div class="mb-lg" sv-container>
<sv label="项目">{{ i?.enterpriseProjectName }}</sv> <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
<sv label="截止时间">{{ i?.deadlineTime }}</sv> <sv label="截止时间">{{ i?.deadlineTime }}</sv>
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv> <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
@ -66,8 +66,8 @@
<sv label="服务类型">{{ i?.serviceTypeLabel }} </sv> <sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
</div> </div>
<div class="approval-status"> <div class="approval-status">
<div style="width: 60%; margin: 0 auto"> <div class="step-row">
<nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'"> <nz-steps [nzLabelPlacement]="'vertical'">
<nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution" <nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
[nzDescription]="i?.createTime" nzTitle="下单"></nz-step> [nzDescription]="i?.createTime" nzTitle="下单"></nz-step>
<nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '4' " <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '4' "
@ -80,13 +80,22 @@
</div> </div>
</div> </div>
<div class="mt-md"> <div class="mt-md">
<h4 class="text-md">装货卸货信息 <div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a>
<span>装货卸货信息</span>
<span class="ml-sm text-sm">( <span class="ml-sm text-sm">(
<label>{{ i?.loadingCount || '一' }}装</label> <label>{{ i?.loadingCount || '一' }}装</label>
<label>{{ i?.unloadingCount || '一' }}卸</label> <label>{{ i?.unloadingCount || '一' }}卸</label>
) )
</span> </span>
</h4> </div>
<!-- <h4 class="text-md">装货卸货信息
<span class="ml-sm text-sm">(
<label>{{ i?.loadingCount || '一' }}装</label>
<label>{{ i?.unloadingCount || '一' }}卸</label>
)
</span>
</h4> -->
<div nz-row [nzGutter]="24"> <div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12"> <div nz-col [nzSpan]="12">
<div class="handling-info p-md"> <div class="handling-info p-md">
@ -95,7 +104,7 @@
<div class="handling-info-icon loading-bg">装</div> <div class="handling-info-icon loading-bg">装</div>
<div class="info"> <div class="info">
<h4>装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4> <h4>装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
<p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p> <p class="mb0">联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -109,7 +118,7 @@
<div class="handling-info-icon unloaing-bg">卸</div> <div class="handling-info-icon unloaing-bg">卸</div>
<div class="info"> <div class="info">
<h4>卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4> <h4>卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
<p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p> <p class="mb0">联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -140,6 +149,15 @@
<sv label="用车需求"> <sv label="用车需求">
{{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}<span *ngIf="item.carLength !=='999'">米</span> {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}<span *ngIf="item.carLength !=='999'">米</span>
</sv> </sv>
<sv label="承运司机"
*ngIf="i?.carrierInformationVO?.driverTelephone && (i?.carrierInformationVO?.driverTelephone !== i?.payeePhone)">
{{i?.carrierInformationVO?.driverName || '--'}} / {{i?.carrierInformationVO?.driverTelephone || '--'}} /
{{i?.carrierInformationVO?.driverLicensePlate || '--'}}
</sv>
<sv label="车型车长载重">
{{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
'--')+'吨'}}
</sv>
<!-- <sv label="承运信息"> <!-- <sv label="承运信息">
{{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} / {{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
{{i?.carrierInformationVO?.driverLicensePlate}} {{i?.carrierInformationVO?.driverLicensePlate}}
@ -152,7 +170,11 @@
</nz-card> </nz-card>
<nz-card [nzBorderless]="true" class="mb0" nzTitle="运费信息"> <nz-card [nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a>
<span>运费信息</span>
</div>
<div> <div>
<div nz-row> <div nz-row>
<div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24"> <div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
@ -171,7 +193,11 @@
</div> </div>
</div> </div>
</nz-card> </nz-card>
<nz-card [nzBorderless]="true" class="mb0" nzTitle="关联订单"> <nz-card [nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a>
<span>关联订单</span>
</div>
<sv-container col="5"> <sv-container col="5">
<sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList"> <sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
(<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>) (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
@ -190,7 +216,11 @@
</sv> --> </sv> -->
</sv-container> </sv-container>
</nz-card> </nz-card>
<nz-card [nzBorderless]="true" class="mb0" nzTitle="补充信息"> <nz-card [nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a>
<span>补充信息</span>
</div>
<sv-container> <sv-container>
<sv label="是否回单"> <sv label="是否回单">
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
@ -213,10 +243,14 @@
</sv> </sv>
</sv-container> </sv-container>
</nz-card> </nz-card>
<nz-card [nzBorderless]="true" class="mb0" nzTitle="操作日志"> <nz-card [nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a>
<span>操作日志</span>
</div>
<st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}" <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"> [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [size]="'small'">
</st> </st>
</nz-card> </nz-card>
</div> </div>

2
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less
View File

@ -48,7 +48,7 @@
} }
.handling-info { .handling-info {
min-height: 100px; min-height: 90px;
border: 1px solid #ccc; border: 1px solid #ccc;
.loading-row { .loading-row {

123
src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -6,39 +6,6 @@
<i nz-icon nzType="left" nzTheme="outline"></i> <i nz-icon nzType="left" nzTheme="outline"></i>
</button> </button>
</ng-template> </ng-template>
<ng-template #headerContent>
<div class="mb-xs" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
</div>
<div nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
<div nz-col nzSpan="10">
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
<button nz-button (click)="updateGoodsSource(i)"
*ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
</div>
</div>
<div class="mt-sm mb-sm" nz-row>
<div>
<b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency }}</span></b>
</div>
</div>
<nz-divider></nz-divider>
<div sv-container *ngIf="i">
<sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
<sv label="项目">{{ i?.enterpriseProjectName }}</sv>
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
<sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
<sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
</div>
</ng-template>
</page-header-wrapper> </page-header-wrapper>
<nz-card [nzBorderless]="true" class="mb0"> <nz-card [nzBorderless]="true" class="mb0">
<div class="mb-xs" nz-row> <div class="mb-xs" nz-row>
@ -85,52 +52,24 @@
</nz-steps> </nz-steps>
</div> </div>
</div> </div>
</nz-card>
<nz-card [nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a>
<span>基本信息</span>
</div>
<sv-container col="2">
<!-- <sv-title>货物信息</sv-title> -->
<ng-container *ngFor="let item of i?.goodsInfoVOList">
<sv label="货物名称">
{{ item.goodsTypeName }} - {{ item.goodsName }}
</sv>
<sv label="货物数量"> {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 </sv>
</ng-container>
</sv-container>
<sv-container class="mt-md">
<!-- <sv-title>承运信息</sv-title> -->
<sv label="司机姓名">
{{ i?.carrierInformationVO?.driverName }}
</sv>
<sv label="手机号">
{{ i?.carrierInformationVO?.driverTelephone }}
</sv>
<sv label="车牌号">
{{ i?.carrierInformationVO?.driverLicensePlate }}
</sv>
</sv-container>
<sv-container>
<sv label="承运司机" *ngIf="i?.carrierInformationVO.driverTelephone !== i?.payeePhone">
{{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} /
{{i?.carrierInformationVO.driverLicensePlate || '--'}}
</sv>
<sv label="车型车长载重">
{{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
'--')+'吨'}}
</sv>
</sv-container>
<div class="mt-md"> <div class="mt-md">
<h4 class="text-md">装货卸货信息 <!-- <h4 class="text-md">装货卸货信息
<span class="ml-sm text-sm">( <span class="ml-sm text-sm">(
<label>{{ i?.loadingCount }}装</label> <label>{{ i?.loadingCount }}装</label>
<label>{{ i?.unloadingCount }}卸</label> <label>{{ i?.unloadingCount }}卸</label>
) )
</span> </span>
</h4> </h4> -->
<div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a>
<span>装货卸货信息</span>
<span class="ml-sm text-sm">(
<label>{{ i?.loadingCount }}装</label>
<label>{{ i?.unloadingCount }}卸</label>
)
</span>
</div>
<div nz-row [nzGutter]="24"> <div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12"> <div nz-col [nzSpan]="12">
<div class="handling-info p-md"> <div class="handling-info p-md">
@ -168,6 +107,42 @@
</div> </div>
</nz-card> </nz-card>
<nz-card [nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a>
<span>基本信息</span>
</div>
<sv-container col="2">
<!-- <sv-title>货物信息</sv-title> -->
<ng-container *ngFor="let item of i?.goodsInfoVOList">
<sv label="货物名称">
{{ item.goodsTypeName }} - {{ item.goodsName }}
</sv>
<sv label="货物数量"> {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 </sv>
<sv label="承运司机" *ngIf="i?.carrierInformationVO?.driverTelephone !== i?.payeePhone">
{{i?.carrierInformationVO?.driverName || '--'}} / {{i?.carrierInformationVO?.driverTelephone || '--'}} /
{{i?.carrierInformationVO?.driverLicensePlate || '--'}}
</sv>
<sv label="车型车长载重">
{{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
'--')+'吨'}}
</sv>
</ng-container>
</sv-container>
<!-- <sv-container class="mt-md">
<sv-title>承运信息</sv-title>
<sv label="司机姓名">
{{ i?.carrierInformationVO?.driverName }}
</sv>
<sv label="手机号">
{{ i?.carrierInformationVO?.driverTelephone }}
</sv>
<sv label="车牌号">
{{ i?.carrierInformationVO?.driverLicensePlate }}
</sv>
</sv-container> -->
</nz-card>
<nz-card [nzBorderless]="true" class="mb0"> <nz-card [nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title"> <div class="font-weight-blod text-md detail-title">
<a class="sign"></a> <a class="sign"></a>
@ -206,7 +181,7 @@
</st> </st>
<div class="freight-info-box mt-md" nz-row> <div class="freight-info-box mt-md" nz-row>
<div nz-col nzSpan="24"> <div nz-col nzSpan="24">
<h3> <h3 class="mb0">
<label>总计 :</label> <label>总计 :</label>
<span class="text-error-dark text-xl"> <span class="text-error-dark text-xl">
{{ i?.totalAmount | currency }} {{ i?.totalAmount | currency }}
@ -251,7 +226,7 @@
</div> </div>
<st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}" <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"> [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [size]="'small'">
<ng-template st-row="operator" let-item> <ng-template st-row="operator" let-item>
<div> <div>
{{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }} {{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }}

3
src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less
View File

@ -48,7 +48,7 @@
} }
.handling-info { .handling-info {
min-height: 176px; min-height: 100px;
border: 1px solid #ccc; border: 1px solid #ccc;
.loading-row { .loading-row {
@ -79,6 +79,7 @@
.time-info { .time-info {
margin-left: 56px; margin-left: 56px;
margin-bottom: 0;
} }
} }
} }

4
src/styles/theme.less
View File

@ -24,3 +24,7 @@
.ant-btn { .ant-btn {
border-radius: 4px; border-radius: 4px;
} }
.ant-card-body {
padding: 16px;
}