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

Merge branch 'weiyu' into develop

Browse Source
This commit is contained in:
weiyu
2022-04-29 15:20:40 +08:00
parent f84b034f43 db919672e0
commit 76763a2ca8
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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('选择了已上传，请重新勾选！'); this.service.msgSrv.warning('选择了已上传，请重新勾选！');
return; return;
} }
if(this.selectedRows.find(item => item.checkStatus !== '1')) { // if(this.selectedRows.find(item => item.checkStatus !== '1')) {
this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！'); // this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！');
return; // return;
} // }
let params: any[] = []; let params: any[] = [];
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
params.push(item.id); params.push(item.id);