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:
潘晓云
2022-04-19 16:22:21 +08:00
parent 867e2cc4ba 49865f6426
commit f20df8ac89
22 changed files with 247 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html
View File

@ -5,7 +5,7 @@
<div class="chooseBox">
<button nz-button nzType="primary" (click)="exportFun()">导出</button>
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['busiindex-tabel']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label>
@ -27,7 +27,7 @@
<ng-template #extraTemplate01>
<div class="chooseBox">
<div class="timeBox">
<nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()">
<nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()" acl [acl-ability]="['busiindex-report']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
</nz-radio-group>

2
src/app/routes/datatable/components/compliance/customer/customer.component.html
View File

@ -19,7 +19,7 @@
<ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
<div class="chooseBox">
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['customer-search']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label>

2
src/app/routes/datatable/components/compliance/index/index.component.html
View File

@ -9,7 +9,7 @@
<div nz-col nzSpan="6">
<div class="chooseBox">
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['index-lRateQualified']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
</nz-radio-group>

2
src/app/routes/datatable/components/compliance/salesman/salesman.component.html
View File

@ -20,7 +20,7 @@
<ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
<div class="chooseBox">
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['salesman-ComplianceReportPage']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label>

6
src/app/routes/datatable/components/customtable/customindex/customindex.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-06 13:20:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-14 15:43:56
* @LastEditTime : 2022-04-19 15:52:16
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -32,7 +32,7 @@
<ng-template #extraTemplate>
<div class="chooseBox">
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['customindex-client']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label>
@ -80,7 +80,7 @@
<ng-template #extraTemplate01>
<div class="chooseBox">
<div class="timeBox">
<nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()">
<nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()" acl [acl-ability]="['customindex-totalAdd']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
</nz-radio-group>

4
src/app/routes/datatable/components/customtable/driver/driver.component.html
View File

@ -9,8 +9,8 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"acl [acl-ability]="['driver-search']">查询</button>
<button nz-button (click)="resetSF()" >重置</button>
<!-- <button nz-button (click)="export()">导出</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}

4
src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-30 17:57:46
* @LastEditors : Shiming
* @LastEditTime : 2022-04-18 16:45:14
* @LastEditTime : 2022-04-19 15:09:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\mancustomtable\\mancustomtable.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -24,7 +24,7 @@
<ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
<div class="chooseBox">
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['mancustomtable-search']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label>

174
src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts
View File

@ -19,7 +19,7 @@ export class DatatableMancustomtableComponent implements OnInit {
mode = 'year';
date: any = null;
defineDate = [];
columns: STColumn[] =[];
columns: STColumn[] = [];
resourceStatus: number = 1;
time: any = ['2022-01-01 00:00:00'];
dateFormat = 'yyyy';
@ -61,41 +61,139 @@ export class DatatableMancustomtableComponent implements OnInit {
}
}
};
initST() {
this.columns =[
{ title: '部门', index: 'department', className: 'text-center', width: '200px' },
{ title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' },
{ title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px', iif: ()=> {
console.log(this.resourceStatus);
return this.resourceStatus !== 1
} },
{ title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '100px' },
{ title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '100px' },
{ title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '100px' },
{ title: '活跃合伙人数', index: 'aliveCount', className: 'text-center', width: '100px' },
{ title: '沉默合伙人数', index: 'silentCount', className: 'text-center', width: '100px' },
{ title: '流失合伙人数', index: 'drainCount', className: 'text-center', width: '100px' },
{ title: '未激活合伙人数', index: 'notActiveCount', className: 'text-center', width: '100px' },
initST() {
this.columns = [
{ title: '部门', index: 'department', className: 'text-center', width: '150px' },
{ title: '业务员', index: 'salesmen', className: 'text-center', width: '150px' },
{
title: '已认证货主数',
index: 'certifiedCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 1 ? false : true;
}
},
{
title: '已认证合伙人',
index: 'certifiedCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 2 ? false : true;
}
},
{
title: '新增合伙人数',
index: 'addCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 2 ? false : true;
}
},
{
title: '合伙人活跃率',
index: 'alivePer',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 2 ? false : true;
}
},
{
title: '活跃合伙人数',
index: 'aliveCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 2 ? false : true;
}
},
{
title: '沉默合伙人数',
index: 'silentCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 2 ? false : true;
}
},
{
title: '流失合伙人数',
index: 'drainCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 2 ? false : true;
}
},
{
title: '未激活合伙人数',
index: 'notActiveCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 2 ? false : true;
}
},
{ title: '新增货主数', index: 'addCount', className: 'text-center', width: '100px' },
{ title: '货主活跃率', index: 'alivePer', className: 'text-center', width: '100px' },
{
title: '活跃货主数',
index: 'aliveCount',
className: 'text-center',
width: '100px'
},
{ title: '沉默货主数', index: 'silentCount', className: 'text-center', width: '100px' },
{
title: '流失货主数',
index: 'drainCount',
className: 'text-right',
width: '100px',
},
{ title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' }
];
}
{
title: '新增货主数',
index: 'addCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 1 ? false : true;
}
},
{
title: '货主活跃率',
index: 'alivePer',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 1 ? false : true;
}
},
{
title: '活跃货主数',
index: 'aliveCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 1 ? false : true;
}
},
{
title: '沉默货主数',
index: 'silentCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 1 ? false : true;
}
},
{
title: '流失货主数',
index: 'drainCount',
className: 'text-right',
width: '150px',
iif: () => {
return this?.resourceStatus !== 1 ? false : true;
}
},
{
title: '未激活货主数',
index: 'notActiveCount',
className: 'text-center',
width: '150px',
iif: () => {
return this?.resourceStatus !== 1 ? false : true;
}
}
];
}
/**
* 查询参数
*/
@ -238,12 +336,10 @@ export class DatatableMancustomtableComponent implements OnInit {
}
selectChange(e: number) {
console.log(e);
this.resourceStatus = e + 1;
// this.initST();
setTimeout(() => {
this.initST();
// this.st.load(1);
this.st?.resetColumns();
this.st?.load(1);
}, 500);
}
}

2
src/app/routes/datatable/components/customtable/owner/owner.component.html
View File

@ -9,7 +9,7 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl [acl-ability]="['owner-search']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<!-- <button nz-button (click)="export()">导出</button> -->
<button nz-button nzType="link" (click)="expandToggle()">

4
src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
View File

@ -6,7 +6,7 @@
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf mode="search" [schema]="schema" [button]="'none'">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
(click)="st?.load(1)" acl [acl-ability]="['companyStaff-search']">查询</button>
(click)="st?.load(1)" acl [acl-ability]="['partnertable-search']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</sf>
</div>
@ -18,7 +18,7 @@
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
(click)="st?.load(1)" acl [acl-ability]="['companyStaff-search']">查询</button>
(click)="st?.load(1)" acl [acl-ability]="['partnertable-search']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}

48
src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts
View File

@ -8,7 +8,7 @@ import { DataService } from '../../../services/data.service';
@Component({
selector: 'app-datatable-partnertable',
templateUrl: './partnertable.component.html',
templateUrl: './partnertable.component.html'
})
export class DatatablePartnertableComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent;
@ -24,7 +24,7 @@ export class DatatablePartnertableComponent implements OnInit {
public service: DataService,
private modalSrv: NzModalService,
private modal: ModalHelper,
private envSrv: EAEnvironmentService,
private envSrv: EAEnvironmentService
) {}
/**
@ -47,7 +47,7 @@ export class DatatablePartnertableComponent implements OnInit {
* 选中行
*/
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
return this.st?.list.filter(item => item.checked) || [];
}
/**
@ -60,17 +60,17 @@ export class DatatablePartnertableComponent implements OnInit {
/**
* 重置表单
*/
resetSF() {
resetSF() {
this.sf.reset();
this._$expand = false;
this.isLoading = true
this.isLoading = true;
}
/**
* 程序初始化入口
*/
ngOnInit() {
this.initSF();
this.initST()
this.initST();
}
/**
@ -84,33 +84,37 @@ export class DatatablePartnertableComponent implements OnInit {
title: '合伙人名称',
type: 'string',
ui: { placeholder: '请输入' },
readOnly: false,
readOnly: false
},
phone: {
title: '合伙人类型',
type: 'string',
ui: {
ui: {
widget: 'select',
placeholder: '请输入' },
readOnly: false,
placeholder: '请输入'
},
readOnly: false
},
phone01: {
title: '合伙人状态',
type: 'string',
ui: {
ui: {
widget: 'select',
placeholder: '请输入' },
readOnly: false,
placeholder: '请输入'
},
readOnly: false
},
createTime: {
type: 'string',
title: '注册时间',
ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema,
},
ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: {
_$expand: (value: boolean) => value,
}, } as SFDateWidgetSchema
}
},
type: 'object',
type: 'object'
};
this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } };
this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } };
}
/**
@ -118,7 +122,7 @@ export class DatatablePartnertableComponent implements OnInit {
*/
initST() {
this.columns = [
{ title: '合伙人名称', index: 'name', className: 'text-center' },
{ title: '合伙人名称', index: 'networkTransporterName', className: 'text-center' },
{ title: '注册时间', index: 'telephone', className: 'text-center' },
{ title: '注册时间', index: 'roleName', className: 'text-center' },
{ title: '业务员', index: 'lastLoginDate', className: 'text-center' },
@ -127,23 +131,21 @@ export class DatatablePartnertableComponent implements OnInit {
index: 'stateLocked',
className: 'text-center',
type: 'enum',
enum: { 0: '正常', 1: '冻结' },
enum: { 0: '正常', 1: '冻结' }
},
{ title: '客户数', index: 'lastLoginDate', className: 'text-center' },
{ title: '收益额', index: 'lastLoginDate', className: 'text-center' },
{ title: '已提现金额', index: 'lastLoginDate', className: 'text-center' },
{ title: '订单数', index: 'lastLoginDate', className: 'text-center' },
{ title: '订单金额', index: 'lastLoginDate', className: 'text-center' },
{ title: '应收订单数', index: 'lastLoginDate', className: 'text-center' },
{ title: '应收订单数', index: 'lastLoginDate', className: 'text-center' }
];
}
/**
* 数据列表状态变化事件
*/
change(change: STChange) {
// console.log(change);
}
}

8
src/app/routes/datatable/components/financetable/financetable.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-11 15:52:10
* @LastEditTime : 2022-04-19 16:11:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\financetable\\financetable.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -15,7 +15,7 @@
<div class="chooseBox">
<!-- <button nz-button nzType="primary" (click)="exportFun()">导出</button> -->
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['financetable-table']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label>
@ -69,11 +69,11 @@
<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01>
<div class="chooseBox">
<nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData()">
<nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData()" acl [acl-ability]="['financetable-report']">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
</nz-select>
<div class="timeBox">
<nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()">
<nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()" acl [acl-ability]="['financetable-report']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
</nz-radio-group>

6
src/app/routes/datatable/components/operationtable/operationtable.component.html
View File

@ -3,9 +3,9 @@
<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate">
<ng-template #extraTemplate>
<div class="chooseBox">
<button nz-button nzType="primary" (click)="exportFun()">导出</button>
<button nz-button nzType="primary" (click)="exportFun()" acl [acl-ability]="['operationtable-export']">导出</button>
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['operationtable-table']">
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label>
@ -28,7 +28,7 @@
<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01>
<div class="chooseBox">
<nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData(true)">
<nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData(true)" acl [acl-ability]="['operationtable-operationalReport']">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
</nz-select>
<div class="timeBox">