diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html index d79d4012..bf3c0f28 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html @@ -12,58 +12,57 @@ 基本信息(应收费用) - 天津怡亚通物流科技有限公司 + {{costInfo?.ltdid}} - 应收 + {{costInfo?.feetype}} - 天津怡亚通物流科技有限公司 + {{costInfo?.arremarks}} - C21.001-茅台集团 + {{costInfo?.artoname}} - 专票/普票 + {{costInfo?.arvattype}} - 4200.00 + {{costInfo?.armoeny}} - 4200.00 + {{costInfo?.arkpmoney}} - 4200.00 + {{costInfo?.arbrmmoney}} 基本信息(应付费用) - 天津怡亚通物流科技有限公司 + {{costInfo?.ltdid}} - 应收 + {{costInfo?.feetype}} - 是 - 天津怡亚通物流科技有限公司 + {{costInfo?.hrremarks}} - C21.001-茅台集团 + {{costInfo?.hrtoname}} - - 专票/普票 + + {{costInfo?.hrvattype}} - - 4200.00 + + {{costInfo?.hrmoney}} - 4200.00 + {{costInfo?.hrvatmoney}} - 4200.00 + {{costInfo?.hrpaymoney}} @@ -73,12 +72,20 @@ - + + + {{ index+1 }} + + - + + + {{ index+1 }} + + { + console.log(res); + + if (res) { + this.costInfo = res; + } + }); + } + goBack() { history.go(-1); } @@ -24,30 +40,30 @@ export class CostManagementDetailComponent implements OnInit { private initST(): { [key: string]: STColumn[] } { return { cost: [ - { title: '序号', index: 'no' }, - { title: '费用明细号', index: 'callNo' }, - { title: '订单号', index: 'callNo' }, + { title: '序号', render: 'no', width: 70 }, + { title: '费用明细号', index: 'feeHId' }, + { title: '订单号', index: 'billHId' }, { title: '订单日期', index: 'callNo' }, - { title: '运单号', index: 'callNo' }, - { title: '运单日期', index: 'callNo' }, + { title: '运单号', index: 'waybillHId' }, + { title: '运单日期', index: 'waybillDate' }, { title: '结算客户', index: 'callNo' }, - { title: '订单费用类型', index: 'callNo' }, - { title: '费用科目', index: 'callNo' }, - { title: '税率', index: 'callNo' }, - { title: '费用金额', index: 'callNo' }, - { title: '收/付款金额', index: 'callNo' }, - { title: '开/收票金额', index: 'callNo' } + { title: '订单费用类型', index: 'billLType' }, + { title: '费用科目', index: 'feeSubId' }, + { title: '税率', index: 'hrvatrate' }, + { title: '费用金额', index: 'hrvatmoney' }, + { title: '收/付款金额', index: 'armoney' }, + { title: '开/收票金额', index: 'arkpmoney' } ], requested: [ - { title: '序号', index: 'no' }, - { title: '费用明细号', index: 'callNo' }, - { title: '发票申请', index: 'callNo' }, - { title: '发票类型', index: 'callNo' }, - { title: '发票号', index: 'callNo' }, - { title: '发票日期', index: 'callNo' }, - { title: '发票状态', index: 'callNo' }, - { title: '应收金额', index: 'callNo' }, - { title: '开票金额', index: 'callNo' } + { title: '序号', render: 'no', width: 70 }, + { title: '费用明细号', index: 'feeHId' }, + { title: '发票申请', index: 'vatappcode' }, + { title: '发票类型', index: 'vatapptype' }, + { title: '发票号', index: 'vatappcode' }, + { title: '发票日期', index: 'vatappdate' }, + { title: '发票状态', index: 'sts' }, + { title: '应收金额', index: 'vatnotax' }, + { title: '开票金额', index: 'vatmoney' } ], collection: [ { title: '序号', index: 'no' }, diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html index 269d9193..5d5c0d98 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html @@ -31,7 +31,7 @@ - { if (this.sf) { - Object.assign(requestOptions.body, { ...this.sf.value }); + Object.assign(requestOptions.body, { + ...this.sf.value, + feedate: { + start: this.sf.value.feedate?.[0] || '', + end: this.sf.value.feedate?.[1] || '' + }, + createTime: { + start: this.sf.value.createTime?.[0] || '', + end: this.sf.value.createTime?.[1] || '' + } + }); } return requestOptions; }; @@ -94,48 +104,54 @@ export class CostManagementComponent implements OnInit { hidden: true } }, - receiveName: { + feecode: { type: 'string', title: '费用单号', ui: { placeholder: '请输入' } }, - phone: { + billHId: { type: 'string', title: '订单号', ui: { placeholder: '请输入' } }, - page: { + waybillHId: { type: 'string', title: '运单号', ui: { placeholder: '请输入' } }, - createTi2me: { + feedate: { title: '费用日期', type: 'string', ui: { - widget: 'date', - mode: 'range', + widget: 'sl-from-to-search', format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true, visibleIf: { expand: (value: boolean) => value } } as SFDateWidgetSchema }, - pa2ge2: { + feetype: { type: 'string', title: '费用类型', - enum: [{ label: '全部', value: '全部' }], + enum: [ + { label: '全部', value: '' }, + { label: '应收', value: 1 }, + { label: '应付', value: 2 } + ], ui: { widget: 'select', placeholder: '请选择', visibleIf: { expand: (value: boolean) => value } - } + }, + default: '' }, - pa22ge2: { + feeSubId: { type: 'string', title: '费用科目', enum: [{ label: '全部', value: '全部' }], @@ -147,19 +163,20 @@ export class CostManagementComponent implements OnInit { } } }, - page2: { + ltdId: { type: 'string', title: '网络货运人', - enum: [{ label: '全部', value: '全部' }], ui: { widget: 'select', placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getNetworkFreightForwarder(), visibleIf: { expand: (value: boolean) => value } } }, - page21: { + hrto: { type: 'string', title: '应付对象', enum: [{ label: '全部', value: '全部' }], @@ -171,7 +188,7 @@ export class CostManagementComponent implements OnInit { } } }, - pag2e21: { + arto: { type: 'string', title: '应收对象', enum: [{ label: '全部', value: '全部' }], @@ -187,27 +204,33 @@ export class CostManagementComponent implements OnInit { title: '创建时间', type: 'string', ui: { - widget: 'date', - mode: 'range', + widget: 'sl-from-to-search', format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true, visibleIf: { expand: (value: boolean) => value } } as SFDateWidgetSchema }, - pag2e221: { + ishrhx: { type: 'string', title: '应付核销', - enum: [{ label: '全部', value: '全部' }], + enum: [ + { label: '全部', value: '' }, + { label: '否', value: 0 }, + { label: '是', value: 1 } + ], ui: { widget: 'select', placeholder: '请选择', visibleIf: { expand: (value: boolean) => value } - } + }, + default: '' }, - pag2e121: { + cno: { type: 'string', title: '结算客户', enum: [{ label: '全部', value: '全部' }], @@ -225,22 +248,22 @@ export class CostManagementComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '费用单号', index: 'description', width: 120 }, - { title: '网络货运人', index: 'description', width: 120 }, - { title: '订单号', index: 'description', width: 120 }, - { title: '运单号', index: 'description', width: 120 }, - { title: '费用日期', index: 'description', width: 150 }, - { title: '费用类型', index: 'description', width: 100 }, - { title: '应付核销', index: 'description', width: 100 }, - { title: '结算客户', index: 'description', width: 100 }, - { title: '应收对象', index: 'description', width: 100 }, - { title: '应付对象', render: 'description1', width: 100 }, - { title: '应收金额', render: 'description1', width: 100 }, - { title: '应付金额', render: 'description1', width: 100 }, - { title: '收/付款金额', render: 'description1', width: 120 }, - { title: '开/收票金额', render: 'description1', width: 120 }, - { title: '创建时间', index: 'updatedAt', type: 'date', width: 150 }, - { title: '状态', render: 'description1', width: 90 }, + { title: '费用单号', index: 'feecode', width: 120 }, + { title: '网络货运人', index: 'ltdId', width: 120 }, + { title: '订单号', index: 'billHId', width: 120 }, + { title: '运单号', index: 'waybillHId', width: 120 }, + { title: '费用日期', index: 'feedate', width: 150 }, + { title: '费用类型', index: 'feetype', width: 100 }, + { title: '应付核销', index: 'ishrhx', width: 100 }, + { title: '结算客户', index: 'cno', width: 100 }, + { title: '应收对象', index: 'artoname', width: 100 }, + { title: '应付对象', render: 'hrtoname', width: 100 }, + { title: '应收金额', render: 'armoeny', width: 100 }, + { title: '应付金额', render: 'hrmoney', width: 100 }, + { title: '收/付款金额', render: 'hrpaymoney', width: 120 }, + { title: '开/收票金额', render: 'hrvatmoney', width: 120 }, + { title: '创建时间', index: 'auditTime', type: 'date', width: 150 }, + { title: '状态', render: 'sts', width: 90 }, { title: '操作', fixed: 'right', @@ -249,7 +272,7 @@ export class CostManagementComponent implements OnInit { buttons: [ { text: '浏览', - click: item => this.routeTo('/financial-management/cost-management/detail/1') + click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id) }, { text: '审核', 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 f5b999fa..300228ef 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -43,6 +43,12 @@ export class FreightAccountService extends ShipperBaseService { // 运营端获取账户余额交易明细 $api_get_account_blance = '/api/fcc/accountBalanceDetail/getAccountBalanceByPage'; + + // 查询费用单抬头 + $api_get_cost_page = '/api/fcc/ficoFeeH/list/page'; + // 根据费用头ID查询费用单及开票明细 + $api_get_cost_detail = '/api/fcc/ficoFeeL/detail'; + constructor(public injector: Injector) { super(injector); }