diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html index 4490c1b9..9acccfe7 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html @@ -30,6 +30,6 @@ - \ No newline at end of file diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html index 500f15f4..74005d3a 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html @@ -22,7 +22,7 @@ - \ No newline at end of file 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 850e3de1..482b2e5d 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 @@ -13,16 +13,12 @@
- +
- + @@ -44,14 +40,8 @@ -->
- + {{ item.armoeny | currency }} @@ -72,13 +62,9 @@
- +
- + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.html b/src/app/routes/financial-management/components/driver-account/driver-account.component.html index 48f0dd3c..273f4fb0 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.html @@ -22,7 +22,7 @@ - {{ (parseFloat(item.availableBalance) + diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.html b/src/app/routes/financial-management/components/freight-account/freight-account.component.html index 6af871f4..7b399be8 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.html +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.html @@ -22,7 +22,7 @@ - {{ (parseFloat(item.availableBalance) + diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.html b/src/app/routes/financial-management/components/payable-order/payable-order.component.html index 1c8ba444..c9b31c27 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html @@ -33,7 +33,7 @@ - \ No newline at end of file diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.html b/src/app/routes/financial-management/components/payment-order/payment-order.component.html index 550284cb..19dea04f 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html @@ -34,7 +34,7 @@ - \ No newline at end of file diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html index e91d996d..f8e57409 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html @@ -30,7 +30,7 @@ - {{ item.orderPaymentCode }}
{{ item.paymentStatusLabel }} diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html index 15410efd..c6357c07 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html @@ -52,7 +52,7 @@ - \ No newline at end of file diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html index fc27ab71..8fc5d945 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html @@ -40,7 +40,7 @@ - \ No newline at end of file diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html index 48799be7..172bf9ea 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html @@ -31,7 +31,7 @@ - \ No newline at end of file diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html index 0b4341bc..91ab320d 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html @@ -36,7 +36,7 @@ - {{ item.transferBankOpenName }}
{{ item.transferBankCardNumber }} diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.html b/src/app/routes/financial-management/components/refund-record/refund-record.component.html index f537adfb..975f2433 100644 --- a/src/app/routes/financial-management/components/refund-record/refund-record.component.html +++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.html @@ -30,7 +30,7 @@ - {{ item.orderRefundCode }}
{{ item.refundStatusLabel }} diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html index c07d3fe5..8032d96d 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html @@ -21,7 +21,7 @@ - diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html index 6ff72e0a..d1629c67 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html @@ -33,7 +33,7 @@ --> - \ No newline at end of file diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 0edf8f62..783262c7 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -33,7 +33,7 @@ - \ No newline at end of file diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html index f81ec9dc..ddbe7769 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html @@ -65,7 +65,7 @@ - {{ item.bankName }}
{{ item.bankCardNumber }} diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html index f9a888cc..4ecdb743 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html @@ -9,36 +9,82 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. --> - - -
-
- -
-
- - - - -
-
- - - - - - - - \ No newline at end of file + + + +
+
+ +
+
+ + + + +
+
+ + + + + + + + + + + +
+ + + +

+ + + + + + +
+
+ + {{ detailData?.enterpriseName }} + + + + + + + + + + + +
+
+ + + +
+
+ + {{ detailData?.enterpriseName }} + + + + +
+
+ \ No newline at end of file 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 96e0125f..52c1e11a 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 @@ -32,6 +32,17 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { isActived: false } ]; + + @ViewChild('approvedModal', { static: false }) + approvedModal!: any; + @ViewChild('redectModal', { static: false }) + redectModal!: any; + ltdId: any = []; + roles: any = []; + detailData: any = null; + approvalOpinion = ''; + networkTransporter = null; + roleId = null; constructor(public service: UsermanageService, private router: Router, private modal: NzModalService) {} beforeReq = (requestOptions: STRequestOptions) => { @@ -70,7 +81,25 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { /** * 程序初始化入口 */ - ngOnInit() {} + ngOnInit() { + this.loadltdId(); + this.loadRoles(); + } + + loadltdId() { + this.service.getNetworkFreightForwarder().subscribe(res => { + if (res) { + this.ltdId = res; + } + }); + } + loadRoles() { + this.service.getRoles({ enterpriseId: 0, projectId: 0 }).subscribe(res => { + if (res) { + this.roles = res; + } + }); + } /** * 查看详情 @@ -123,6 +152,56 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { }); } + auditPass(item: any) { + this.detailData = item; + this.networkTransporter = null; + this.roleId = null; + this.modal.create({ + nzTitle: '审核通过', + nzContent: this.approvedModal, + nzOnOk: () => { + if (!this.networkTransporter || !this.roleId) { + return false; + } + this.auditEnterprise(20); + return; + } + }); + } + auditNo(item: any) { + this.detailData = item; + this.approvalOpinion = ''; + this.roleId = null; + this.modal.create({ + nzTitle: '审核驳回', + nzContent: this.redectModal, + nzOnOk: () => { + if (!this.approvalOpinion) { + return false; + } + this.auditEnterprise(30); + return; + } + }); + } + + private auditEnterprise(status: number) { + this.service + .request(this.service.$api_audit_freight, { + approvalStatus: status, + id: this.detailData.id, + approvalOpinion: this.approvalOpinion, + networkTransporter: this.networkTransporter, + roleId: this.roleId || null + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success(status === 20 ? '审核通过' : '驳回成功'); + } + this.st.load(1); + }); + } + View(record: any) { this.router.navigate([`/usercenter/freight/enterprise/detail/${record.id}`]); } @@ -159,22 +238,48 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { initEnterST(): STColumn[] { return [ { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 }, - { 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: 170 }, + { title: '统一社会信用代码', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 }, + { + title: '公司所在地', + className: 'text-center', + index: 'province', + width: 200, + format: item => `${item.provinceName}${item.cityName}${item.areaName}` + }, + { + title: '企业类型', + className: 'text-center', + index: 'enterpriseType', + width: 200, + type: 'enum', + enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' } + }, + { title: '管理员', className: 'text-center', index: 'contacter', width: 150, format: item => `${item.contacter}
/${item.mobile}` }, + { + title: '常用服务', + className: 'text-center', + index: 'oftenUsedServices', + type: 'enum', + enum: { 10: '整车发货', 20: '大宗发货' }, + width: 140 + }, + { title: '业务员', className: 'text-center', index: 'promotersTelephone', width: 150 }, + { + title: '注册渠道', + className: 'text-center', + index: 'source', + type: 'enum', + enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' }, + width: 130 + }, + { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' }, + { title: '审核时间', className: 'text-center', index: 'approvalTime', width: 180, type: 'date' }, + { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 }, { title: '审核状态', className: 'text-center', - index: 'approvalStatus', - type: 'badge', - badge: { - 10: { text: '待审核', color: 'processing' }, - 15: { text: '已撤销', color: 'processing' }, - 20: { text: '已成功', color: 'success' }, - 30: { text: '审核失败', color: 'warning' } - }, - width: 130 + render: 'approvalStatus', + width: 160 }, { title: '常用服务', @@ -190,7 +295,21 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { fixed: 'right', width: '180px', className: 'text-center', - buttons: [{ text: '查看', click: _record => this.View(_record), acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] } }] + buttons: [ + { text: '查看', click: _record => this.View(_record), acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] } }, + { + text: '通过', + click: _record => this.auditPass(_record), + acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-D-audit'] }, + iif: item => item.approvalStatus === 10 + }, + { + text: '驳回', + click: _record => this.auditNo(_record), + acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-D-audit'] }, + iif: item => item.approvalStatus === 10 + } + ] } ]; } @@ -250,17 +369,26 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { placeholder: '请输入' } }, - name: { + contactName: { title: '管理员', type: 'string', ui: { placeholder: '请输入' } }, - approval1Status: { + enterpriseType: { type: 'string', title: '企业类型', - enum: [{ label: '全部', value: '' }], + enum: [ + { label: '全部', value: '' }, + { label: '物流企业', value: 1 }, + { label: '货运代理', value: 2 }, + { label: '生产型企业', value: 3 }, + { label: '贸易类企业', value: 4 }, + { label: '科技型企业', value: 5 }, + { label: '化学化工企业', value: 6 }, + { label: '其他', value: 7 } + ], default: '', ui: { widget: 'select', @@ -269,7 +397,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { } } }, - approval11Status: { + enterpriseAddressCode: { type: 'string', title: '公司所在地', enum: [{ label: '全部', value: '' }], @@ -281,10 +409,14 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { } } }, - approval11St1atus: { + oftenUsedServices: { type: 'string', title: '常用服务', - enum: [{ label: '全部', value: '' }], + enum: [ + { label: '全部', value: '' }, + { label: '整车发货', value: 10 }, + { label: '大宗发货', value: 20 } + ], default: '', ui: { widget: 'select', @@ -293,13 +425,24 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { } } }, - approval11St11atus: { + // approval11St11atus: { + // type: 'string', + // title: '客户类型', + // enum: [{ label: '全部', value: '' }], + // default: '', + // ui: { + // widget: 'select', + // visibleIf: { + // expand: (value: boolean) => this.tabType === 1 && value + // } + // } + // }, + promotersTelephone: { + title: '业务员', type: 'string', - title: '客户类型', - enum: [{ label: '全部', value: '' }], - default: '', ui: { - widget: 'select', + placeholder: '请输入', + showRequired: false, visibleIf: { expand: (value: boolean) => this.tabType === 1 && value } @@ -316,6 +459,41 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { } } }, + approvalUserName: { + title: '审核人', + type: 'string', + maxLength: 11, + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => this.tabType === 1 && value + } + } + }, + createTime: { + title: '申请时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd HH:mm:ss', + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + approvalTime: { + title: '审核时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd HH:mm:ss', + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => this.tabType === 1 && value + } + } as SFDateWidgetSchema + }, approvalStatus: { type: 'string', title: '审核状态', @@ -334,18 +512,21 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { } } }, - createTime: { - title: '注册时间', + source: { type: 'string', + title: '注册渠道', + enum: [ + { label: '全部', value: '' }, + { label: '货主注册', value: 1 }, + { label: '平台添加', value: 2 } + ], + default: '', ui: { - widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - placeholder: '请选择', - nzShowTime: true, + widget: 'select', visibleIf: { - expand: (value: boolean) => value + expand: (value: boolean) => this.tabType === 1 && 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 3247d6c7..3aa084d5 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 @@ -123,7 +123,7 @@ -