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..ed15ef67 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 @@ -34,6 +34,19 @@ + + + + + + +
+ +
+ +

+
+
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 5fde9868..efb2984d 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 @@ -175,7 +175,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { 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: 'contacter', width: 150, format: item => `${item.contacter}
/${item.mobile}` }, { title: '常用服务', className: 'text-center', @@ -185,19 +185,22 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { width: 140 }, { title: '业务员', className: 'text-center', index: 'promotersTelephone', width: 150 }, - { title: '注册时间', className: 'text-center', index: 'createTime', width: 170 }, + { + 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: '常用服务', 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 f2ddabb7..e2504257 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -52,10 +52,6 @@ {{ item.promotersTelephone || '添加' }}
- - 冻结 - 正常 -