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-04-19 16:21:55 +08:00
parent ec7374a5fd
commit 9babeb38b1
13 changed files with 36 additions and 24 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"> <div class="chooseBox">
<button nz-button nzType="primary" (click)="exportFun()">导出</button> <button nz-button nzType="primary" (click)="exportFun()">导出</button>
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label> <label nz-radio-button nzValue="date">日</label>
@ -27,7 +27,7 @@
<ng-template #extraTemplate01> <ng-template #extraTemplate01>
<div class="chooseBox"> <div class="chooseBox">
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
</nz-radio-group> </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"> <ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
<div class="chooseBox"> <div class="chooseBox">
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</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 nz-col nzSpan="6">
<div class="chooseBox"> <div class="chooseBox">
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
</nz-radio-group> </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"> <ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
<div class="chooseBox"> <div class="chooseBox">
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</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 * @Author : Shiming
* @Date : 2022-04-06 13:20:56 * @Date : 2022-04-06 13:20:56
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -32,7 +32,7 @@
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div class="chooseBox"> <div class="chooseBox">
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label> <label nz-radio-button nzValue="date">日</label>
@ -80,7 +80,7 @@
<ng-template #extraTemplate01> <ng-template #extraTemplate01>
<div class="chooseBox"> <div class="chooseBox">
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
</nz-radio-group> </nz-radio-group>

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

@ -9,7 +9,7 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <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]="['driver-search']">查询</button>
<button nz-button (click)="resetSF()" >重置</button> <button nz-button (click)="resetSF()" >重置</button>
<!-- <button nz-button (click)="export()">导出</button> --> <!-- <button nz-button (click)="export()">导出</button> -->
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">

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

@ -24,7 +24,7 @@
<ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
<div class="chooseBox"> <div class="chooseBox">
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label> <label nz-radio-button nzValue="date">日</label>

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> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <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)="resetSF()">重置</button>
<!-- <button nz-button (click)="export()">导出</button> --> <!-- <button nz-button (click)="export()">导出</button> -->
<button nz-button nzType="link" (click)="expandToggle()"> <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"> <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf mode="search" [schema]="schema" [button]="'none'"> <sf #sf mode="search" [schema]="schema" [button]="'none'">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" <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 (click)="resetSF()">重置</button>
</sf> </sf>
</div> </div>
@ -18,7 +18,7 @@
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" <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 (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-04-06 10:57:56 * @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\financetable\\financetable.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -15,7 +15,7 @@
<div class="chooseBox"> <div class="chooseBox">
<!-- <button nz-button nzType="primary" (click)="exportFun()">导出</button> --> <!-- <button nz-button nzType="primary" (click)="exportFun()">导出</button> -->
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label> <label nz-radio-button nzValue="date">日</label>
@ -69,11 +69,11 @@
<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01"> <nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01> <ng-template #extraTemplate01>
<div class="chooseBox"> <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-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
</nz-select> </nz-select>
<div class="timeBox"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
</nz-radio-group> </nz-radio-group>

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

@ -3,9 +3,9 @@
<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate"> <nz-card nzTitle="运营报表" [nzExtra]="extraTemplate">
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div class="chooseBox"> <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"> <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="year">年</label>
<label nz-radio-button nzValue="month">月</label> <label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label> <label nz-radio-button nzValue="date">日</label>
@ -28,7 +28,7 @@
<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01"> <nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01> <ng-template #extraTemplate01>
<div class="chooseBox"> <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-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
</nz-select> </nz-select>
<div class="timeBox"> <div class="timeBox">

2
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -1,4 +1,4 @@
<!-- billCode<!--
* @Description : * @Description :
* @Version : 1.0 * @Version : 1.0
* @Author : Shiming * @Author : Shiming

16
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-12 10:52:50 * @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-08 13:51:12 * @LastEditTime : 2022-04-19 16:21:02
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -64,7 +64,7 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false" [loading]="false"
> >
<ng-template st-row="billCode" let-item let-index="index"> <!-- <ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/risk-detail/' + item.id">{{ item.billCode }}</a> <a [routerLink]="'/order-management/risk-detail/' + item.id">{{ item.billCode }}</a>
<div> <div>
<span>{{ item?.representationsStatusLabel }}</span> <span>{{ item?.representationsStatusLabel }}</span>
@ -72,6 +72,18 @@
<div> <div>
<span >{{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}}</span> <span >{{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}}</span>
</div> </div>
</ng-template> -->
<ng-template st-row="billCode" let-item let-index="index">
<!-- <div>{{ item.billCode }}</div> -->
<a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.billType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{ item?.representationsStatusLabel }}</span>
</div>
<div>
<span >{{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}}</span>
</div>
</ng-template> </ng-template>
<ng-template st-row="timeer" let-item let-index="index"> <ng-template st-row="timeer" let-item let-index="index">
<p>创建时间：{{ item?.createTime }}</p> <p>创建时间：{{ item?.createTime }}</p>