diff --git a/.env b/.env index 8a0c6fd..99f2e07 100644 --- a/.env +++ b/.env @@ -1,14 +1,14 @@ NODE_ENV=production VUE_APP_PREVIEW=true -VUE_APP_TYPE = 'customer' -# VUE_APP_TYPE = 'hechuan' +# VUE_APP_TYPE = 'customer' +VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy # 和川大简云正式 -# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api -# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 +VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # 和川大简云测试 # VUE_APP_API_BASE_URL=http://60.209.125.238:35100 @@ -27,8 +27,8 @@ VUE_APP_TYPE = 'customer' # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 # 客户端正式 -VUE_APP_API_BASE_URL=http://118.190.144.189:6001 -VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 +# VUE_APP_API_BASE_URL=http://118.190.144.189:6001 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 # 运营端正式 # VUE_APP_API_BASE_URL=http://118.190.144.189:6002 diff --git a/.env.development b/.env.development index 633bde7..3140917 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ NODE_ENV=development VUE_APP_PREVIEW=true # VUE_APP_TYPE = 'customer' # VUE_APP_TYPE = 'hechuan' -VUE_APP_TYPE = 'yunyingduan' -# VUE_APP_TYPE = 'gangjie' +# VUE_APP_TYPE = 'yunyingduan' +VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 和川大简云正式 @@ -23,12 +23,12 @@ VUE_APP_TYPE = 'yunyingduan' # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 # 港捷 -# VUE_APP_API_BASE_URL=http://118.190.144.189:5001 -# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 +VUE_APP_API_BASE_URL=http://118.190.144.189:5001 +VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 # 运营端正式 -VUE_APP_API_BASE_URL=http://118.190.144.189:6002 -VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 +# VUE_APP_API_BASE_URL=http://118.190.144.189:6002 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 # 客户端正式 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001 diff --git a/src/api/modular/main/TaskmanageList.js b/src/api/modular/main/TaskmanageList.js index 162a21f..6e68864 100644 --- a/src/api/modular/main/TaskmanageList.js +++ b/src/api/modular/main/TaskmanageList.js @@ -470,3 +470,10 @@ export function GetVGMMissingInfoByTaskId(parameter) { }) } +export function CutDateGetInfoByTaskId(parameter) { + return axios({ + url: '/TaskManageCutDate/GetInfoByTaskId', + method: 'get', + params: parameter + }) +} \ No newline at end of file diff --git a/src/mixin/index.js b/src/mixin/index.js new file mode 100644 index 0000000..a14a447 --- /dev/null +++ b/src/mixin/index.js @@ -0,0 +1,85 @@ + +export const tableSort = { + data() { + return { + message: 'Hello from Mixin!' + } + }, + methods: { + getConfigStart() { + const arr = localStorage.getItem('vesselinfoSetting') ? JSON.parse(localStorage.getItem('vesselinfoSetting')) : [] + if (arr.length === 0) { + this.columns = JSON.parse(JSON.stringify(this.columnsAll)) + const data = [ + { + type: 'vesselinfo_list_column', + configJson: JSON.stringify(this.columns) + }, + { + type: 'vesselinfo_page', + configJson: JSON.stringify({ pageSize: 10 }) + }, + { + type: 'vesselinfo_sort', + configJson: JSON.stringify({ sortField: 'etd', descSort: true }) + } + ] + localStorage.setItem('vesselinfoSetting', JSON.stringify(data)) + this.FnGetData() + } else { + const $data = {} + arr.map((item, index) => { + switch (item.type) { + case 'vesselinfo_list_column': + this.$set($data, 'vesselinfo_list_column', item) + break + case 'vesselinfo_page': + this.$set($data, 'vesselinfo_page', item) + break + case 'vesselinfo_sort': + this.$set($data, 'vesselinfo_sort', item) + break + } + }) + console.log(JSON.parse($data.vesselinfo_list_column.configJson)) + if (Object.keys($data).includes('vesselinfo_list_column')) { + this.columns = JSON.parse($data.vesselinfo_list_column.configJson) + } else { + arr.push({ + type: 'vesselinfo_list_column', + configJson: JSON.stringify(this.columns) + }) + localStorage.setItem('vesselinfoSetting', JSON.stringify(arr)) + } + if (Object.keys($data).includes('vesselinfo_page')) { + this.queryParam.PageSize = JSON.parse($data.vesselinfo_page.configJson).pageSize + } else { + arr.push({ + type: 'vesselinfo_page', + configJson: JSON.stringify({ pageSize: 10 }) + }) + localStorage.setItem('vesselinfoSetting', JSON.stringify(arr)) + } + if (Object.keys($data).includes('vesselinfo_sort')) { + const data = $data.vesselinfo_sort.configJson ? JSON.parse($data.vesselinfo_sort.configJson) : null + if (data) { + setTimeout(() => { + this.$refs.table.sort(data.sortField, data.descSort ? 'desc' : 'asc') + }, 200); + this.queryParam.sortField = data.sortField + this.queryParam.descSort = data.descSort + } + } else { + arr.push({ + type: 'vesselinfo_sort', + configJson: '' + }) + localStorage.setItem('vesselinfoSetting', JSON.stringify(arr)) + } + setTimeout(() => { + this.FnGetData() + }, 200); + } + }, + } +} diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js index bf4baab..e432e83 100644 --- a/src/router/generator-routers.js +++ b/src/router/generator-routers.js @@ -68,6 +68,7 @@ const constantRouterComponents = { BcFileDetail: () => import('@/views/main/Taskmanage/BcFileDetail'), BCModify: () => import('@/views/main/Taskmanage/BCModify/index'), vgmDetail: () => import('@/views/main/Taskmanage/vgmDetail/index'), + cutTime: () => import('@/views/main/Taskmanage/cutTime/index'), cancellation: () => import('@/views/main/Taskmanage/cancellation/index'), rollingNomination: () => import('@/views/main/Taskmanage/rollingNomination/index'), BcEditing: () => import('@/views/main/Taskmanage/BcFileDetail/Editing'), @@ -231,6 +232,17 @@ const userAccount = [ }, component: 'vgmDetail' }, + { + name: 'cutTime', + path: '/commontaskmanage/cutTime', + pid: 0, + id: 183110, + meta: { + title: '截止时间变更', + show: false + }, + component: 'cutTime' + }, { name: 'Cancellation', path: '/commontaskmanage/Cancellation', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 4c91a41..2beffde 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -270,6 +270,7 @@ const user = { } getVesselInfoService(query).then(res => { if (res.success) { + res.data = [...new Map(res.data.map(item => [item.vessel, item])).values()] localStorage.setItem('vesselInfo', JSON.stringify(res.data)) } }) diff --git a/src/views/main/BookingDjyLedger/list/index.vue b/src/views/main/BookingDjyLedger/list/index.vue index 90430cb..f3c1cad 100644 --- a/src/views/main/BookingDjyLedger/list/index.vue +++ b/src/views/main/BookingDjyLedger/list/index.vue @@ -2940,6 +2940,7 @@ export default { if (res.success) { this.$message.success('删除成功') const _data = this.gridOptions.data.filter((item) => !arr.includes(item.id)) + this.gridOptions.data = _data this.$refs.xGrid.reloadData(_data).then(() => { this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length }) diff --git a/src/views/main/BookingGangjie/list/index.vue b/src/views/main/BookingGangjie/list/index.vue index 0523a9a..0d7d35a 100644 --- a/src/views/main/BookingGangjie/list/index.vue +++ b/src/views/main/BookingGangjie/list/index.vue @@ -3373,6 +3373,7 @@ export default { if (res.success) { this.$message.success('删除成功') const _data = this.gridOptions.data.filter(item => !arr.includes(item.id)) + this.gridOptions.data = _data this.$refs.xGrid.reloadData(_data).then(() => { this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length }) diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 5504692..6fb8ca7 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -1185,9 +1185,6 @@ export default { }) }, getFilter() { - // ListAgentByCarrier({ carrierCode: this.bookingDetails.carrierid }).then(res => { - // this.$store.commit('SET_AgentFilter', res.data) - // }) listYardBwCarrier({ carrierCode: this.bookingDetails.carrierid }).then(res => { this.$store.commit('SET_YardFilter', res.data) }) @@ -1349,7 +1346,7 @@ export default { } const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt } this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } }) - this.getVGM() + // this.getVGM() this.oldBookingDetails = JSON.parse(JSON.stringify(this.bookingDetails)) this.sendMessageFY() if (this.$route.query.isCopy && this.$route.query.copyId) { diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index dea2c91..54834f3 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -622,23 +622,6 @@ export default { ) } - }, - { - field: 'vgm', - key: 'vgm', - title: 'VGM', - align: 'left', - width: 50, - edit: false, - renderBodyCell: ({ row, column, rowIndex }, h) => { - return ( -
- VGM - VGM - VGM -
- ) - } } ], modelColumns: [ diff --git a/src/views/main/BookingLedger/detail/modules/preOrder.vue b/src/views/main/BookingLedger/detail/modules/preOrder.vue index b6664ff..5437824 100644 --- a/src/views/main/BookingLedger/detail/modules/preOrder.vue +++ b/src/views/main/BookingLedger/detail/modules/preOrder.vue @@ -2080,12 +2080,14 @@ export default { if ($data.portdischargeid && !isHBL) { GetPortlist({ KeyWord: $data.portdischargeid }).then((res) => { if (res.data) { - if (res.data[0].countryCode && res.data[0].country) { - $data.consigneecountry = res.data[0].countryCode - $data.consigneecountryName = `${res.data[0].countryCode}/${res.data[0].country}` - $data.notifypartycountry = res.data[0].countryCode - $data.notifypartycountryName = `${res.data[0].countryCode}/${res.data[0].country}` - } + res.data.forEach((item, index) => { + if (item.countryCode && item.country) { + $data.consigneecountry = item.countryCode + $data.consigneecountryName = `${item.countryCode}/${item.country}` + $data.notifypartycountry = item.countryCode + $data.notifypartycountryName = `${item.countryCode}/${item.country}` + } + }) } }) } diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 401861e..b1a1510 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -3372,6 +3372,7 @@ export default { if (res.success) { this.$message.success('删除成功') const _data = this.gridOptions.data.filter(item => !arr.includes(item.id)) + this.gridOptions.data = _data this.$refs.xGrid.reloadData(_data).then(() => { this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length }) diff --git a/src/views/main/BookingLedgerByCustomer/list/index.vue b/src/views/main/BookingLedgerByCustomer/list/index.vue index 75da34c..adc70ce 100644 --- a/src/views/main/BookingLedgerByCustomer/list/index.vue +++ b/src/views/main/BookingLedgerByCustomer/list/index.vue @@ -2705,6 +2705,7 @@ export default { if (res.success) { this.$message.success('删除成功') const _data = this.gridOptions.data.filter((item) => !arr.includes(item.id)) + this.gridOptions.data = _data this.$refs.xGrid.reloadData(_data).then(() => { this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length }) diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue index 9cf2dff..4d720ad 100644 --- a/src/views/main/Taskmanage/TaskmanageList/index.vue +++ b/src/views/main/Taskmanage/TaskmanageList/index.vue @@ -1495,6 +1495,9 @@ export default { } else if (data.taskType === 'VGM_MISSING') { // ROLLING_NOMINATION this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pkId, type: 'VGM_MISSING' } }) + } else if (data.taskType === 'CUT_MODIFY') { + // ROLLING_NOMINATION + this.$router.push({ path: '/commontaskmanage/cutTime', query: { taskPKId: data.pkId } }) } else { // 订舱详情查看 this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } }) diff --git a/src/views/main/Taskmanage/cutTime/index.vue b/src/views/main/Taskmanage/cutTime/index.vue new file mode 100644 index 0000000..0cba1b5 --- /dev/null +++ b/src/views/main/Taskmanage/cutTime/index.vue @@ -0,0 +1,648 @@ + + + diff --git a/src/views/main/ViewDeletedList/ViewDeletedList.vue b/src/views/main/ViewDeletedList/ViewDeletedList.vue index dfb578d..890e928 100644 --- a/src/views/main/ViewDeletedList/ViewDeletedList.vue +++ b/src/views/main/ViewDeletedList/ViewDeletedList.vue @@ -1544,6 +1544,7 @@ export default { if (res.success) { this.$message.success('恢复成功') const _data = this.gridOptions.data.filter(item => !arr.includes(item.id)) + this.gridOptions.data = _data this.$refs.xGrid.reloadData(_data).then(() => { this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length }) diff --git a/src/views/main/mskOrderList/index.vue b/src/views/main/mskOrderList/index.vue index 14ad667..46a8f4b 100644 --- a/src/views/main/mskOrderList/index.vue +++ b/src/views/main/mskOrderList/index.vue @@ -129,9 +129,10 @@
查询 重置 +
- - - - - - +.inline { + position: relative; +} + +.inline-right { + position: absolute; + top: 6px; + right: 25px; +} + diff --git a/src/views/main/vesselinfo/index.vue b/src/views/main/vesselinfo/index.vue index 16a1746..39d2321 100644 --- a/src/views/main/vesselinfo/index.vue +++ b/src/views/main/vesselinfo/index.vue @@ -361,38 +361,6 @@ export default { handledbclick(row) { this.$refs.editForm.edit(row.row) }, - getConfigUser(isInit = false) { - const query = { - typeArr: ['vesselinfo_sort', 'vesselinfo_list_column', 'vesselinfo_page'] - } - this.loading = true - DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then(res => { - if (res.data.length === 0) { - this.columns = JSON.parse(JSON.stringify(this.columnsAll)) - this.FnGetData() - } else { - res.data.forEach(item => { - if (item.type === 'vesselinfo_list_column') { - this.columns = JSON.parse(item.configJson) - } - if (item.type === 'vesselinfo_page') { - this.queryParam.PageSize = JSON.parse(item.configJson).pageSize - } - if (item.type === 'vesselinfo_sort') { - const data = JSON.parse(item.configJson) - setTimeout(() => { - this.$refs.table.sort(data.sortField, data.descSort ? 'desc' : 'asc') - }, 200); - this.queryParam.sortField = data.sortField - this.queryParam.descSort = data.descSort - } - }) - setTimeout(() => { - this.FnGetData() - }, 200); - } - }) - }, resizableChange(e) { this.columns[e.columnIndex].width = e.resizeWidth this.editColumnsSave(this.columns) @@ -480,9 +448,6 @@ export default { init() { Object.assign(this.$data, this.$options.data()) this.ColumnsQuery = this.columns - // GetCarrierlist().then(res => { - // this.carrierData = res.data - // }) this.getConfigStart() }, getConfigStart() { @@ -506,22 +471,6 @@ export default { localStorage.setItem('vesselinfoSetting', JSON.stringify(data)) this.FnGetData() } else { - // arr.forEach(item => { - // if (item.type === 'vesselinfo_list_column') { - // this.columns = JSON.parse(item.configJson) - // } - // if (item.type === 'vesselinfo_page') { - // this.queryParam.PageSize = JSON.parse(item.configJson).pageSize - // } - // if (item.type === 'vesselinfo_sort') { - // const data = JSON.parse(item.configJson) - // setTimeout(() => { - // this.$refs.table.sort(data.sortField, data.descSort ? 'desc' : 'asc') - // }, 200); - // this.queryParam.sortField = data.sortField - // this.queryParam.descSort = data.descSort - // } - // }) const $data = {} arr.map((item, index) => { switch (item.type) { diff --git a/src/views/userLoginReg/Login.vue b/src/views/userLoginReg/Login.vue index 735dcca..fc2c20b 100644 --- a/src/views/userLoginReg/Login.vue +++ b/src/views/userLoginReg/Login.vue @@ -351,7 +351,7 @@ export default { typeArr: ['vesselinfo_sort', 'vesselinfo_list_column', 'vesselinfo_page', 'booking_list_column'] } DjyUserConfigMulti(this.$qs.stringify(query)).then(res => { - const vessArr = [] + let vessArr = [] let bookArr = [] res.data.forEach(item => { if (item.type.includes('vesselinfo')) { diff --git a/src/views/userLoginReg/updPwd.vue b/src/views/userLoginReg/updPwd.vue index 5768369..e7cefe2 100644 --- a/src/views/userLoginReg/updPwd.vue +++ b/src/views/userLoginReg/updPwd.vue @@ -1,19 +1,19 @@