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

车辆接口更新

Browse Source
This commit is contained in:
wangshiming
2022-01-20 15:24:19 +08:00
parent a68612626b
commit 61dccdd3d3
9 changed files with 73 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/financial-management/components/cost-management/cost-management.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-30 19:36:30 * @Date : 2021-12-30 19:36:30
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-20 10:20:32 * @LastEditTime : 2022-01-20 15:22:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -19,8 +19,8 @@
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"> <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="exportList()"> 导出</button> <!-- <button nz-button (click)="exportList()"> 导出</button>
<button nz-button (click)="exportList()"> 导出明细</button> <button nz-button (click)="exportList()"> 导出明细</button> -->
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

8
src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
View File

@ -11,8 +11,8 @@
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"> <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button> <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button [disabled]="service.http.loading"> 导出</button> <!-- <button nz-button [disabled]="service.http.loading"> 导出</button>
<button nz-button [disabled]="service.http.loading"> 导出明细</button> <button nz-button [disabled]="service.http.loading"> 导出明细</button> -->
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -24,13 +24,13 @@
<nz-card class="content-box" nzBordered> <nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md mt-md"> <div class="d-flex align-items-center mb-md mt-md">
<button nz-button nzType="primary">新建凭证</button> <!-- <button nz-button nzType="primary">新建凭证</button>
<button nz-button nzType="primary">凭证导入</button> <button nz-button nzType="primary">凭证导入</button>
<div class="ml-md"> <div class="ml-md">
已选择 已选择
<strong class="text-primary">{{ selectedRows.length }}</strong> 张发票 <strong class="text-primary">{{ selectedRows.length }}</strong> 张发票
<a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div> </div> -->
</div> </div>
<st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns"

28
src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
View File

@ -1,3 +1,13 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 15:23:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { CurrencyPipe } from '@angular/common'; import { CurrencyPipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@ -320,15 +330,15 @@ export class VoucherManagementComponent implements OnInit {
text: '浏览', text: '浏览',
click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id]) click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id])
}, },
{ // {
text: '修改' // text: '修改'
}, // },
{ // {
text: '删除' // text: '删除'
}, // },
{ // {
text: '提交' // text: '提交'
} // }
] ]
} }
]; ];

14
src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 15:23:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-summary\\voucher-summary.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'凭证汇总'"> <page-header-wrapper [title]="'凭证汇总'">
</page-header-wrapper> </page-header-wrapper>
@ -11,9 +21,9 @@
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"> <div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</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="primary" [disabled]="service.http.loading"> 导出</button> <!-- <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"> 导出明细</button> <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出明细</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"> 导出凭证</button> <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出凭证</button> -->
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

34
src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
View File

@ -327,23 +327,23 @@ export class CancellationInvoiceComponent implements OnInit {
iif: item => item.sts != '3', iif: item => item.sts != '3',
click: item => this.requestedAction(item) click: item => this.requestedAction(item)
}, },
{ // {
text: '推送开票', // text: '推送开票',
iif: item => item.sts != '3', // iif: item => item.sts != '3',
click: item => this.pushInvoiceAction(item) // click: item => this.pushInvoiceAction(item)
}, // },
{ // {
text: '移除', // text: '移除',
click: item => this.batchRemove(item) // click: item => this.batchRemove(item)
}, // },
{ // {
text: '确认' // text: '确认'
// click: item => this.rejectAction(item) // // click: item => this.rejectAction(item)
}, // },
{ // {
text: '撤回', // text: '撤回',
click: item => this.batchWithdraw(item) // click: item => this.batchWithdraw(item)
} // }
] ]
} }
]; ];

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

@ -63,7 +63,7 @@
<button nz-button nzType="primary" (click)="saveInvoices()">保 存</button> <button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>
</ng-container> </ng-container>
<ng-template #elseTemplate> <ng-template #elseTemplate>
<button nz-button nzType="primary" (click)="isEdit = true">修改</button> <!-- <button nz-button nzType="primary" (click)="isEdit = true">修改</button> -->
</ng-template> </ng-template>
</div> </div>
</div> </div>
@ -83,7 +83,7 @@
<button nz-button nzType="primary" [nzLoading]="service.http.loading" <button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="orderST?.load(1)">查询</button> (click)="orderST?.load(1)">查询</button>
<button nz-button (click)="resetSF(1)">重置</button> <button nz-button (click)="resetSF(1)">重置</button>
<button nz-button> 导出</button> <!-- <button nz-button> 导出</button> -->
</div> </div>
</div> </div>

4
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
View File

@ -46,9 +46,9 @@
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div> </div>
<button nz-button (click)="this.batchRequested()">开票</button> <button nz-button (click)="this.batchRequested()">开票</button>
<button nz-button (click)="this.rejectAction(selectedRows)">驳回</button> <!-- <button nz-button (click)="this.rejectAction(selectedRows)">驳回</button>
<button nz-button (click)="changePice(selectedRows)">修改地址</button> <button nz-button (click)="changePice(selectedRows)">修改地址</button>
<button nz-button (click)="printOrder(selectedRows)">打印面单</button> <button nz-button (click)="printOrder(selectedRows)">打印面单</button> -->
</div> </div>
</ng-template> </ng-template>

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

@ -415,13 +415,13 @@ export class InvoiceRequestedComponent implements OnInit {
buttons: [ buttons: [
{ type: 'divider' }, { type: 'divider' },
{ {
text: '开票', text: '开票<br/>',
click: item => this.requestedInvoiceAction(item) click: item => this.requestedInvoiceAction(item)
}, },
{ // {
text: '驳回<br/>', // text: '驳回<br/>',
click: item => this.rejectAction([item]) // click: item => this.rejectAction([item])
}, // },
{ {
text: '订单明细<br/>', text: '订单明细<br/>',
click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id]) click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id])
@ -430,10 +430,10 @@ export class InvoiceRequestedComponent implements OnInit {
text: '查看原因<br/>', text: '查看原因<br/>',
click: item => this.showReason(item) click: item => this.showReason(item)
}, },
{ // {
text: '下载对账单' // text: '下载对账单'
// click: item => this.rejectAction(item) // // click: item => this.rejectAction(item)
} // }
] ]
} }
]; ];

10
src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
View File

@ -14,7 +14,7 @@
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right"> <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button> <!-- <button nz-button> 导出</button> -->
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -25,14 +25,14 @@
<nz-card nzBordered> <nz-card nzBordered>
<div class="d-flex align-items-center mb-md"> <div class="d-flex align-items-center mb-md">
<button nz-button (click)="this.deletedInvoice()">作废发票</button> <!-- <button nz-button (click)="this.deletedInvoice()">作废发票</button>
<button nz-button (click)="this.invoiceHongChong()">发票红冲</button> <button nz-button (click)="this.invoiceHongChong()">发票红冲</button> -->
<div class="ml-md"> <!-- <div class="ml-md">
已选择 已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计 <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计
<strong class="text-red">{{ totalCallNo }}</strong> <strong class="text-red">{{ totalCallNo }}</strong>
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div> </div> -->
</div> </div>
<st <st