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-01-12 09:48:15 +08:00
parent ba78e70eaf 9d8da4f37e
commit b6de1804c5
10 changed files with 82 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
View File

@ -45,7 +45,9 @@ export class ETCInvoicedListComponent implements OnInit {
nzOkText: '导出'
});
modal.afterClose.subscribe(res => {
this.st.load();
if(res){
this.st.load();
}
});
}

0
src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.less
View File

32
src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts
View File

@ -12,31 +12,29 @@ import { TicketService } from '../../../services/ticket.service';
export class TransactionDetailsComponent implements OnInit {
data = [];
selectedData = [];
url = `/rule?_allow_anonymous=true`;
url = `/api/fcc/ficoEtcInvoiceH/list/page`;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ title: '交易id', index: 'no' },
{ title: '交易流水号', index: 'callNo' },
{ title: '交易金额', index: 'callNo' },
{ title: '开票状态', index: 'callNo' },
{ title: '交易时间', index: 'updatedAt', type: 'date' }
{ title: '交易id', index: 'id' },
{ title: '交易流水号', index: 'tradeFlowNo' },
{ title: '交易金额', index: 'fee' },
{ title: '开票状态', index: 'state', type: 'enum', enum: { '0': '待开具', '1': '开具中', '2': '已开具', '3': '开票失败' } },
{ title: '交易时间', index: 'exTime', type: 'date' }
];
searchSchema: SFSchema = {
properties: {
receiveName: {
state: {
type: 'string',
title: '开票状态',
enum: [
{ label: '全部', value: '' },
{ label: '待受理', value: '待受理' },
{ label: '待开票', value: '待开票' },
{ label: '开票中', value: '开票中' },
{ label: '已开票', value: '已开票' },
{ label: '已撤销', value: '已撤销' },
{ label: '已拒绝', value: '已拒绝' }
{ label: '待开具', value: '1' },
{ label: '开具中', value: '2' },
{ label: '已开具', value: '3' },
{ label: '交易异常', value: '4' }
],
ui: {
widget: 'select',
@ -44,7 +42,7 @@ export class TransactionDetailsComponent implements OnInit {
},
default: ''
},
createTime: {
exTime: {
title: '交易时间',
type: 'string',
ui: {
@ -64,7 +62,11 @@ export class TransactionDetailsComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf.value,
exTime: {
start: this.sf.value.exTime?.[0] || null,
end: this.sf.value.exTime?.[1] || null
}
});
}
return requestOptions;

4
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
View File

@ -23,13 +23,13 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$mock_url" [columns]="columns"
<st #st [data]="service.$api_get_invoice_logs_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
<ng-template st-row="call3No" let-item let-index="index" let-column="column">
特朗普<br>13789040523
{{item.driverName}}<br>{{item.driverCellphone}}
</ng-template>
</st>
</nz-card>

64
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
View File

@ -27,7 +27,15 @@ export class ETCInvoicedLogsComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf.value,
exTime: {
start: this.sf.value.exTime?.[0] || null,
end: this.sf.value.exTime?.[1] || null
},
invoiceMakeTime: {
start: this.sf.value.invoiceMakeTime?.[0] || null,
end: this.sf.value.invoiceMakeTime?.[1] || null
}
});
}
return requestOptions;
@ -63,7 +71,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
hidden: true
}
},
orderSn: {
invoiceNum: {
type: 'string',
title: '发票号码',
ui: {
@ -71,21 +79,21 @@ export class ETCInvoicedLogsComponent implements OnInit {
autocomplete: 'off'
}
},
orderS2n1: {
billCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入'
}
},
orderSn1: {
waybillCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入'
}
},
orderSn2: {
carNo: {
type: 'string',
title: '车牌号',
ui: {
@ -95,7 +103,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
}
}
},
createTime: {
exTime: {
title: '交易时间',
type: 'string',
ui: {
@ -106,7 +114,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
}
} as SFDateWidgetSchema
},
createTime2: {
invoiceMakeTime: {
title: '开票日期',
type: 'string',
ui: {
@ -117,13 +125,11 @@ export class ETCInvoicedLogsComponent implements OnInit {
}
} as SFDateWidgetSchema
},
receiveName2: {
sellerName: {
type: 'string',
title: '销售方',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
@ -149,25 +155,25 @@ export class ETCInvoicedLogsComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '发票号码', index: 'no', width: 100, type: 'link', click: item => this.routeTo(item) },
{ title: '发票代码', index: 'callNo', width: 100 },
{ title: '订单号', index: 'callNo', width: 100 },
{ title: '运单号', index: 'callNo', width: 100 },
{ title: '入站口', index: 'callNo', width: 100 },
{ title: '出站口', index: 'callNo', width: 100 },
{ title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) },
{ title: '发票代码', index: 'invoiceCode', width: 100 },
{ title: '订单号', index: 'billCode', width: 100 },
{ title: '运单号', index: 'waybillCode', width: 100 },
{ title: '入站口', index: 'enStationName', width: 100 },
{ title: '出站口', index: 'exStationName', width: 100 },
{ title: '司机', render: 'call3No', width: 140 },
{ title: '车牌号', index: 'callNo', width: 100 },
{ title: '里程（km）', index: 'callNo', width: 120 },
{ title: '交易id', index: 'callNo', width: 100 },
{ title: '交易金额（元）', index: 'callNo', width: 130 },
{ title: '税率', index: 'callNo', width: 90 },
{ title: '金额（元）', index: 'callNo', width: 120 },
{ title: '税额（元）', index: 'callNo', width: 120 },
{ title: '价税合计（元）', index: 'callNo', width: 130 },
{ title: '交易时间', index: 'updatedAt', type: 'date', width: 150 },
{ title: '开票日期', index: 'updatedAt', type: 'date', width: 150 },
{ title: '销售方', index: 'callNo', width: 90 },
{ title: '网络货运人', index: 'callNo', width: 120 }
{ title: '车牌号', index: 'carNo', width: 100 },
{ title: '里程（km）', index: 'mileage', width: 120 },
{ title: '交易id', index: 'tradeId', width: 100 },
{ title: '交易金额（元）', index: 'fee', width: 130 },
{ title: '税率', index: 'taxRate', width: 90 },
{ title: '金额（元）', index: 'invoiceAmount', width: 120 },
{ title: '税额（元）', index: 'totalTaxAmount', width: 120 },
{ title: '价税合计（元）', index: 'totalAmount', width: 130 },
{ title: '交易时间', index: 'exTime', type: 'date', width: 150 },
{ title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 },
{ title: '销售方', index: 'sellerName', width: 90 },
{ title: '网络货运人', index: 'enterpriseInfoName', width: 120 }
];
}
}

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

@ -76,6 +76,8 @@ export class TicketService extends ShipperBaseService {
$api_get_apply_invoice = '/api/sdc/invoiceEtcOperate/applyForInvoicingBatch';
// ETC开票记录界面查询
$api_get_invoice_record_page = '/api/sdc/invoiceEtcOperate/list/listEtcRecordPageList';
// 查询ETC发票明细表
$api_get_invoice_logs_page = '/api/fcc/ficoEtcInvoiceL/list/page';
// 进项发票查询
$api_get_input_invoice_page = '/api/fcc/ficoInpinvH/getListPage';

3
src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html
View File

@ -225,8 +225,7 @@
</se>
<se [col]="1" label="网络货运人" required>
<nz-select nzPlaceHolder="请选择" [(ngModel)]="networkTransporter">
<nz-option [nzValue]="1" nzLabel="Jack"></nz-option>
<nz-option [nzValue]="2" nzLabel="Lucy"></nz-option>
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of ltdId"></nz-option>
</nz-select>
</se>
</div>

9
src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts
View File

@ -48,6 +48,7 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
disabledUpload = false;
values: string[] | null = null;
ltdId: any[] = [];
constructor(private nzModalService: NzModalService, public service: UsermanageService, private route: ActivatedRoute) {}
ngOnInit() {
@ -55,6 +56,14 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
// this.launchSign();
}
loadltdId() {
this.service.getNetworkFreightForwarder().subscribe(res => {
if (res) {
this.ltdId = res;
}
});
}
initData() {
this.service
.request(this.service.$api_get_freight_detail, {

3
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -298,8 +298,7 @@
</se>
<se [col]="1" label="网络货运人" required>
<nz-select nzPlaceHolder="请选择" [(ngModel)]="networkTransporter">
<nz-option [nzValue]="1" nzLabel="Jack"></nz-option>
<nz-option [nzValue]="2" nzLabel="Lucy"></nz-option>
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of ltdId"></nz-option>
</nz-select>
</se>
</div>

12
src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
View File

@ -29,6 +29,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
uploadURl = apiConf.waterFileUpload;
disabledUpload = false;
enterpriseAddressCode: any = [];
ltdId: any = [];
approvalOpinion = '';
networkTransporter = null;
@ -41,7 +42,18 @@ export class FreightComponentsListDetailComponent implements OnInit {
ngOnInit() {
this.initData();
this.loadltdId();
}
loadltdId() {
this.service.getNetworkFreightForwarder().subscribe(res => {
if (res) {
this.ltdId = res;
console.log(this.ltdId );
}
});
}
initData() {
this.service
.request(this.service.$api_get_freight_detail, {