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-02-25 17:19:24 +08:00
parent 8d4c408e95 db73552c90
commit 73758b266f
22 changed files with 323 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html
View File

@ -30,6 +30,6 @@
<nz-tab nzTitle="全部"></nz-tab>
</nz-tabset>
<st #st [data]="service.$api_get_abnormal_gold_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_abnormal_gold_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }"></st>
</nz-card>

2
src/app/routes/financial-management/components/advance-collection/advance-collection.component.html
View File

@ -22,7 +22,7 @@
</nz-card>
<nz-card class="content-box">
<st #st [data]="service.$api_get_advance_collection_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_advance_collection_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x: '1200px' }">
</st>
</nz-card>

30
src/app/routes/financial-management/components/cost-management/cost-management.component.html
View File

@ -13,16 +13,12 @@
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf
#sf
[schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true"
[button]="'none'"
></sf>
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['FINANCIAL-COST-list']">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
[acl-ability]="['FINANCIAL-COST-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<!-- <button nz-button (click)="exportList()"> 导出</button>
<button nz-button (click)="exportList()"> 导出明细</button> -->
@ -44,14 +40,8 @@
<button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button> -->
</div>
</div>
<st
#st
[data]="service.$api_get_cost_page"
[columns]="columns"
[req]="{ process: beforeReq }"
[loading]="service.http.loading"
[scroll]="{ x: '2000px' }"
>
<st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x: '2000px' }">
<ng-template st-row="armoeny" let-item let-index="index">
{{ item.armoeny | currency }}
</ng-template>
@ -72,12 +62,8 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea
nz-input
rows="3"
placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px; margin-left: 14px"
></textarea>
<textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px; margin-left: 14px"></textarea>
</se>
</div>
</div>

2
src/app/routes/financial-management/components/driver-account/driver-account.component.html
View File

@ -22,7 +22,7 @@
</nz-card>
<nz-card class="content-box">
<st #st [data]="service.$api_get_driver_account_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_driver_account_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x: '1200px' }">
<ng-template st-row="availableBalance" let-item let-index="index">
<a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +

2
src/app/routes/financial-management/components/freight-account/freight-account.component.html
View File

@ -22,7 +22,7 @@
</nz-card>
<nz-card class="content-box">
<st #st [data]="service.$api_get_shipper_account_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_shipper_account_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x: '1200px' }">
<ng-template st-row="description" let-item let-index="index">
<a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +

2
src/app/routes/financial-management/components/payable-order/payable-order.component.html
View File

@ -33,7 +33,7 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
</st>
</nz-card>

2
src/app/routes/financial-management/components/payment-order/payment-order.component.html
View File

@ -34,7 +34,7 @@
</div>
</div>
<st #st [data]="service.$api_get_payment_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_payment_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
</st>
</nz-card>

2
src/app/routes/financial-management/components/payment-record/payment-record.component.html
View File

@ -30,7 +30,7 @@
<nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('5')"></nz-tab>
</nz-tabset>
<st #st [data]="service.$api_get_order_payment_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_order_payment_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }">
<ng-template st-row="orderPaymentCode" let-item let-index="index" let-column="column">
{{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>

2
src/app/routes/financial-management/components/platform-account/platform-account.component.html
View File

@ -52,7 +52,7 @@
</nz-card>
<nz-card class="content-box">
<st #st [data]="service.$api_get_platform_account_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_platform_account_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[scroll]="{ x: '1200px' }" [loading]="service.http.loading">
</st>
</nz-card>

2
src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
View File

@ -40,7 +40,7 @@
</div>
</div>
<st #st [data]="service.$api_get_receipt_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_receipt_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x: '1200px' }" (change)="stChange($event)">
</st>
</nz-card>

2
src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
View File

@ -31,7 +31,7 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_fico_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_fico_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x: '1200px' }" (change)="stChange($event)">
</st>
</nz-card>

2
src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
View File

@ -36,7 +36,7 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_recharge_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_recharge_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }">
<ng-template st-row="transferBankAccount" let-item let-index="index" let-column="column">
{{ item.transferBankOpenName }} <br> {{ item.transferBankCardNumber }}

2
src/app/routes/financial-management/components/refund-record/refund-record.component.html
View File

@ -30,7 +30,7 @@
<nz-tab nzTitle="退款失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
</nz-tabset>
<st #st [data]="service.$api_get_refund_record_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_refund_record_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }">
<ng-template st-row="orderRefundCode" let-item let-index="index" let-column="column">
{{ item.orderRefundCode }} <br> {{ item.refundStatusLabel }}

2
src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html
View File

@ -21,7 +21,7 @@
</nz-card>
<nz-card class="content-box pt-xl" nzBordered>
<st #st [data]="service.$api_get_account_blance" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_account_blance" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x: '1200px' }">
<ng-template st-row="amount">

2
src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
View File

@ -33,7 +33,7 @@
</div> -->
</div>
<st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
</st>
</nz-card>

2
src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
View File

@ -33,7 +33,7 @@
</nz-card>
<nz-card nzBordered>
<st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
</st>
</nz-card>

2
src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
View File

@ -65,7 +65,7 @@
</div>
</ng-template>
<st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{ process: beforeReq }"
<st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
<ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
{{ item.bankName }} <br> {{ item.bankCardNumber }}

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

@ -9,36 +9,82 @@
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'企业审核列表'" [content]="content">
<nz-card class="mb-md">
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 16" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<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"
[class.expend-options]="_$expand">
<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()"
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 ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card>
<!-- 数据列表 -->
<st #st multiSort [data]="service.$api_get_freight_list" [columns]="tabType===1?enterColumns:adminColumns"
[req]="{ process: beforeReq }" [page]=" {}" [loading]="service.http.loading" [scroll]="{ x: '1200px' }">
</st>
</nz-card>
<ng-template #content>
<nz-tabset class="tabs-wrap">
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="changeTab(tab)"> </nz-tab>
</nz-tabset>
</ng-template>
</page-header-wrapper>
<nz-card class="mb-md">
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 16" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<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"
[class.expend-options]="_$expand">
<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()"
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 ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card>
<!-- 数据列表 -->
<st #st multiSort [data]="service.$api_get_freight_list" [columns]="tabType===1?enterColumns:adminColumns"
[req]="{ process: beforeReq }" [page]=" {}" [loading]="service.http.loading" [scroll]="{ x: '1200px' }">
<ng-template st-row="approvalStatus" let-item let-index="index">
<ng-container [ngSwitch]="item.approvalStatus">
<nz-badge *ngSwitchCase="10" nzColor="#108ee9" nzText="待审核"></nz-badge>
<nz-badge *ngSwitchCase="15" nzColor="gold" nzText="已撤销"></nz-badge>
<nz-badge *ngSwitchCase="20" nzColor="#87d068" nzText="已成功"></nz-badge>
<ng-container *ngSwitchCase="30">
<nz-badge nzColor="volcano" nzText="已驳回"></nz-badge><br>
<label style="color: #ff4d4f;">（驳回原因：{{item.approvalOpinion}}）</label>
</ng-container>
<p *ngSwitchDefault></p>
</ng-container>
</ng-template>
</st>
</nz-card>
<ng-template #approvedModal>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="120">
<se [col]="1" label="公司名称">
{{ detailData?.enterpriseName }}
</se>
<se [col]="1" label="网络货运人" required>
<nz-select nzPlaceHolder="请选择" [(ngModel)]="networkTransporter">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of ltdId"></nz-option>
</nz-select>
</se>
<se [col]="1" label="企业角色" required>
<nz-select nzPlaceHolder="请选择" [(ngModel)]="roleId">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of roles"></nz-option>
</nz-select>
</se>
</div>
</div>
</ng-template>
<ng-template #redectModal>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="120">
<se [col]="1" label="公司名称">
{{ detailData?.enterpriseName }}
</se>
<se [col]="1" label="备注" required>
<textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" [(ngModel)]="approvalOpinion"></textarea>
</se>
</div>
</div>
</ng-template>

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

@ -32,6 +32,17 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
isActived: false
}
];
@ViewChild('approvedModal', { static: false })
approvedModal!: any;
@ViewChild('redectModal', { static: false })
redectModal!: any;
ltdId: any = [];
roles: any = [];
detailData: any = null;
approvalOpinion = '';
networkTransporter = null;
roleId = null;
constructor(public service: UsermanageService, private router: Router, private modal: NzModalService) {}
beforeReq = (requestOptions: STRequestOptions) => {
@ -70,7 +81,25 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
/**
* 程序初始化入口
*/
ngOnInit() {}
ngOnInit() {
this.loadltdId();
this.loadRoles();
}
loadltdId() {
this.service.getNetworkFreightForwarder().subscribe(res => {
if (res) {
this.ltdId = res;
}
});
}
loadRoles() {
this.service.getRoles({ enterpriseId: 0, projectId: 0 }).subscribe(res => {
if (res) {
this.roles = res;
}
});
}
/**
* 查看详情
@ -123,6 +152,56 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
});
}
auditPass(item: any) {
this.detailData = item;
this.networkTransporter = null;
this.roleId = null;
this.modal.create({
nzTitle: '审核通过',
nzContent: this.approvedModal,
nzOnOk: () => {
if (!this.networkTransporter || !this.roleId) {
return false;
}
this.auditEnterprise(20);
return;
}
});
}
auditNo(item: any) {
this.detailData = item;
this.approvalOpinion = '';
this.roleId = null;
this.modal.create({
nzTitle: '审核驳回',
nzContent: this.redectModal,
nzOnOk: () => {
if (!this.approvalOpinion) {
return false;
}
this.auditEnterprise(30);
return;
}
});
}
private auditEnterprise(status: number) {
this.service
.request(this.service.$api_audit_freight, {
approvalStatus: status,
id: this.detailData.id,
approvalOpinion: this.approvalOpinion,
networkTransporter: this.networkTransporter,
roleId: this.roleId || null
})
.subscribe(res => {
if (res) {
this.service.msgSrv.success(status === 20 ? '审核通过' : '驳回成功');
}
this.st.load(1);
});
}
View(record: any) {
this.router.navigate([`/usercenter/freight/enterprise/detail/${record.id}`]);
}
@ -159,22 +238,48 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
initEnterST(): STColumn[] {
return [
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
{ title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 190 },
{ title: '管理员', className: 'text-center', index: 'contacter', width: 150 },
{ title: '手机号', className: 'text-center', index: 'mobile', width: 140 },
{ title: '注册时间', className: 'text-center', index: 'createTime', width: 170 },
{ title: '统一社会信用代码', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 },
{
title: '公司所在地',
className: 'text-center',
index: 'province',
width: 200,
format: item => `${item.provinceName}${item.cityName}${item.areaName}`
},
{
title: '企业类型',
className: 'text-center',
index: 'enterpriseType',
width: 200,
type: 'enum',
enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' }
},
{ title: '管理员', className: 'text-center', index: 'contacter', width: 150, format: item => `${item.contacter}<br>/${item.mobile}` },
{
title: '常用服务',
className: 'text-center',
index: 'oftenUsedServices',
type: 'enum',
enum: { 10: '整车发货', 20: '大宗发货' },
width: 140
},
{ title: '业务员', className: 'text-center', index: 'promotersTelephone', width: 150 },
{
title: '注册渠道',
className: 'text-center',
index: 'source',
type: 'enum',
enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' },
width: 130
},
{ title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' },
{ title: '审核时间', className: 'text-center', index: 'approvalTime', width: 180, type: 'date' },
{ title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
{
title: '审核状态',
className: 'text-center',
index: 'approvalStatus',
type: 'badge',
badge: {
10: { text: '待审核', color: 'processing' },
15: { text: '已撤销', color: 'processing' },
20: { text: '已成功', color: 'success' },
30: { text: '审核失败', color: 'warning' }
},
width: 130
render: 'approvalStatus',
width: 160
},
{
title: '常用服务',
@ -190,7 +295,21 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
fixed: 'right',
width: '180px',
className: 'text-center',
buttons: [{ text: '查看', click: _record => this.View(_record), acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] } }]
buttons: [
{ text: '查看', click: _record => this.View(_record), acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] } },
{
text: '通过',
click: _record => this.auditPass(_record),
acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-D-audit'] },
iif: item => item.approvalStatus === 10
},
{
text: '驳回',
click: _record => this.auditNo(_record),
acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-D-audit'] },
iif: item => item.approvalStatus === 10
}
]
}
];
}
@ -250,17 +369,26 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
placeholder: '请输入'
}
},
name: {
contactName: {
title: '管理员',
type: 'string',
ui: {
placeholder: '请输入'
}
},
approval1Status: {
enterpriseType: {
type: 'string',
title: '企业类型',
enum: [{ label: '全部', value: '' }],
enum: [
{ label: '全部', value: '' },
{ label: '物流企业', value: 1 },
{ label: '货运代理', value: 2 },
{ label: '生产型企业', value: 3 },
{ label: '贸易类企业', value: 4 },
{ label: '科技型企业', value: 5 },
{ label: '化学化工企业', value: 6 },
{ label: '其他', value: 7 }
],
default: '',
ui: {
widget: 'select',
@ -269,7 +397,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
}
}
},
approval11Status: {
enterpriseAddressCode: {
type: 'string',
title: '公司所在地',
enum: [{ label: '全部', value: '' }],
@ -281,10 +409,14 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
}
}
},
approval11St1atus: {
oftenUsedServices: {
type: 'string',
title: '常用服务',
enum: [{ label: '全部', value: '' }],
enum: [
{ label: '全部', value: '' },
{ label: '整车发货', value: 10 },
{ label: '大宗发货', value: 20 }
],
default: '',
ui: {
widget: 'select',
@ -293,13 +425,24 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
}
}
},
approval11St11atus: {
// approval11St11atus: {
// type: 'string',
// title: '客户类型',
// enum: [{ label: '全部', value: '' }],
// default: '',
// ui: {
// widget: 'select',
// visibleIf: {
// expand: (value: boolean) => this.tabType === 1 && value
// }
// }
// },
promotersTelephone: {
title: '业务员',
type: 'string',
title: '客户类型',
enum: [{ label: '全部', value: '' }],
default: '',
ui: {
widget: 'select',
placeholder: '请输入',
showRequired: false,
visibleIf: {
expand: (value: boolean) => this.tabType === 1 && value
}
@ -316,6 +459,41 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
}
}
},
approvalUserName: {
title: '审核人',
type: 'string',
maxLength: 11,
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => this.tabType === 1 && value
}
}
},
createTime: {
title: '申请时间',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd HH:mm:ss',
nzShowTime: true,
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
approvalTime: {
title: '审核时间',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd HH:mm:ss',
nzShowTime: true,
visibleIf: {
expand: (value: boolean) => this.tabType === 1 && value
}
} as SFDateWidgetSchema
},
approvalStatus: {
type: 'string',
title: '审核状态',
@ -334,18 +512,21 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
}
}
},
createTime: {
title: '注册时间',
source: {
type: 'string',
title: '注册渠道',
enum: [
{ label: '全部', value: '' },
{ label: '货主注册', value: 1 },
{ label: '平台添加', value: 2 }
],
default: '',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
nzShowTime: true,
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
expand: (value: boolean) => this.tabType === 1 && value
}
} as SFDateWidgetSchema
}
}
}
};

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

@ -123,7 +123,7 @@
<label *ngIf="detailData?.approvalStatus===30" style="color: #ff4d4f;"><i nz-icon nzType="close-circle"
nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{detailData?.approvalOpinion}}
</label>
<label *ngIf="detailData?.isExpired===30" style="color: #fa8c16;">
<label *ngIf="detailData?.isExpired" style="color: #fa8c16;">
<i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
</label>
<p style="margin-bottom: 0;">
@ -250,7 +250,7 @@
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
<sv-title>法人信息
<label *ngIf="detailData?.legalPersonIdentityVO?.isExpired===30" style="color: #fa8c16;">
<label *ngIf="detailData?.legalPersonIdentityVO?.isExpired" style="color: #fa8c16;">
<i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
</label>
</sv-title>
@ -294,7 +294,7 @@
<nz-divider></nz-divider>
<sv-container col="3">
<sv-title>企业管理员信息
<label *ngIf="detailData?.adminUserInfo?.isExpired===30" style="color: #fa8c16;">
<label *ngIf="detailData?.adminUserInfo?.isExpired" style="color: #fa8c16;">
<i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
</label>
</sv-title>

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

@ -52,10 +52,6 @@
<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>
<nz-tag *elseBlock nzColor="success">正常</nz-tag>
</ng-template>
</st>
</nz-card>

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

@ -134,7 +134,7 @@ export class FreightComponentsListComponent implements OnInit {
widget: 'select'
}
},
sou11rce: {
enterpriseAddressCode: {
type: 'string',
title: '公司所在地',
enum: [{ label: '全部', value: '' }],
@ -149,7 +149,11 @@ export class FreightComponentsListComponent implements OnInit {
oftenUsedServices: {
type: 'string',
title: '常用服务',
enum: [{ label: '全部', value: '' }],
enum: [
{ label: '全部', value: '' },
{ label: '整车发货', value: 10 },
{ label: '大宗发货', value: 20 }
],
default: '',
ui: {
widget: 'select',