From 458d85d8ed668ed3561d43ddcfc3b06a6577f440 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Tue, 20 Feb 2024 11:28:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E6=8F=90=E4=BA=A4=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modular/main/BookingLedger.js | 16 + src/api/modular/main/TaskmanageList.js | 30 +- src/config/router.config.js | 5 + src/permission.js | 3 +- src/views/main/BookingLedger/detail/index.vue | 58 +- .../detail/modules/goodsTable.vue | 109 +- src/views/main/BookingLedger/list/index.vue | 12 +- .../main/Taskmanage/notifications/index.vue | 1153 +++++++++++++++++ .../Taskmanage/rollingNomination/index.vue | 190 ++- src/views/main/fee/feeUnits.vue | 79 +- 10 files changed, 1544 insertions(+), 111 deletions(-) create mode 100644 src/views/main/Taskmanage/notifications/index.vue diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index 294e19d..05eff1c 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -1280,3 +1280,19 @@ export function CancelAllocationSlot(parameter) { }) } +export function GetCtnListRefsh(parameter) { + return axios({ + url: '/BookingOrder/GetCtnList', + method: 'get', + params: parameter + }) +} + +export function CheckCtnCover(parameter) { + return axios({ + url: '/BookingOrder/CheckCtnCover', + method: 'post', + data: parameter + }) +} + diff --git a/src/api/modular/main/TaskmanageList.js b/src/api/modular/main/TaskmanageList.js index d4fa880..a448f22 100644 --- a/src/api/modular/main/TaskmanageList.js +++ b/src/api/modular/main/TaskmanageList.js @@ -361,8 +361,8 @@ export function GetLoadStatusDetailList(parameter) { export function RefreshBookingorder(parameter) { return axios({ url: '/TaskManageRollingNomination/RefreshBookingorder', - method: 'post', - data: parameter + method: 'get', + params: parameter }) } @@ -378,7 +378,7 @@ export function TaskManageRolingWominationCancelsharelink(parameter) { return axios({ url: '/TaskManageRollingNomination/Cancelsharelink', method: 'post', - data: parameter + params: parameter }) } @@ -397,3 +397,27 @@ export function CreateShareLink(parameter) { data: parameter }) } + +export function GetPreBillDetailList(parameter) { + return axios({ + url: '/TaskManageRollingNomination/GetPreBillDetailList', + method: 'get', + params: parameter + }) +} + +export function SaveDetai1Container(parameter) { + return axios({ + url: '/TaskManageRollingNomination/SaveDetailContainer', + method: 'post', + data: parameter + }) +} + +export function PushShareLink(parameter) { + return axios({ + url: '/TaskManageRollingNomination/PushShareLink', + method: 'post', + data: parameter + }) +} diff --git a/src/config/router.config.js b/src/config/router.config.js index 35dfe5a..ac49410 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -77,6 +77,11 @@ export const constantRouterMap = [ } ] }, + { + name: 'notifications', + path: '/notifications', + component: () => import('@/views/main/Taskmanage/notifications/index') + }, { path: '/404', component: () => import(/* webpackChunkName: "fail" */ '@/views/system/exception/404') diff --git a/src/permission.js b/src/permission.js index 26c9126..263a7a5 100644 --- a/src/permission.js +++ b/src/permission.js @@ -10,7 +10,7 @@ import { ACCESS_TOKEN, ALL_APPS_MENU } from '@/store/mutation-types' import { Modal, notification } from 'ant-design-vue' // NProgress Configuration import { timeFix } from '@/utils/util' /// es/notification NProgress.configure({ showSpinner: false }) -const whiteList = ['login', 'register', 'registerResult'] // no redirect whitelist +const whiteList = ['login', 'register', 'registerResult', 'notifications'] // no redirect whitelist // 无默认首页的情况 const defaultRoutePath = '/welcome' @@ -141,6 +141,7 @@ router.beforeEach((to, from, next) => { } } } else { + console.log(to) if (whiteList.includes(to.name)) { // 在免登录白名单，直接进入 next() diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 62efd33..dfbc9dd 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -95,6 +95,7 @@ :isLockBooking="isLockBooking" @changectnall="changectnall" @changeDetail="changeDetailFun" + @handleRefshTable="handleRefshTable" @changeTotal="changeTotalFun" @changeCtnInfo="changeCtnInfoFun"> @@ -119,7 +120,7 @@ ref="iframe" @load="handleIframeLoad" style="width: 100%;height: 1400px;" - src="http://60.209.125.238:35103/#/index" + src="http://localhost:8080/#/index" frameborder="0"> @@ -182,7 +183,9 @@ import { GetAllData, DeleteBookingOrder, listYardBwCarrier, - ListAgentByCarrier + ListAgentByCarrier, + CheckCtnCover, + GetCtnListRefsh } from '@/api/modular/main/BookingLedger' import { mapActions, mapGetters } from 'vuex' import rules from './rulesTest' @@ -1690,6 +1693,41 @@ export default { kindpkgs = item.kindpkgs }) const that = this + const refsh = () => { + this.$refs.goodsTable.handleRefsh() + } + const check = () => { + if (this.bookingDetails.id !== 0) { + const checkData = { + bookingOrderId: this.bookingDetails.id, + ctnInputs: this.bookingDetails.ctnInputs + } + this.$message.loading({ content: '数据校验中, 请勿切换页面...' }) + CheckCtnCover(checkData).then(res => { + if (res.success) { + if (!res.data) { + FnOk() + } else { + this.$confirm({ + content: (

箱信息发生改变,是否要覆盖保存?
否：取消保存并刷新箱信息 是：覆盖保存

), + okText: '是', + okType: 'danger', + cancelText: '否', + onOk() { + FnOk() + }, + onCancel() { + refsh() + }, + class: 'test' + }) + } + } + }) + } else { + FnOk() + } + } const confirm = text => { this.$confirm({ title: `${text}不一致，是否继续?`, @@ -1697,7 +1735,7 @@ export default { okType: 'danger', cancelText: '否', onOk() { - FnOk() + check() }, onCancel() { return false @@ -1737,7 +1775,7 @@ export default { if (WText) { confirm(WText) } else { - FnOk() + check() } }, @@ -1825,6 +1863,18 @@ export default { this.changePage(type) } }, + handleRefshTable() { + this.$refs.goodsTable.loadingTable = true + GetCtnListRefsh({ orderId: this.bookingDetails.id }).then(res => { + if (res.success) { + this.bookingDetails.ctnInputs = res.data + this.$refs.goodsTable.init() + } else { + this.$message.error(res.message) + } + this.$refs.goodsTable.loadingTable = false + }) + }, changePage(type) { const nowId = this.$route.query.id const arr = Object.keys(this.bookingList) diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index f34576e..84c3872 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -1,57 +1,60 @@ + diff --git a/src/views/main/Taskmanage/rollingNomination/index.vue b/src/views/main/Taskmanage/rollingNomination/index.vue index 29127a4..732acbb 100644 --- a/src/views/main/Taskmanage/rollingNomination/index.vue +++ b/src/views/main/Taskmanage/rollingNomination/index.vue @@ -59,7 +59,7 @@
预甩明细 - 发送通知 + 发送通知 刷新订舱对应
@@ -74,7 +75,7 @@ {{ text ? '是' : '否' }}
- 查看 + 查看
{{ record.userOpinion ? '是' : '否' }} @@ -83,8 +84,9 @@
{{ record.isUserManual ? '是' : '否' }}
-
- {{ text }} +
+ {{ text }} + {{ text }}
@@ -356,6 +358,43 @@ + + + +
+ 箱型高度未提供 +
+ + + + + + {{ item.name }} + + +