diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html index ac3c44e0..484a7e71 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html @@ -60,8 +60,8 @@ - + {{index+1}} - --> + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts index ecaae0d1..0ddf08f4 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts @@ -133,17 +133,17 @@ export class AdvanceCollectionDetailComponent implements OnInit { ], info: [ { title: '序号', render: 'no', width: 70, className: 'text-left' }, - { title: '核销单号', index: 'cnoName', className: 'text-left', width: 200 }, - { title: '核销日期', index: 'billHId', className: 'text-center', width: 150 }, + { title: '核销单号', index: 'ahxcode', className: 'text-left', width: 200 }, + { title: '核销日期', index: 'ahxdate', className: 'text-center', width: 150 }, { title: '核销金额', - index: 'yskmoney', + index: 'ahxmoney', type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ahxmoney }) }, width: 200 }, - { title: '核销备注', index: 'vatapptype', className: 'text-left', width: 200 } + { title: '核销备注', index: 'remarks', className: 'text-left', width: 200 } ] }; } diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index fee7eaed..d2d258be 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -214,11 +214,11 @@ export class TransactionFlowComponent implements OnInit { private initST(): STColumn[] { return [ { title: '交易时间', index: 'createTime', width: 180 }, - { title: '流水号', index: 'transactionNumber', width: 150 }, + { title: '流水号', index: 'transactionNumber', width: 170 }, { title: '交易类型', index: 'tradeTypeLabel', width: 120 }, { title: '关联单号', index: 'businessNumber', width: 150 }, { title: '账户类型', index: 'accountTypeLabel', width: 130 }, - { title: '账户名称', index: 'roleName', width: 100 }, + { title: '账户名称', index: 'roleName', width: 180 }, { title: '所属项目', index: 'projectName', width: 140 }, { title: '收支类型', index: 'incomeTypeLabel', width: 100, className: 'text-center' }, { @@ -236,9 +236,9 @@ export class TransactionFlowComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } }, - { title: '网络货运人', index: 'ltdName', width: 140 }, + { title: '网络货运人', index: 'ltdName', width: 180 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, - { title: '银行流水号', index: 'channelPaySn', width: 120 }, + { title: '银行流水号', index: 'channelPaySn', width: 170 }, { title: '操作', fixed: 'right', 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 c347df62..428616c8 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -123,6 +123,8 @@ export class FreightAccountService extends ShipperBaseService { $api_get_advance_collection_header = '/api/fcc/ficoBrmH/getByYskblaId'; // 根据预收款ID获取收款单明细 $api_get_advance_collection_detail = '/api/fcc/ficoBrmYsk/getBrmYskByYskblaId'; + // 根据预收款ID获取核销信息明细 + $api_get_advance_collection_hrxiao = '/api/fcc/ficoAhxH/getAhxHByYskblaId'; constructor(public injector: Injector, public eaCacheSrv: EACacheService) { super(injector, eaCacheSrv); diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index 2e3d6bd2..cc8f6464 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { UsermanageService } from '../../../services/usercenter.service'; import { AuditAdminComponent } from './audit-admin/audit-admin.component'; @@ -37,7 +37,11 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf.value, + createTime: { + start: this.sf.value.createTime?.[0] || '', + end: this.sf.value.createTime?.[1] || '' + } }); } Object.assign(requestOptions.body, { flag: this.tabType, listSource: 2 }); @@ -151,10 +155,10 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { initEnterST(): STColumn[] { return [ { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 }, - { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 180 }, + { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 190 }, { title: '管理员', className: 'text-center', index: 'contacter', width: 150 }, { title: '手机号', className: 'text-center', index: 'mobile', width: 140 }, - { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 }, + { title: '注册时间', className: 'text-center', index: 'createTime', width: 170 }, { title: '审核状态', className: 'text-center', @@ -287,6 +291,19 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { expand: (value: boolean) => value } } + }, + createTime: { + title: '注册时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema } } }; diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 0b7ac4bd..bd30936e 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -354,6 +354,11 @@ + + + + + diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index ccaf6852..8021cde5 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -28,9 +28,11 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { disabledUpload = false; enterpriseAddressCode: any = []; ltdId: any = []; + roles: any = []; approvalOpinion = ''; networkTransporter = null; + roleId = null; esignCheckStatus: any = { 0: '不通过', @@ -55,6 +57,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { ngOnInit() { this.initData(); this.loadltdId(); + this.loadRoles(); this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => { this.scrollTop = document.documentElement.scrollTop; }); @@ -66,6 +69,13 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { } }); } + loadRoles() { + this.service.getRoles({ enterpriseId: 0, projectId: 0 }).subscribe(res => { + if (res) { + this.roles = res; + } + }); + } initData() { this.service @@ -149,11 +159,12 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { auditPass() { this.networkTransporter = null; + this.roleId = null; this.nzModalService.create({ nzTitle: '审核通过', nzContent: this.approvedModal, nzOnOk: () => { - if (!this.networkTransporter) { + if (!this.networkTransporter || !this.roleId) { return false; } this.auditEnterprise(20); @@ -163,6 +174,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { } auditNo() { this.approvalOpinion = ''; + this.roleId = null; this.nzModalService.create({ nzTitle: '审核驳回', nzContent: this.redectModal, @@ -183,7 +195,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { id: this.detailData.id, approvalOpinion: this.approvalOpinion, networkTransporter: this.networkTransporter, - roleIds: [1] + roleId: this.roleId || null }) .subscribe(res => { if (res) { diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 59fa855e..436c0a2f 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -47,7 +47,7 @@ - {{ item.contacter }}/{{item.mobile}} + {{ item.contacter }}
/{{item.mobile}} {{ item.promotersTelephone diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 5c388569..0e075e82 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -179,15 +179,28 @@ export class FreightComponentsListComponent implements OnInit { initST() { this.columns = [ // { title: '', type: 'checkbox', className: 'text-center' }, - { title: '企业名称', className: 'text-center', index: 'enterpriseName' , width: 350}, - { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 180 }, - { title: '管理员', className: 'text-center', render: 'contacter' }, - { title: '审核人', className: 'text-center', index: 'approvalUserName' }, - - { title: '网络货运人', className: 'text-center', index: 'netTranName' }, - { title: '常用服务', className: 'text-center', index: 'oftenUsedServices', type: 'enum', enum: { 10: '整车发货', 20: '大宗发货' } }, - { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' }, - { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' } }, + { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 }, + { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 }, + { title: '管理员', className: 'text-center', render: 'contacter', width: 150 }, + { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 }, + { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, + { + title: '常用服务', + className: 'text-center', + index: 'oftenUsedServices', + type: 'enum', + enum: { 10: '整车发货', 20: '大宗发货' }, + width: 140 + }, + { title: '推广业务员', className: 'text-center', render: 'promotersTelephone', width: 150 }, + { + title: '注册渠道', + className: 'text-center', + index: 'source', + type: 'enum', + enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' }, + width: 130 + }, { title: '企业状态', className: 'text-center', @@ -196,15 +209,17 @@ export class FreightComponentsListComponent implements OnInit { badge: { 0: { text: '正常', color: 'success' }, 1: { text: '冻结', color: 'error' } - } + }, + width: 130 }, { title: '操作', width: '110px', - className: 'text-center', + fixed: 'right', buttons: [ + { type: 'divider' }, { - text: '查看
', + text: '查看
', acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, click: item => { this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index 82358583..904ac081 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -598,18 +598,6 @@ export class FreightComponentsListNewComponent implements OnInit { }, title99: { title: '', type: 'string', ui: { widget: 'custom' } }, - adminMobile: { - title: ' 企业管理员手机号', - type: 'string', - minLength: 1, - format: 'mobile', - maxLength: 11, - ui: { - grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, - placeholder: '请输入企业管理员手机号', - errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' } - } - }, tipsA: { title: '企业管理员证件照', type: 'string', @@ -663,6 +651,18 @@ export class FreightComponentsListNewComponent implements OnInit { placeholder: '请输入企业管理员姓名' } }, + adminMobile: { + title: ' 企业管理员手机号', + type: 'string', + minLength: 1, + format: 'mobile', + maxLength: 11, + ui: { + grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, + placeholder: '请输入企业管理员手机号', + errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' } + } + }, certificateNumber: { title: '企业管理员身份证号', type: 'string', diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 41c9fbf8..2fdc856a 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -15,6 +15,7 @@ export class ShipperBaseService extends BaseService { $api_get_settlement_customer_list = `/api/mdc/cuc/settlementCustomer/findAll`; // 查找所有结算客户信息(下拉) $api_get_crm_customer_list = `/api/mdc/cuc/crmCustomer/findAll`; // 查找所有Crm客户信息(下拉) $api_get_network_freight_forwarder_one = `/api/mdc/cuc/networkTransporter/get`; // 获取网络货运人 + $api_get_roles = `/api/mdc/cuc/roleInfo/getRoleList`; // 获取角色列表 // 根据FullKey获取系统子配置(树) $api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`; envCache: any; @@ -183,6 +184,31 @@ export class ShipperBaseService extends BaseService { ); } + /** + * 获取角色列表 + * @returns + */ + getRoles(params = {}, containerAll = false) { + return this.request(this.$api_get_roles, params).pipe( + map((res: any) => { + if (!res) { + return []; + } + const list = res.map((item: any) => { + return { + label: item.roleName, + value: item.id + }; + }); + const obj = []; + if (containerAll) { + obj.push({ label: '全部', value: '' }); + } + return [...obj, ...list]; + }) + ); + } + /** * 根据ID获取网络货运人 * @returns