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-14 18:01:33 +08:00
parent db46e5c093 fa3794437d
commit 04ddc1c111
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
View File

@ -8,7 +8,7 @@
<nz-card class="statistics-box"> <nz-card class="statistics-box">
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<div nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1"> <div nz-col [nzXl]="10" [nzLg]="10" [nzSm]="12" [nzXs]="12" se-container [labelWidth]="100" col="1">
<se label="销售方"> <se label="销售方">
{{ headerInfo?.ltdName }} {{ headerInfo?.ltdName }}
</se> </se>
@ -34,7 +34,7 @@
{{ headerInfo?.remarks }} {{ headerInfo?.remarks }}
</se> </se>
</div> </div>
<div nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1"> <div nz-col [nzXl]="10" [nzLg]="10" [nzSm]="12" [nzXs]="12" se-container [labelWidth]="100" col="1">
<se label="购买方"> <se label="购买方">
{{ headerInfo?.artoname }} {{ headerInfo?.artoname }}
</se> </se>
@ -57,7 +57,7 @@
{{headerInfo?.otherremarks || '-'}} {{headerInfo?.otherremarks || '-'}}
</se> </se>
</div> </div>
<div *ngIf="isCanEdit && selectedIndex===2" nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" class="text-right"> <div *ngIf="isCanEdit && selectedIndex===2" nz-col [nzXl]="4" [nzLg]="4" [nzSm]="12" [nzXs]="12" class="text-right">
<ng-container *ngIf="isEdit; else elseTemplate"> <ng-container *ngIf="isEdit; else elseTemplate">
<button nz-button (click)="isEdit = false; invoiceST?.load(1)">取消</button> <button nz-button (click)="isEdit = false; invoiceST?.load(1)">取消</button>
<button nz-button nzType="primary" (click)="saveInvoices()">保 存</button> <button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>

12
src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts
View File

@ -37,13 +37,16 @@ export class RequestedInvoiceModalComponent {
* @returns * @returns
*/ */
removeOrder(item: any[]) { removeOrder(item: any[]) {
console.log(item); if (this.st1._data?.length <= 1) {
this.service.msgSrv.warning('开票申请记录不能少于一个订单');
return;
}
this.nzModalService.warning({ this.nzModalService.warning({
nzTitle: '确定从当前批次中移除所选订单？', nzTitle: '确定从当前批次中移除所选订单？',
nzContent: '移除后相关订单可以重新提交开票申请', nzContent: '移除后相关订单可以重新提交开票申请',
nzOnOk: () => { nzOnOk: () => {
const ids = item.map(order => order.billHId); const ids = item.map(order => order.billHCode);
this.service.request(this.service.$api_remove_bill, { billHIds: ids }).subscribe(res => { this.service.request(this.service.$api_remove_bill, { billHcodes: ids }).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('移除成功'); this.service.msgSrv.success('移除成功');
this.modal.destroy(true); this.modal.destroy(true);
@ -107,7 +110,8 @@ export class RequestedInvoiceModalComponent {
buttons: [ buttons: [
{ {
text: '移除', text: '移除',
click: (item: any) => this.removeOrder([item]) click: (item: any) => this.removeOrder([item]),
iif: _ => this.st1._data?.length > 1
} }
] ]
} }

3
src/app/routes/ticket-management/services/ticket.service.ts
View File

@ -25,7 +25,8 @@ export class TicketService extends ShipperBaseService {
$api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp'; $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp';
// 删除开票申请订单明细 // 删除开票申请订单明细
// $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch'; // $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch';
$api_remove_bill = '/api/fcc/ficoVatappH/remove'; // $api_remove_bill = '/api/fcc/ficoVatappH/remove';
$api_remove_bill = '/api/fcc/ficoVatappBill/removeVatappBill';
// 运营端单个/批量驳回 // 运营端单个/批量驳回
$api_reject_invoice = '/api/fcc/ficoVatappH/rejectInvoiceApple'; $api_reject_invoice = '/api/fcc/ficoVatappH/rejectInvoiceApple';
// 运营端修改开票地址 // 运营端修改开票地址