+
-
-
+
+
+
+
-
-
-
-
+
value
- }
- }
- },
- hrto: {
- type: 'string',
- title: '销售方',
- ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
- createtime: {
+ invtype: {
+ type: 'string',
+ title: '原始单类型',
+ ui: {
+ widget: 'select',
+ placeholder: '请选择',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ createtim2e: {
title: '创建时间',
type: 'string',
ui: {
@@ -151,9 +156,19 @@ export class VoucherSummaryComponent implements OnInit {
}
} as SFDateWidgetSchema
},
+ inpinvcosde: {
+ type: 'string',
+ title: '凭证摘要',
+ ui: {
+ placeholder: '请输入',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
sts: {
type: 'string',
- title: '收票状态',
+ title: '凭证类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
@@ -163,12 +178,13 @@ export class VoucherSummaryComponent implements OnInit {
}
}
},
- invdate: {
+ s2ts: {
type: 'string',
- title: '发票日期',
+ title: '科目',
ui: {
- widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
+ widget: 'dict-select',
+ params: { dictKey: 'refund:apply:status' },
+ placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
@@ -176,7 +192,7 @@ export class VoucherSummaryComponent implements OnInit {
},
remarks: {
type: 'string',
- title: '收票备注',
+ title: '借方金额',
ui: {
placeholder: '请输入',
visibleIf: {
@@ -186,7 +202,7 @@ export class VoucherSummaryComponent implements OnInit {
},
billCode: {
type: 'string',
- title: '订单号',
+ title: '贷方金额',
ui: {
placeholder: '请输入',
visibleIf: {
@@ -194,15 +210,72 @@ export class VoucherSummaryComponent implements OnInit {
}
}
},
+ s2t2s: {
+ type: 'string',
+ title: '帐套',
+ ui: {
+ widget: 'dict-select',
+ params: { dictKey: 'refund:apply:status' },
+ placeholder: '请选择',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ s22t2s: {
+ type: 'string',
+ title: '凭证状态',
+ ui: {
+ widget: 'dict-select',
+ params: { dictKey: 'refund:apply:status' },
+ placeholder: '请选择',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
feecode: {
type: 'string',
- title: '费用号',
+ title: 'NC凭证',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
+ },
+ feecsode: {
+ type: 'string',
+ title: '凭证号',
+ ui: {
+ placeholder: '请输入',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ s22t2ss: {
+ type: 'string',
+ title: '导入NC',
+ ui: {
+ widget: 'dict-select',
+ params: { dictKey: 'refund:apply:status' },
+ placeholder: '请选择',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ createt1im2e: {
+ title: '统计时间',
+ type: 'string',
+ ui: {
+ widget: 'sl-from-to-search',
+ format: 'yyyy-MM-dd',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ } as SFDateWidgetSchema
}
}
};
@@ -210,28 +283,47 @@ export class VoucherSummaryComponent implements OnInit {
private initST(): STColumn[] {
return [
- { title: '', index: 'key', type: 'checkbox' },
- { title: '收票单号', index: 'inpinvcode', type: 'link' },
- { title: '网络货运人', index: 'ltdid' },
- { title: '发票日期', index: 'invdate', type: 'date' },
- { title: '发票号', index: 'invoiceno' },
- { title: '发票金额', index: 'invmoney' },
- { title: '税额', index: 'invtax' },
- { title: '发票类型', index: 'invtype' },
- { title: '销售方', index: 'hrto' },
- { title: '创建时间', index: 'createtime', type: 'date' },
- { title: '创建人', index: 'createbyname' },
- { title: '收票状态', index: 'sts' },
+ { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' },
+ { title: '汇总凭证号', index: 'inpinvcode', type: 'link', width: 140 },
+ { title: '帐套', index: 'ltdid', width: 120 },
+ { title: '凭证时间', index: 'invdate', type: 'date', width: 150 },
+ { title: '统计时间', index: 'invdate', type: 'date', width: 150 },
+ { title: '凭证类型', index: 'invoiceno', width: 120 },
+ { title: '序号', index: 'invmoney', width: 100 },
+ { title: '摘要', index: 'invtax', width: 120 },
+ { title: '币种', index: 'invtype', width: 100 },
+ {
+ title: '借方金额',
+ index: 'hrto',
+ width: 120,
+ className: 'text-right',
+ format: item => `${this.currencyPipe.transform(item.armoney || 0)}`
+ },
+ {
+ title: '贷方金额',
+ index: 'createtime',
+ type: 'date',
+ width: 120,
+ className: 'text-right',
+ format: item => `${this.currencyPipe.transform(item.armoney || 0)}`
+ },
+ { title: 'NC凭证', index: 'createbyname', width: 120 },
+ { title: '凭证状态', index: 'sts', width: 120 },
+ { title: '创建时间', index: 'sts', width: 150 },
+ { title: '创建人', index: 'sts', width: 120 },
{
title: '操作',
+ width: '130px',
+ fixed: 'right',
+ className: 'text-center',
buttons: [
{
text: '浏览',
- click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
+ click: (item: any) => this.router.navigate(['/financial-management/voucher-summary/detail/' + item.id])
},
{
- text: '修改',
- click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
+ text: '列表',
+ click: (item: any) => this.router.navigate(['/financial-management/voucher-summary/detail/' + item.id])
}
]
}
diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts
index 5e2923c2..a8e96b1f 100644
--- a/src/app/routes/financial-management/financial-managemen-routing.module.ts
+++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts
@@ -22,6 +22,8 @@ import { ReceivableOrderComponent } from './components/receivable-order/receivab
import { PayableOrderComponent } from './components/payable-order/payable-order.component';
import { ReceivableOrderDetailComponent } from './components/receivable-order/receivable-order-detail/receivable-order-detail.component';
import { PayableOrderDetailComponent } from './components/payable-order/payable-order-detail/payable-order-detail.component';
+import { VoucherDetailComponent } from './components/voucher-management/voucher-detail/voucher-detail.component';
+import { SummaryDetailComponent } from './components/voucher-summary/summary-detail/summary-detail.component';
const routes: Routes = [
{ path: 'freight-account', component: FreightAccountComponent },
@@ -32,7 +34,9 @@ const routes: Routes = [
{ path: 'withdrawals-record', component: WithdrawalsRecordComponent },
{ path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent },
{ path: 'voucher-management', component: VoucherManagementComponent },
+ { path: 'voucher-management/detail/:id', component: VoucherDetailComponent },
{ path: 'voucher-summary', component: VoucherSummaryComponent },
+ { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent },
{ path: 'cost-management', component: CostManagementComponent },
{ path: 'cost-management/detail/:id', component: CostManagementDetailComponent },
{ path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent },
diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts
index 58cc4e1e..4b7b076b 100644
--- a/src/app/routes/financial-management/financial-management.module.ts
+++ b/src/app/routes/financial-management/financial-management.module.ts
@@ -26,6 +26,8 @@ import { ReceivableOrderComponent } from './components/receivable-order/receivab
import { PayableOrderComponent } from './components/payable-order/payable-order.component';
import { ReceivableOrderDetailComponent } from './components/receivable-order/receivable-order-detail/receivable-order-detail.component';
import { PayableOrderDetailComponent } from './components/payable-order/payable-order-detail/payable-order-detail.component';
+import { VoucherDetailComponent } from './components/voucher-management/voucher-detail/voucher-detail.component';
+import { SummaryDetailComponent } from './components/voucher-summary/summary-detail/summary-detail.component';
const ROUTESCOMPONENTS = [
FreightAccountComponent,
@@ -43,16 +45,19 @@ const ROUTESCOMPONENTS = [
PaymentOrderComponent,
ReceiptOrderComponent,
VoucherManagementComponent,
+ VoucherDetailComponent,
VoucherSummaryComponent,
+ SummaryDetailComponent,
ReceivableOrderComponent,
PayableOrderComponent,
- ReceivableOrderDetailComponent
+ ReceivableOrderDetailComponent,
+ PayableOrderDetailComponent
];
const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, SettingFinancialComponent, ClearingModalComponent];
@NgModule({
- declarations: [...ROUTESCOMPONENTS, ...NOTROUTECOMPONENTS, PayableOrderDetailComponent],
+ declarations: [...ROUTESCOMPONENTS, ...NOTROUTECOMPONENTS],
imports: [CommonModule, FinancialManagementRoutingModule, SharedModule]
})
export class FinancialManagementModule {}
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index fa258465..066e6615 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -71,6 +71,11 @@ export class FreightAccountService extends ShipperBaseService {
// 查询应付核销明细
$api_get_fico_ph_detail_header = '/api/fcc/ficoPhxL/list/page';
+ // 查询总账凭证表
+ $api_get_fico_vch_page = '/api/fcc/ficoVcH/list/page';
+ // 获取总账凭证表详情信息
+ $api_get_fico_vch__detail = '/api/fcc/ficoVcH/getDetail';
+
constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);