From 5922afc86b72475d102e96592155f167d44e2491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Tue, 10 Jan 2023 15:27:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/generator-routers.js | 39 ++++++++++++++++++- .../main/BookingLedgerNew/detail/index.vue | 12 +++--- .../detail/modules/basicInfo.vue | 2 +- .../main/BookingLedgerNew/list/index.vue | 12 +++--- 4 files changed, 51 insertions(+), 14 deletions(-) diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js index d354f0a..a06a410 100644 --- a/src/router/generator-routers.js +++ b/src/router/generator-routers.js @@ -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) diff --git a/src/views/main/BookingLedgerNew/detail/index.vue b/src/views/main/BookingLedgerNew/detail/index.vue index a7e4a43..664e2a5 100644 --- a/src/views/main/BookingLedgerNew/detail/index.vue +++ b/src/views/main/BookingLedgerNew/detail/index.vue @@ -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 } }) }, diff --git a/src/views/main/BookingLedgerNew/detail/modules/basicInfo.vue b/src/views/main/BookingLedgerNew/detail/modules/basicInfo.vue index a0287b5..b9d3e40 100644 --- a/src/views/main/BookingLedgerNew/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedgerNew/detail/modules/basicInfo.vue @@ -577,7 +577,7 @@ import { } from '@/api/modular/main/BookingLedger' export default { - name: 'BookingDetail', + name: 'BookingDetailNew', components: { XCard, AutoComplete diff --git a/src/views/main/BookingLedgerNew/list/index.vue b/src/views/main/BookingLedgerNew/list/index.vue index 9c0a219..e6ad591 100644 --- a/src/views/main/BookingLedgerNew/list/index.vue +++ b/src/views/main/BookingLedgerNew/list/index.vue @@ -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