Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-03-24 09:41:07 +08:00
parent 786010bb59 e30c920892
commit 3f27d0b1a1
2 changed files with 648 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
View File

@ -56,8 +56,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
initSF() { initSF() {
this.schema = { this.schema = {
properties: { properties: {
ltdName: {
abnormalCause: {
title: '网络货运人', title: '网络货运人',
type: 'string', type: 'string',
ui: { ui: {
@ -78,7 +77,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
{ title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 }, { title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 },
{ title: '银行类型', render: 'bankTypeLabel', className: 'text-center', width: 150 }, { title: '银行类型', render: 'bankTypeLabel', className: 'text-center', width: 150 },
{ title: '虚拟账户', render: 'fictitiousAccount', className: 'text-center', width: 200 }, { title: '虚拟账户', render: 'fictitiousAccount', className: 'text-center', width: 200 },
{ title: '返佣总额（元）', index: 'totalRebate', className: 'text-center', width: 120, type: 'currency' }, { title: '返佣总额（元）', index: 'totalRebate', className: 'text-center', width: 180, type: 'currency' },
{ title: '已入账金额（元）', index: 'recordedAmount', className: 'text-center', width: 180, type: 'currency' }, { title: '已入账金额（元）', index: 'recordedAmount', className: 'text-center', width: 180, type: 'currency' },
{ title: '代缴个税（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' }, { title: '代缴个税（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' },
{ title: '待入账金额（元）', index: 'waitRecordedAmount', className: 'text-right', width: 180, type: 'currency' }, { title: '待入账金额（元）', index: 'waitRecordedAmount', className: 'text-right', width: 180, type: 'currency' },

431
src/assets/mocks/menu-data.json
View File

@ -1,20 +1,16 @@
{ {
"success": true, "success": true,
"data": { "data": {
"menu": [ "menu": [{
{
"text": "主导航", "text": "主导航",
"hideInBreadcrumb": true, "hideInBreadcrumb": true,
"children": [ "children": [{
{
"text": "用户中心", "text": "用户中心",
"icon": "iconfont icon-yonghu-copy", "icon": "iconfont icon-yonghu-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "货主管理", "text": "货主管理",
"children": [ "children": [{
{
"text": "企业列表", "text": "企业列表",
"link": "/usercenter/freight/list" "link": "/usercenter/freight/list"
}, },
@ -56,8 +52,7 @@
{ {
"text": "司机管理", "text": "司机管理",
"link": "/demo/zorro", "link": "/demo/zorro",
"children": [ "children": [{
{
"text": "司机列表", "text": "司机列表",
"link": "/usercenter/driver" "link": "/usercenter/driver"
}, },
@ -82,8 +77,7 @@
"text": "运力管理", "text": "运力管理",
"icon": "iconfont icon-yunli-copy", "icon": "iconfont icon-yunli-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "车辆列表", "text": "车辆列表",
"link": "/vehicle/list" "link": "/vehicle/list"
}, },
@ -107,8 +101,7 @@
"text": "货源管理", "text": "货源管理",
"icon": "iconfont icon-huoyuan-copy", "icon": "iconfont icon-huoyuan-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "货源管理", "text": "货源管理",
"link": "/supply-management/index", "link": "/supply-management/index",
"reuse": true "reuse": true
@ -144,8 +137,7 @@
"text": "订单管理", "text": "订单管理",
"icon": "iconfont icon-dingdan-copy", "icon": "iconfont icon-dingdan-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "整车订单", "text": "整车订单",
"link": "/order-management/vehicle" "link": "/order-management/vehicle"
}, },
@ -185,8 +177,7 @@
"text": "运单管理", "text": "运单管理",
"icon": "iconfont icon-yundan-copy", "icon": "iconfont icon-yundan-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "整车运单", "text": "整车运单",
"link": "/waybill-management/vehicle" "link": "/waybill-management/vehicle"
}, },
@ -214,19 +205,16 @@
"text": "保险管理", "text": "保险管理",
"icon": "iconfont icon-yundan-copy", "icon": "iconfont icon-yundan-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "保险列表", "text": "保险列表",
"link": "/insurance-management/list" "link": "/insurance-management/list"
} }]
]
}, },
{ {
"text": "财务管理", "text": "财务管理",
"icon": "iconfont icon-caiwu-copy", "icon": "iconfont icon-caiwu-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "费用管理", "text": "费用管理",
"link": "/financial-management/cost-management" "link": "/financial-management/cost-management"
}, },
@ -332,11 +320,9 @@
"text": "票务管理", "text": "票务管理",
"icon": "iconfont icon-piaowu-copy", "icon": "iconfont icon-piaowu-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "销项发票", "text": "销项发票",
"children": [ "children": [{
{
"text": "开票申请", "text": "开票申请",
"link": "/ticket/invoice-requested" "link": "/ticket/invoice-requested"
}, },
@ -371,8 +357,7 @@
}, },
{ {
"text": "ETC发票", "text": "ETC发票",
"children": [ "children": [{
{
"text": "申请发票", "text": "申请发票",
"link": "/ticket/etc-invoice-requested" "link": "/ticket/etc-invoice-requested"
}, },
@ -410,8 +395,7 @@
"text": "合同管理", "text": "合同管理",
"icon": "iconfont icon-hetong-copy", "icon": "iconfont icon-hetong-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "保单管理", "text": "保单管理",
"link": "/contract-management/policy" "link": "/contract-management/policy"
}, },
@ -429,12 +413,10 @@
"text": "系统设置", "text": "系统设置",
"icon": "iconfont icon-shezhi-copy", "icon": "iconfont icon-shezhi-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "员工管理", "text": "员工管理",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "员工管理", "text": "员工管理",
"link": "/system/staff-management" "link": "/system/staff-management"
}, },
@ -447,8 +429,7 @@
{ {
"text": "操作日志", "text": "操作日志",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "系统操作日志", "text": "系统操作日志",
"link": "/logs/system-logs" "link": "/logs/system-logs"
}, },
@ -527,8 +508,7 @@
{ {
"text": "合伙人管理", "text": "合伙人管理",
"icon": "anticon anticon-dashboard", "icon": "anticon anticon-dashboard",
"children": [ "children": [{
{
"text": "合伙人列表", "text": "合伙人列表",
"link": "/partner/partner-list" "link": "/partner/partner-list"
}, },
@ -539,8 +519,7 @@
{ {
"text": "返佣管理", "text": "返佣管理",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "返佣配置", "text": "返佣配置",
"link": "/partner/rebate/setting" "link": "/partner/rebate/setting"
}, },
@ -565,8 +544,7 @@
{ {
"text": "账户管理", "text": "账户管理",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "账户管理", "text": "账户管理",
"link": "/partner/account-management/am/list" "link": "/partner/account-management/am/list"
}, },
@ -631,16 +609,13 @@
"text": "知识库管理", "text": "知识库管理",
"icon": "iconfont icon-yundan-copy", "icon": "iconfont icon-yundan-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "banner管理", "text": "banner管理",
"link": "/partner/knowledge/banner", "link": "/partner/knowledge/banner",
"children": [ "children": [{
{
"text": "新增banner", "text": "新增banner",
"link": "/partner/knowledge/banner/detail" "link": "/partner/knowledge/banner/detail"
} }]
]
}, },
{ {
"text": "文章管理", "text": "文章管理",
@ -657,353 +632,6 @@
"hide": true "hide": true
} }
] ]
},
{
"text": "运单管理",
"icon": "iconfont icon-yundan-copy",
"group": true,
"children": [
{
"text": "整车运单",
"link": "/waybill-management/vehicle"
},
{
"hide": true,
"text": "整车运单详情",
"link": "/waybill-management/vehicle-detail/:id"
},
{
"text": "大宗运单",
"link": "/waybill-management/bulk"
},
{
"hide": true,
"text": "大宗运单详情",
"link": "/waybill-management/bulk-detail/:id"
},
{
"text": "异常上报",
"link": "/waybill-management/abnormal-appear"
}
]
},
{
"text": "保险管理",
"icon": "iconfont icon-yundan-copy",
"group": true,
"children": [
{
"text": "保险列表",
"link": "/insurance-management/list"
}
]
},
{
"text": "财务管理",
"icon": "iconfont icon-caiwu-copy",
"group": true,
"children": [
{
"text": "费用管理",
"link": "/financial-management/cost-management"
},
{
"text": "费用浏览",
"hide": true,
"link": "/financial-management/cost-management/detail/:id"
},
{
"text": "凭证管理",
"link": "/financial-management/voucher-management"
},
{
"text": "凭证汇总",
"link": "/financial-management/voucher-summary"
},
{
"text": "应收费用单",
"hide": true,
"link": "/financial-management/cost-management/expenses-receivable/:id"
},
{
"text": "应付费用单",
"hide": true,
"link": "/financial-management/cost-management/expenses-payable/:id"
},
{
"text": "付款单",
"link": "/financial-management/payment-order"
},
{
"text": "收款单",
"link": "/financial-management/receipt-order"
},
{
"text": "应收核销",
"link": "/financial-management/receivable-order"
},
{
"text": "应收核销详情",
"hide": true,
"link": "/financial-management/receivable-order/detail/:id"
},
{
"text": "应付核销",
"link": "/financial-management/payable-order"
},
{
"text": "应收核销详情",
"hide": true,
"link": "/financial-management/payable-order/detail/:id"
},
{
"text": "货主账户",
"link": "/financial-management/freight-account"
},
{
"text": "货主账户详情",
"hide": true,
"link": "/financial-management/freight-account/detail/:id"
},
{
"text": "平台账户",
"link": "/financial-management/platform-account"
},
{
"text": "司机账户",
"link": "/financial-management/driver-account"
},
{
"text": "司机账户详情",
"hide": true,
"link": "/financial-management/driver-account/detail/:id"
},
{
"text": "充值记录",
"link": "/financial-management/recharge-record"
},
{
"text": "提现记录",
"link": "/financial-management/withdrawals-record"
},
{
"text": "提现详情",
"hide": true,
"link": "/financial-management/withdrawals-record/detail/:id"
},
{
"text": "异常入金",
"link": "/financial-management/abnormal-gold"
},
{
"text": "支付记录",
"link": "/financial-management/payment-record"
},
{
"text": "交易流水",
"link": "/financial-management/transaction-flow"
}
]
},
{
"text": "票务管理",
"icon": "iconfont icon-piaowu-copy",
"group": true,
"children": [
{
"text": "销项发票",
"children": [
{
"text": "开票申请",
"link": "/ticket/invoice-requested"
},
{
"text": "开票订单明细",
"link": "/ticket/invoice-requested/detail/:id",
"hide": true
},
{
"text": "销票处理",
"link": "/ticket/cancellation-invoice"
},
{
"text": "销票订单明细",
"link": "/ticket/cancellation-invoice/detail/:id",
"hide": true
},
{
"text": "已开发票",
"link": "/ticket/invoice-list"
},
{
"text": "已开订单明细",
"link": "/ticket/invoice-list/detail/:id",
"hide": true
},
{
"text": "快递信息",
"link": "/ticket/express-info"
}
]
},
{
"text": "ETC发票",
"children": [
{
"text": "申请发票",
"link": "/ticket/etc-invoice-requested"
},
{
"text": "开票记录",
"link": "/ticket/etc-invoice-list"
},
{
"text": "已开发票",
"link": "/ticket/etc-invoiced-logs"
},
{
"text": "ETC白名单",
"link": "/ticket/etc-blacklist"
}
]
},
{
"text": "进项发票",
"link": "/ticket/input-invoice"
},
{
"text": "修改收票信息",
"link": "/ticket/input-invoice/detail/:id",
"hide": true
},
{
"text": "进项发票",
"link": "/ticket/input-invoice/edit/:id",
"hide": true
}
]
},
{
"text": "合同管理",
"icon": "iconfont icon-hetong-copy",
"group": true,
"children": [
{
"text": "保单管理",
"link": "/contract-management/policy"
},
{
"text": "合同管理",
"link": "/contract-management/index"
},
{
"text": "合同模板",
"link": "/contract-management/template"
}
]
},
{
"text": "系统设置",
"icon": "iconfont icon-shezhi-copy",
"group": true,
"children": [
{
"text": "员工管理",
"group": true,
"children": [
{
"text": "员工管理",
"link": "/system/staff-management"
},
{
"text": "角色管理",
"link": "/system/role-management"
}
]
},
{
"text": "操作日志",
"group": true,
"children": [
{
"text": "系统操作日志",
"link": "/logs/system-logs"
},
{
"text": "货源操作日志",
"link": "/logs/system-supply-logs"
},
{
"text": "订单操作日志",
"link": "/logs/system-waybill-logs"
},
{
"text": "用户登录日志",
"link": "/logs/user-logs"
},
{
"text": "版本发布记录",
"link": "/logs/version-logs"
}
]
},
{
"text": "CRM客户管理",
"link": "/system/crm-management"
},
{
"text": "短信管理",
"link": "/system/note-management"
},
{
"text": "结算客户管理",
"link": "/system/close-account"
},
{
"text": "网络货运人",
"link": "/system/network-freight"
},
{
"text": "基础设置",
"link": "/system/basic-setting"
},
{
"text": "保险配置",
"link": "/system/insurance-set"
},
{
"text": "公告信息管理",
"link": "/system/announcement-message"
},
{
"text": "车型车长配置",
"link": "/system/cart-config"
},
{
"text": "基础配置",
"link": "/system/basic-config"
},
{
"text": "协议配置",
"link": "/system/agreement-config"
},
{
"text": "菜单管理",
"link": "/menu-management/index"
},
{
"text": "接口权限",
"link": "/menu-management/auth"
},
{
"text": "系统配置",
"link": "/system/system-config"
},
{
"text": "分类管理",
"link": "/partner/knowledge/classification"
}
]
} }
] ]
}, },
@ -1011,15 +639,12 @@
"text": "数据监管", "text": "数据监管",
"icon": "iconfont icon-hetong-copy", "icon": "iconfont icon-hetong-copy",
"group": true, "group": true,
"children": [ "children": [{
{
"text": "数据报表", "text": "数据报表",
"link": "/regulatory-data/dashboard" "link": "/regulatory-data/dashboard"
}]
} }
] ]
} }]
]
}
]
} }
} }