解决冲突

master
sunzehua 11 months ago
commit b3a2449d81

Binary file not shown.

@ -26,6 +26,7 @@ const constantRouterComponents = {
// 默认首页 // 默认首页
Console: () => import('@/views/system/index/welcome'), Console: () => import('@/views/system/index/welcome'),
BookingDetail: () => import('@/views/main/BookingLedger/detail'), BookingDetail: () => import('@/views/main/BookingLedger/detail'),
ExpressModuleDetails: () => import('@/views/main/ExpressModule/details'),
CustomerInformationManagementAdd: () => import('@/views/main/Customer/addForm'), CustomerInformationManagementAdd: () => import('@/views/main/Customer/addForm'),
CustomerInformationManagementEdit: () => import('@/views/main/Customer/editForm'), CustomerInformationManagementEdit: () => import('@/views/main/Customer/editForm'),
SendCarAdd: () => import('@/views/main/SendCar/addForm'), SendCarAdd: () => import('@/views/main/SendCar/addForm'),
@ -347,6 +348,20 @@ const bookingNew = [
component: 'CustomerInformationManagementEdit' component: 'CustomerInformationManagementEdit'
} }
] ]
// 快递
const ExpressModule = [
{
name: 'ExpressModuleDetails',
path: '/ExpressModuleDetails',
pid: 0,
id: 10031,
meta: {
title: '快递详情',
show: false
},
component: 'ExpressModuleDetails'
}
]
// 根级菜单 // 根级菜单
const rootRouter = { const rootRouter = {
key: '', key: '',
@ -380,6 +395,7 @@ export const generatorDynamicRouter = data => {
listToTree(userAccount, childrenNav, 0) listToTree(userAccount, childrenNav, 0)
listToTree(booking, childrenNav, 0) listToTree(booking, childrenNav, 0)
listToTree(bookingNew, childrenNav, 0) listToTree(bookingNew, childrenNav, 0)
listToTree(ExpressModule, childrenNav, 0)
rootRouter.children = childrenNav rootRouter.children = childrenNav
menuNav.push(rootRouter) menuNav.push(rootRouter)
const routers = generator(menuNav) const routers = generator(menuNav)

@ -1660,6 +1660,8 @@ export default {
kdCompany: 'sf', kdCompany: 'sf',
date: this.GetDate() date: this.GetDate()
}) })
this.feeListDataNum = 0.0
this.feeListData = []
}) })
if (this.kdAddData[this.WebId]) { if (this.kdAddData[this.WebId]) {
setTimeout(() => { setTimeout(() => {

Loading…
Cancel
Save