diff --git a/public/index.html b/public/index.html index 4b342e0..dda247b 100644 --- a/public/index.html +++ b/public/index.html @@ -4,13 +4,14 @@ - + 大简云服务 <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> <% } %> + diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js new file mode 100644 index 0000000..84ebc9e --- /dev/null +++ b/src/api/modular/main/BookingLedger.js @@ -0,0 +1,14 @@ +import { axios } from '@/utils/request' + +/** + * 分页查询订舱主表 + * @params PageSize + * @params PageNo + */ +export function BookingOrderPage (parameter) { + return axios({ + url: '/BookingOrder/page', + method: 'get', + params: parameter + }) +} diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js index 0f41e2a..111d71d 100644 --- a/src/router/generator-routers.js +++ b/src/router/generator-routers.js @@ -24,7 +24,8 @@ const constantRouterComponents = { TableDemo: () => import('@/views/tableDemo/index'), OrderList: () => import('@/views/Booking/OrderList/index'), // 默认首页 - Console: () => import('@/views/system/index/welcome') + Console: () => import('@/views/system/index/welcome'), + BookingDetail: () => import('@/views/main/BookingLedger/detail') } // 前端未找到页面路由(固定不用改)、原来为 /404 @@ -151,6 +152,21 @@ const userAccount = [ } ] +// 订舱 +const booking = [ + { + name: 'BookingDetail', + path: '/BookingDetail', + pid: 0, + id: 10031, + meta: { + title: '订舱详情', + show: false + }, + component: 'BookingDetail' + } +] + // 根级菜单 const rootRouter = { key: '', @@ -182,6 +198,7 @@ export const generatorDynamicRouter = data => { * 增加静态网页 */ listToTree(userAccount, childrenNav, 0) + listToTree(booking, childrenNav, 0) rootRouter.children = childrenNav menuNav.push(rootRouter) const routers = generator(menuNav) diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue new file mode 100644 index 0000000..e8f1997 --- /dev/null +++ b/src/views/main/BookingLedger/detail/index.vue @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue new file mode 100644 index 0000000..41ec2eb --- /dev/null +++ b/src/views/main/BookingLedger/list/index.vue @@ -0,0 +1,455 @@ + + + diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js new file mode 100644 index 0000000..9797bc0 --- /dev/null +++ b/src/views/main/BookingLedger/list/modules/initData.js @@ -0,0 +1,18 @@ +export default { + columns: [ + { type: 'checkbox', width: 60, noDraggable: true }, + { field: 'YARD', title: '场站', showHeaderOverflow: true, sortable: true }, + { field: 'MBLNO', title: '提单号', showHeaderOverflow: true, sortable: true }, + { field: 'nameVoyage', title: '船名航次', showHeaderOverflow: true, sortable: true }, + { field: 'ETD', title: '开船日期', showHeaderOverflow: true, sortable: true }, + { field: 'wharf', title: '海关码头', showHeaderOverflow: true }, + { field: 'bookingStatus', title: '定舱状态', showHeaderOverflow: true }, + { field: 'VGM', title: 'VGM', showHeaderOverflow: true }, + { field: 'billStatus', title: '提单状态', showHeaderOverflow: true }, + { field: 'PORTDISCHARGE', title: '卸货港', showHeaderOverflow: true, sortable: true }, + { field: 'createdBy', title: '创建人', showHeaderOverflow: true, sortable: true }, + { field: 'createdTime', title: '创建时间', showHeaderOverflow: true, sortable: true }, + { field: 'boxType', title: '箱型箱量', showHeaderOverflow: true, sortable: true }, + { title: '操作', width: 80, noDraggable: true, slots: { default: 'operate' }, fixed: 'right' } + ] +}