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-02-21 16:23:08 +08:00
parent f855154875 488f4c5f6b
commit 2c70028eb3
16 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -640,13 +640,14 @@ resourceStatus: any;
*变更运费
*/
updateFreight(item: any) {
console.log(item?.isFreightChangeApplication)
this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => {
if (data) {
const modal = this.modal.create({
nzTitle: '变更运费',
nzWidth: 580,
nzContent: VehicleUpdateFreightComponent,
nzComponentParams: { data: { ...data, id: item.id } },
nzComponentParams: { data: { ...data, id: item.id,isFreightChangeApplication: item?.isFreightChangeApplication } },
nzFooter: null,
// nzOnOk: sin => {
// this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {

6
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-24 16:40:01
* @LastEditTime : 2022-02-21 14:44:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -33,10 +33,10 @@
<div>
<p style="font-size: 16px">
<span style="font-weight: bolder"
>总运费：<span style="color: #dc112a">{{ data.totalFreight |currency }}</span></span
>总运费：<span style="color: #dc112a">{{ data.totalAmount |currency }}</span></span
>
</p>
<p style="margin-bottom: 0"> 运输费：{{ data.freight |currency }}，附加费：{{ data.surcharge |currency}}</p>
<p style="margin-bottom: 0"> 运输费：{{ data.totalFreight |currency }}，附加费：{{ data.totalSurcharge |currency}}</p>
</div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>

2
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-02-11 11:08:42
* @LastEditTime : 2022-02-21 14:27:51
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->

8
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-02-14 09:34:18
* @LastEditTime : 2022-02-21 14:27:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -122,7 +122,11 @@ export class VehicleUpdateFreightComponent implements OnInit {
}
save(value: any): void {
if (!this.sf.valid) {
if (this.data.isFreightChangeApplication) {
this.service.msgSrv.error('变更申请未处理，请勿重复申请！');
return;
}
if (!this.save) {
this.service.msgSrv.error('请填写必填项！');
return;
}

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

@ -13,9 +13,9 @@
<div nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
<div nz-col nzSpan="10">
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)">再下一单</button>
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
</div>
</div>
<div class="mt-sm mb-sm" nz-row>

6
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
View File

@ -220,9 +220,9 @@
</nz-card>
<nz-card>
<div class="align-center">
<button nz-button nzType="primary" (click)="submitConfirm('qrcode')">生成二维码</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')">指派熟车</button>
<button nz-button nzType="primary" (click)="submitConfirm('qrcode')" acl [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER- QRCode']">生成二维码</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')" acl [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-bulkDesignate']">指派熟车</button>
<!-- <button nz-button nzType="primary" (click)="choose()">取消</button> -->
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')">司机抢单</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" acl [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-bulkAnotherOrder']">司机抢单</button>
</div>
</nz-card>

6
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
View File

@ -241,8 +241,8 @@
<nz-card>
<div class="align-center">
<!-- <button nz-button nzType="primary" (click)="choose()">取消</button> -->
<button nz-button nzType="primary" (click)="submitConfirm('qrcode')">生成二维码</button>
<button nz-button nzType="primary" (click)="submitConfirm('assign')">指派熟车</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')">司机抢单</button>
<button nz-button nzType="primary" (click)="submitConfirm('qrcode')" acl [acl-ability]="['SUPPLY-BULK-RELEASE-QRCode ']">生成二维码</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')" acl [acl-ability]="['SUPPLY-BULK-RELEASE-consignBulkAssign']">指派熟车</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" acl [acl-ability]="['SUPPLY-BULK-RELEASE-consignBulk']">司机抢单</button>
</div>
</nz-card>

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

@ -31,7 +31,7 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['SUPPLY-INDEX-bulkSearch']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导入</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -44,8 +44,8 @@
</nz-card>
<ng-template #extraTemplate>
<div>
<button (click)="audit('', 2)" nz-button nzType="primary">批量审核</button>
<button (click)="releaseGoods()" nz-button nzType="primary">代发货源</button>
<button (click)="audit('', 2)" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-bulkBatchAudit']">批量审核</button>
<button (click)="releaseGoods()" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-bulkUndertakesToSupply']">代发货源</button>
</div>
</ng-template>
<nz-card>

6
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -303,7 +303,8 @@ export class SupplyManagementBulkComponent implements OnInit {
{
text: '货源审核',
click: (_record) => this.audit(_record, 1),
iif: item => item.auditStatus === '1'
iif: item => item.auditStatus === '1',
acl: { ability: ['SUPPLY-INDEX-bulkBatchAudit'] },
},
{
text: '二维码　',
@ -314,15 +315,18 @@ export class SupplyManagementBulkComponent implements OnInit {
text: '修改单价',
click: (_record) => this.modification(_record),
iif: item => item.resourceStatus == 1 ,
acl: { ability: ['SUPPLY-INDEX-modificationUnitPrice'] },
},
{
text: '取消货源',
click: (_record) => this.delOne(_record),
iif: item => item.resourceStatus == 1,
acl: { ability: ['SUPPLY-INDEX-bulkCancelSupply'] },
},
{
text: '再下一单',
click: (_record) => this.nextOrder(_record),
acl: { ability: ['SUPPLY-INDEX-bulkPlaceOrder'] },
},
],
},

23
src/app/routes/supply-management/components/index/index.component.html
View File

@ -1,18 +1,15 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
* @LastEditTime : 2022-02-21 13:25:09
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\index\\index.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper title="货源管理" [tab]="tpTab">
</page-header-wrapper>
<!-- <ng-template #headerTemplate>
<div>
<nz-tabset [(nzSelectedIndex)]="selectedIndex">
<nz-tab nzTitle="整车货源">
<app-supply-management-vehicle></app-supply-management-vehicle>
</nz-tab>
<nz-tab nzTitle="大宗货源">
<app-supply-management-bulk></app-supply-management-bulk>
</nz-tab>
</nz-tabset>
</div>
</ng-template> -->
<ng-template #tpTab>
<nz-tabset [(nzSelectedIndex)]="selectedIndex">
<nz-tab nzTitle="整车货源">

10
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -135,7 +135,7 @@
<div nz-row [nzGutter]="24" style="margin-top: 24px">
<div nz-col [nzSpan]="10">
<nz-form-item>
<nz-form-label [nzSpan]="3" nzRequired>装货时间</nz-form-label>
<nz-form-label [nzSpan]="5" nzRequired>装货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货时间'">
<nz-date-picker
nzShowTime
@ -150,7 +150,7 @@
<div nz-col [nzSpan]="4"></div>
<div nz-col [nzSpan]="10">
<nz-form-item>
<nz-form-label [nzSpan]="3" nzRequired>卸货时间</nz-form-label>
<nz-form-label [nzSpan]="5" nzRequired>卸货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入卸货时间'">
<nz-date-picker
nzShowTime
@ -354,11 +354,11 @@
<div class="align-center">
<button nz-button nzType="primary" *ngIf="this.PageStatus == '整车修改'" (click)="goBack()">取消</button>
<button *ngIf="this.PageStatus == '整车修改'" nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm()"
>提交修改</button
acl [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交修改</button
>
<button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="submitConfirm('assign')">指派熟车</button>
<button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="submitConfirm('assign')" acl [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleDesignate']">指派熟车</button>
<button *ngIf="this.PageStatus == '整车下一单'" nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm()"
>司机抢单</button
acl [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder']">司机抢单</button
>
</div>
</nz-card>

4
src/app/routes/supply-management/components/release-publish/release-publish.component.html
View File

@ -364,7 +364,7 @@
</nz-card>
<nz-card>
<div class="align-center">
<button nz-button nzType="primary" (click)="submitConfirm('assign')">指派熟车</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" *ngIf="type === 'add'">司机抢单</button>
<button nz-button nzType="primary" (click)="submitConfirm('assign')" acl [acl-ability]="['SUPPLY-VEHICLE-RELEASE-bulkDesignate']">指派熟车</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" *ngIf="type === 'add'" acl [acl-ability]="['SUPPLY-VEHICLE-RELEASE-bulkDriverOrder']">司机抢单</button>
</div>
</nz-card>

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

@ -13,11 +13,11 @@
<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'">取消货源</button>
<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'">重新指派</button>
<button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'">修改货源</button>
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)">再下一单</button>
*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'" 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>

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

@ -17,9 +17,8 @@
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['SUPPLY-INDEX-vehicleSearch']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -69,9 +68,9 @@
</nz-card>
<ng-template #extraTemplate>
<div>
<button (click)="audit('', 2)" nz-button nzType="primary">批量审核</button>
<button (click)="releaseGoods()" nz-button nzType="primary">代发货源</button>
<button (click)="importGoodsSource()" nz-button nzType="primary">导入货源</button>
<button (click)="audit('', 2)" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-vehicleBatchAudit']">批量审核</button>
<button (click)="releaseGoods()" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-vehicleUndertakesToSupply']">代发货源</button>
<button (click)="importGoodsSource()" nz-button nzType="primary" >导入货源</button>
</div>
</ng-template>

15
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -573,12 +573,14 @@ export class SupplyManagementVehicleComponent implements OnInit {
{
text: '货源审核',
click: _record => this.audit(_record, 1),
iif: item => item.auditStatus === '1'
iif: item => item.auditStatus === '1',
acl: { ability: ['SUPPLY-INDEX-vehicleBatchAudit'] },
},
{
text: '修改货源',
click: _record => this.amend(_record),
iif: item => item.resourceStatus === '1'
iif: item => item.resourceStatus === '1',
acl: { ability: ['SUPPLY-INDEX-vehicleModificationSupply'] },
},
// {
// text: '修改运费',
@ -588,16 +590,19 @@ export class SupplyManagementVehicleComponent implements OnInit {
{
text: '取消货源',
click: _record => this.cancleGoodsSource(_record),
iif: item => item.resourceStatus === '1'
iif: item => item.resourceStatus === '1',
acl: { ability: ['SUPPLY-INDEX-vehicleCancelSupply'] },
},
{
text: '再下一单',
click: _record => this.nextOrder(_record)
click: _record => this.nextOrder(_record),
acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] },
},
{
text: '重新指派　',
click: _record => this.assignedCar(_record),
iif: item => item.resourceStatus === '1' && item.serviceType === '2'
iif: item => item.resourceStatus === '1' && item.serviceType === '2',
acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] },
}
]
}

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

@ -86,12 +86,13 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
settingAction(item?: any) {
this.modal.create({
nzTitle: '基础设置',
nzTitle: '配置',
nzContent: DynamicSettingModalComponent,
nzWidth: 900,
nzComponentParams: {
extendType: '4',
businessId: item.id
extendType: '3',
businessId: item.id,
configvalue: 'sys.config'
},
nzFooter: null
});