给测试

dev
张同海 2 years ago
parent 6f74d27613
commit 5922afc86b

@ -26,6 +26,7 @@ const constantRouterComponents = {
// 默认首页
Console: () => import('@/views/system/index/welcome'),
BookingDetail: () => import('@/views/main/BookingLedger/detail'),
BookingDetailNew: () => import('@/views/main/BookingLedgerNew/detail'),
CustomerInformationManagementAdd: () => import('@/views/main/Customer/addForm'),
CustomerInformationManagementEdit: () => import('@/views/main/Customer/editForm')
}
@ -190,7 +191,42 @@ const booking = [
component: 'CustomerInformationManagementEdit'
}
]
// 订舱
const bookingNew = [
{
name: 'BookingDetailNew',
path: '/BookingDetailNew',
pid: 0,
id: 10031,
meta: {
title: '订舱详情',
show: false
},
component: 'BookingDetailNew'
},
{
name: 'CustomerInformationManagementAdd',
path: '/CustomerInformationManagementAdd',
pid: 0,
id: 10032,
meta: {
title: '新增客户',
show: false
},
component: 'CustomerInformationManagementAdd'
},
{
name: 'CustomerInformationManagementEdit',
path: '/CustomerInformationManagementEdit',
pid: 0,
id: 10033,
meta: {
title: '编辑客户',
show: false
},
component: 'CustomerInformationManagementEdit'
}
]
// 根级菜单
const rootRouter = {
key: '',
@ -223,6 +259,7 @@ export const generatorDynamicRouter = data => {
*/
listToTree(userAccount, childrenNav, 0)
listToTree(booking, childrenNav, 0)
listToTree(bookingNew, childrenNav, 0)
rootRouter.children = childrenNav
menuNav.push(rootRouter)
const routers = generator(menuNav)

@ -249,7 +249,7 @@ const initDetail = {
hbList: []
}
export default {
name: 'BookingDetail',
name: 'BookingDetailNew',
inject: ['reload'],
components: {
operationArea,
@ -953,7 +953,7 @@ export default {
} else {
// console.log('1.2 == - ==', this.id)
this.$router.replace({
name: 'BookingDetail',
name: 'BookingDetailNew',
query: {
id: this.id,
type: this.bookingDetails.carrierid,
@ -1058,7 +1058,7 @@ export default {
this.$message.success('保存成功')
// this.bookingDetails = JSON.parse(JSON.stringify(initDetail))
this.$router.replace({
name: 'BookingDetail',
name: 'BookingDetailNew',
query: {
id: res.data,
type: this.bookingDetails.carrierid,
@ -1146,7 +1146,7 @@ export default {
delete $data[this.$route.fullPath]
this.setNeedSavePages($data)
this.$router.replace({
name: 'BookingDetail',
name: 'BookingDetailNew',
query: { id: prevId, type: prevType, mblno: this.bookingList[prevId].mblno, noOpenTab: true }
})
// this.$route.query.id = 1123
@ -1161,7 +1161,7 @@ export default {
delete $data[this.$route.fullPath]
this.setNeedSavePages($data)
this.$router.replace({
name: 'BookingDetail',
name: 'BookingDetailNew',
query: { id: nextId, type: nextType, mblno: this.bookingList[nextId].mblno, noOpenTab: true }
})
}
@ -1171,7 +1171,7 @@ export default {
},
copyBookingFun() {
this.$router.push({
name: 'BookingDetail',
name: 'BookingDetailNew',
query: { id: this.id, isCopy: true, type: this.bookingDetails.carrierid }
})
},

@ -577,7 +577,7 @@ import {
} from '@/api/modular/main/BookingLedger'
export default {
name: 'BookingDetail',
name: 'BookingDetailNew',
components: {
XCard,
AutoComplete

@ -778,7 +778,7 @@ export default {
this.getList(this.formRes)
},
editPageSizeSave (pageSize = 10) {
editPageSizeSave(pageSize = 10) {
const data = {
pageSize: pageSize
}
@ -790,7 +790,7 @@ export default {
})
},
getPageSize () {
getPageSize() {
DjyUserConfigGet({ type: 'booking_list_page' }).then(res => {
if (res.data && JSON.parse(res.data.configJson)) {
this.gridOptions.pagerConfig.pageSize = JSON.parse(res.data.configJson).pageSize
@ -946,7 +946,7 @@ export default {
this.editColumns(row)
},
editColumns(row) {
this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } })
this.$router.push({ name: 'BookingDetailNew', query: { id: row.id, type: row.carrierid, mblno: row.mblno } })
},
getList(queryParam = {}) {
this.$set(this.gridOptions, 'loading', true)
@ -1037,7 +1037,7 @@ export default {
this.$message.error('请至少选择一条数据')
return false
}
this.$router.push({ name: 'BookingDetail', query: { id: pkIdArr[0], isCopy: true } })
this.$router.push({ name: 'BookingDetailNew', query: { id: pkIdArr[0], isCopy: true } })
},
copyBookingMore() {
const select = this.$refs.xGrid.getCheckboxRecords()
@ -1050,13 +1050,13 @@ export default {
}
//
// pkIdArr.map((item, index) => {
// this.$router.push({ name: 'BookingDetail', query: { id: item, isCopy: true } })
// this.$router.push({ name: 'BookingDetailNew', query: { id: item, isCopy: true } })
// })
},
addSubmit() {
this.addVisible = false
this.addNum = Math.round(Math.random() * 1000)
this.$router.push({ name: 'BookingDetail', query: { type: this.carrierRadio, addNum: this.addNum } })
this.$router.push({ name: 'BookingDetailNew', query: { type: this.carrierRadio, addNum: this.addNum } })
},
addCancel() {
this.addVisible = false

Loading…
Cancel
Save