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-04-29 15:31:38 +08:00
parent 2fbfc74811 80c2b51e12
commit 23d6ad6150
10 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html
View File

@ -6,6 +6,11 @@
<ng-template st-row="checkStatus" let-item>
<span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
</ng-template>
<ng-template st-row="fieldValue" let-item>
<ellipsis lines="3" tooltip>
<div>{{item?.fieldValue}}</div>
</ellipsis>
</ng-template>
</st>
</div>

2
src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts
View File

@ -55,7 +55,7 @@ export class DatatableReportingFundInfoComponent implements OnInit {
1: '是',
},
},
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', },
{ title: '上传值', render: 'fieldValue', className: 'text-center', width: '15%', },
{
title: '本地校验',
render: 'checkStatus',

5
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html
View File

@ -12,6 +12,11 @@
<ng-template st-row="checkStatus" let-item>
<span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
</ng-template>
<ng-template st-row="fieldValue" let-item>
<ellipsis lines="3" tooltip>
<div>{{item?.fieldValue}}</div>
</ellipsis>
</ng-template>
</st>
</div>
</div>

2
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
View File

@ -62,7 +62,7 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
1: '是'
}
},
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
{ title: '上传值', render: 'fieldValue', className: 'text-center', width: '150px', },
{
title: '本地校验', render: 'checkStatus', className: 'text-center', width: '100px',
// type: 'enum',

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

@ -13,8 +13,7 @@
</nz-card>
<nz-card>
<div class="card-title"x
>装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
<div class="card-title">装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
>
<form #ngForm="ngForm" nz-form role="form">

21
src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
View File

@ -17,9 +17,10 @@
<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()" acl [acl-ability]="['TAX-ORDERREPORT-search']">查询</button>
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
acl [acl-ability]="['TAX-ORDERREPORT-search']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="resetSF()" acl [acl-ability]="['TAX-ORDERREPORT-export']">导出</button>
<button nz-button (click)="resetSF()" acl [acl-ability]="['TAX-ORDERREPORT-export']">导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -43,7 +44,7 @@
<span *ngIf="item?.putStatus == '0'">待上传</span>
<span *ngIf="item?.putStatus == '1'">已上传</span>
<span *ngIf="item?.putStatus == '3'">上传中</span>
<span *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">上传异常</span>
<span *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">上传异常</span>
</ng-template>
<ng-template st-row="checkStatus" let-item let-index="index">
@ -51,11 +52,11 @@
<span *ngIf="item?.checkStatus == '0'">校验中</span>
<span *ngIf="item?.checkStatus == '1'">通过</span>
<!-- <span *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="unnormal(item)">不通过</span> -->
<span *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</span>
<a *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</a>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
</ng-template>
<!-- <ng-template st-row="localValid" let-item let-index="index">
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
@ -100,9 +101,11 @@
已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div>
<button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-upload']">上传</button>
<button nz-button nzType="primary" (click)="recall() " acl [acl-ability]="['TAX-ORDERREPORT-recall']">撤回</button>
<button nz-button nzType="primary" (click)="resetData()" acl [acl-ability]="['TAX-ORDERREPORT-resetData']">更新数据</button>
<button nz-button nzType="primary" (click)="uploadSetting()" acl [acl-ability]="['TAX-ORDERREPORT-uploadSetting']">税务设置</button>
<button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-upload']">上传</button>
<button nz-button nzType="primary" (click)="recall() " acl [acl-ability]="['TAX-ORDERREPORT-recall']">撤回</button>
<button nz-button nzType="primary" (click)="resetData()" acl
[acl-ability]="['TAX-ORDERREPORT-resetData']">更新数据</button>
<button nz-button nzType="primary" (click)="uploadSetting()" acl
[acl-ability]="['TAX-ORDERREPORT-uploadSetting']">税务设置</button>
</div>
</ng-template>

8
src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
View File

@ -445,10 +445,10 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.warning('选择了已上传，请重新勾选！');
return;
}
if(this.selectedRows.find(item => item.checkStatus !== '1')) {
this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！');
return;
}
// if(this.selectedRows.find(item => item.checkStatus !== '1')) {
// this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！');
// return;
// }
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);

21
src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html
View File

@ -1,5 +1,5 @@
<!--
* @Description :
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-31 11:10:10
@ -15,22 +15,19 @@
</nz-tabset>
</div>
<div style="width: 90%">
<st
#st
[scroll]="{ x: '1000px', y: '600px' }"
[data]="service.$api_get_getTaxFieldCheckList"
[columns]="columns"
[req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data', total: 'data' } , process: afterRes}"
[page]="{ show: false }"
[loading]="false"
[bordered]="true"
>
<st #st [scroll]="{ x: '1000px', y: '600px' }" [data]="service.$api_get_getTaxFieldCheckList" [columns]="columns"
[req]="{ process: beforeReq }" [res]="{ reName: { list: 'data', total: 'data' } , process: afterRes}"
[page]="{ show: false }" [loading]="false" [bordered]="true">
<ng-template st-row="freightDetails" let-item>
<div *ngFor="let item of item.freightDetails">
<div>{{ item.expenseName }}:{{ item.price | currency }} </div>
</div>
</ng-template>
<ng-template st-row="fieldValue" let-item>
<ellipsis lines="3" tooltip>
<div>{{item?.fieldValue}}</div>
</ellipsis>
</ng-template>
</st>
</div>
</div>

35
src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts
View File

@ -1,5 +1,5 @@
/*
* @Description :
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-30 14:26:01
@ -48,25 +48,26 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
// }
// return params;
// }
beforeReq = (requestOptions: STRequestOptions) => {let a: string = '';
beforeReq = (requestOptions: STRequestOptions) => {
let a: string = '';
switch (this.subjectType) {
case '0':
a = this.record?.networkTransporterId;
break
a = this.record?.networkTransporterId;
break
case '1':
a = this.record?.shipperId;
break
a = this.record?.shipperId;
break
case '2':
a = this.record?.driverId;
break
a = this.record?.driverId;
break
case '3':
a = this.record?.wayBillId;
break
a = this.record?.wayBillId;
break
}
Object.assign(requestOptions.body, {
subjectId: a ,
subjectType: this.subjectType,
});
Object.assign(requestOptions.body, {
subjectId: a,
subjectType: this.subjectType,
});
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
@ -80,7 +81,7 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
ngOnInit(): void {
console.log(this.record);
this.initST();
}
@ -102,7 +103,7 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
1: '是'
}
},
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
{ title: '上传值', render: 'fieldValue', className: 'text-center', width: '150px', },
{
title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
type: 'enum',
@ -126,7 +127,7 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
selectTab(e: any) {
setTimeout(() => {
console.log(e?.value);
this.subjectType = e?.value;
console.log(this.subjectType);
this.st.load(1);