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-02-21 17:00:23 +08:00
parent 13fab9e062
commit cf6d0c5158
2 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,14 +9,21 @@
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<!-- 搜索表单 --> <!-- 搜索表单 -->
<page-header-wrapper [title]="''"> <page-header-wrapper [title]="''"> </page-header-wrapper>
</page-header-wrapper>
<nz-card> <nz-card>
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 --> <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading" <sf
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf> #sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div> </div>
<!-- 查询字段大于3个时，根据展开状态调整布局 --> <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -25,10 +32,10 @@
<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" [nzLoading]="service.http.loading" <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['ORDER-RECEIPTS-search']"
(click)="search()">查询</button> >查询</button
<button nz-button nzType="primary" [disabled]="service.http.loading" >
>导出</button> <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button> <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -40,13 +47,12 @@
</nz-card> </nz-card>
<nz-card> <nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
[nzTabBarExtraContent]="extraTemplate"> <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
<nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab> <nz-tab [nzTitle]="'待审核(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待审核('+tabs?.receivedQuantity+')'"></nz-tab> <nz-tab [nzTitle]="'已审核(' + tabs?.stayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已审核('+tabs?.stayQuantity+')'"></nz-tab> </nz-tabset>
</nz-tabset> <div style="margin-top: 15px">
<div style="margin-top: 15px;">
<st <st
#st #st
[bordered]="true" [bordered]="true"
@ -59,47 +65,43 @@
[loading]="service.http.loading" [loading]="service.http.loading"
> >
<ng-template st-row="freightPrice" let-item let-index="index"> <ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency}} {{ item.freightPrice | currency }}
</ng-template> </ng-template>
<ng-template st-row="loadingLadingBillFilePath" let-item let-index="index"> <ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
<div> <div>
<span><img style="height: 60px; padding-right: 5px;" [src]="item.loadingLadingBillFilePath" alt=""></span> <span><img style="height: 60px; padding-right: 5px" [src]="item.loadingLadingBillFilePath" alt="" /></span>
<span><img style="height: 60px;" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt=""></span> <span><img style="height: 60px" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt="" /></span>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index"> <ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
<span><img style="height: 60px; padding-right: 5px;" [src]="item.unloadingLadingBillFilePath" alt=""></span> <span><img style="height: 60px; padding-right: 5px" [src]="item.unloadingLadingBillFilePath" alt="" /></span>
<span><img style="height: 60px;" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt=""></span> <span><img style="height: 60px" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt="" /></span>
</ng-template> </ng-template>
<ng-template st-row="loadingTime" let-item let-index="index"> <ng-template st-row="loadingTime" let-item let-index="index">
<div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div> <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
<div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div> <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
</ng-template> </ng-template>
<ng-template st-row="driverName" let-item let-index="index"> <ng-template st-row="driverName" let-item let-index="index">
<div> <div> {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }} </div>
{{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}}
</div>
</ng-template> </ng-template>
<ng-template st-row="payeeName" let-item let-index="index"> <ng-template st-row="payeeName" let-item let-index="index">
<div> <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
{{item?.payeeName}}/{{item?.payeePhone}}
</div>
</ng-template> </ng-template>
<ng-template st-row="billCode" let-item let-index="index"> <ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a> <a [routerLink]="'/order-management/bulk-detail/' + item.id">{{ item.billCode }}</a>
<div> <div>
<span>{{item?.serviceTypeName}}</span> <span>{{ item?.serviceTypeName }}</span>
</div> </div>
<div> <div>
<span>{{item?.auditStatusLabel}}</span> <span>{{ item?.auditStatusLabel }}</span>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="goodsName" let-item let-index="index"> <ng-template st-row="goodsName" let-item let-index="index">
<div>{{item?.goodsName}}</div> <div>{{ item?.goodsName }}</div>
<div> <div>
<span>{{item?.weight ? item?.weight + '吨/' : '' }}</span> <span>{{ item?.weight ? item?.weight + '吨/' : '' }}</span>
<span>{{item?.volume ? item?.volume + '方/' : '' }}</span> <span>{{ item?.volume ? item?.volume + '方/' : '' }}</span>
<span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span> <span>{{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index"> <ng-template st-row="mybidDetailInfo" let-item let-index="index">
@ -116,11 +118,7 @@
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div> <div>
<button nz-button nzType="primary" (click)="sign('1')"> <button nz-button nzType="primary" (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']"> 批量签收 </button>
批量签收 <button nz-button nzType="primary" (click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> 批量生成电子单据 </button>
</button>
<button nz-button nzType="primary" (click)="sign1('1')">
批量生成电子单据
</button>
</div> </div>
</ng-template> </ng-template>

30
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -329,33 +329,33 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
{ {
title: '操作', title: '操作',
fixed: 'right', fixed: 'right',
width: '120px', width: '136px',
className: 'text-left', className: 'text-left',
buttons: [ buttons: [
{ {
text: '通过', text: '生成电子单据',
click: _record => this.generate(_record, 2),
iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
},
{
text: '通过　　　　',
click: _record => this.sign(_record), click: _record => this.sign(_record),
iif: item => item.auditStatus == '1', iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] }, acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
}, },
{ {
text: '生成电子单据', text: '修改　　　　',
click: _record => this.generate(_record, 2),
iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-generate'] },
},
{
text: '查看凭证',
click: _record => this.generate(_record, 3),
iif: item => item.auditStatus == '2',
acl: { ability: ['ORDER-RECEIPTS-view'] },
},
{
text: '修改',
click: _record => this.modification(_record), click: _record => this.modification(_record),
iif: item => item.auditStatus == '1' , iif: item => item.auditStatus == '1' ,
acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] }, acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
}, },
{
text: '查看凭证　',
click: _record => this.generate(_record, 3),
iif: item => item.auditStatus == '2',
acl: { ability: ['ORDER-RECEIPTS-view'] },
},
] ]
} }
]; ];