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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-02-11 15:35:33 +08:00
parent bbd47bd2b7
commit fc661bd697
21 changed files with 581 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -149,7 +149,7 @@
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
（运费{{i?.totalFreight | currency}}，
附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate }}%）
附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate * 100 }}%）
</div>
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>

4
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-02-10 14:45:46
* @LastEditTime : 2022-02-11 13:55:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -139,7 +139,7 @@
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
（运费{{i?.totalFreight | currency}}，
附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate }}%）
附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate * 100 }}%）
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>

2
src/app/routes/sys-setting/components/network-freight/network-freight.component.html
View File

@ -64,7 +64,7 @@
<a href="javascript:;" (click)="setMakeInvoice()">设置</a>
</ng-template>
<ng-template st-row="electronicContractAccount" let-item let-index="index">
<a href="javascript:;" (click)="setMakeInvoice()">设置</a>
<a href="javascript:;" (click)="setMakeInvoice2(item)">设置</a>
</ng-template>
<ng-template st-row="bankName" let-item let-index="index">
<a href="javascript:;" (click)="setMakeInvoice()">开通子账户</a>

14
src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
View File

@ -1,7 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { DynamicSettingModalComponent } from '@shared';
import { DynamicSettingModalComponent, SinglepageSettingModalComponent } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { takeLast } from 'rxjs/operators';
import { SystemService } from '../../services/system.service';
@ -411,4 +411,16 @@ export class NetworkFreightComponent implements OnInit {
getRegionDetailByCode(regionCode: any) {
return this.service.request(this.service.$api_get_region_by_code, { regionCode });
}
setMakeInvoice2(item:any) {
this.nzModalService.create({
nzTitle: '基础设置',
nzContent: SinglepageSettingModalComponent,
nzWidth: 900,
nzComponentParams: {
extendType: '1',
businessId: item.id
},
nzFooter: null
});
}
}

4
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html
View File

@ -7,9 +7,9 @@
</div>
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-list']">查询</button>
<button *ngIf="tabType === 1" nz-button nzType="primary" [disabled]="service.http.loading"
(click)="exportList()">导出</button>
(click)="exportList()" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-export']">导出</button>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button nzType="link" (click)="expandToggle(!_$expand)">
{{ !_$expand ? '展开' : '收起' }}

14
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -175,7 +175,12 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
fixed: 'right',
width: '180px',
className: 'text-center',
buttons: [{ text: '查看', click: _record => this.View(_record) }]
buttons: [
{ text: '查看',
click: _record => this.View(_record),
acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] },
}
]
}
];
}
@ -204,7 +209,12 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
fixed: 'right',
width: '180px',
className: 'text-center',
buttons: [{ text: '审核', click: _record => this.ViewAdimin(_record), iif: (item: any) => item.approvalStatus === 10 }]
buttons: [
{ text: '审核',
click: _record => this.ViewAdimin(_record), iif: (item: any) => item.approvalStatus === 10,
acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-adminAudit'] },
}
]
}
];
}

6
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -53,11 +53,11 @@
</ng-container>
<ng-container *ngIf="detailData?.approvalStatus!=10">
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked">
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
启用
</button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked">
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
冻结
</button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
@ -71,7 +71,7 @@
关闭支付权限
</button>
</ng-container>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save']">
修改
</button>
</ng-template>

10
src/app/routes/usercenter/components/freight/list/list.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-09 15:28:00
* @LastEditTime : 2022-02-11 15:08:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\list\\list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -18,9 +18,9 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" (click)="creat()">新增企业</button>
<button nz-button nzType="primary" [disabled]="!loadingList && service.http.loading" [nzLoading]="loadingList" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()">导出</button>
<button nz-button nzType="primary" (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">新增企业</button>
<button nz-button nzType="primary" [disabled]="!loadingList && service.http.loading" [nzLoading]="loadingList" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
@ -50,7 +50,7 @@
{{ item.contacter }}/{{item.mobile}}
</ng-template>
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a (click)="addPromoter(item)">{{ item.promotersTelephone || '添加' }}</a>
<a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone || '添加' }}</a>
</ng-template>
<ng-template st-row="stateCol" let-item let-index="index">
<nz-tag *ngIf="item.stateLocked" nzColor="error">冻结</nz-tag>

3
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -194,16 +194,19 @@ export class FreightComponentsListComponent implements OnInit {
buttons: [
{
text: '查看<br/>',
acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] },
click: item => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
}
},
{
acl: { ability: ['USERCENTER-FREIGHT-LIST-basicSetting'] },
text: '基础设置',
click: item => this.settingAction(item)
},
{
acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
text: '资金账户',
click: item => this.showAccountDetail(item)
}