diff --git a/src/views/E2E/Index.vue b/src/views/E2E/Index.vue index 4576b99..68d6f98 100644 --- a/src/views/E2E/Index.vue +++ b/src/views/E2E/Index.vue @@ -32,8 +32,8 @@ 货物截止时间 - + - - + @@ -328,19 +329,19 @@ + :min="0"> + :min="0"> + :min="0"> @@ -348,7 +349,7 @@ SearchData.cargoCategory == 'NOR' "> + :min="0"> @@ -356,7 +357,7 @@ SearchData.cargoCategory == 'NOR' "> + :min="0"> @@ -441,7 +442,9 @@ import { portQuery, surchargeE2EQuery } from "@/api/views/ooclApi"; +const json = [ +] import NavView from "../../components/Nav.vue"; export default { name: "SpotIndex", @@ -506,7 +509,8 @@ export default { }, mounted() { this.SearchData.startDate = this.FnToday(); - this.SearchData.cargoCutoffStartTime = this.FnToday(); + this.SearchData.endDate = this.FndayWeek(); + // this.SearchData.cargoCutoffStartTime = this.FnToday(); TemList().then((res) => { this.TemListData = res.data.data.data; console.log(res); @@ -517,6 +521,13 @@ export default { this.SearchData.cargoCategory = e; this.TableData = []; }, + searchTemp(val) { + if (val) { + TemList({ templateName: val }).then((res) => { + this.TemListData = res.data.data.data; + }); + } + }, FnToday() { let data = ""; let date = new Date(); @@ -527,6 +538,17 @@ export default { }`; return data; }, + FndayWeek() { + let currentDate = new Date(); + currentDate.setDate(currentDate.getDate() + 28); + let year = currentDate.getFullYear(); + let month = currentDate.getMonth() + 1; + let day = currentDate.getDate(); + month = month < 10 ? '0' + month : month; + day = day < 10 ? '0' + day : day; + let newDate = year + '-' + month + '-' + day; + return newDate; + }, firstPolSearch(val) { this.firstPolLoading = true portQuery({ name: val }).then(res => { @@ -693,6 +715,12 @@ export default { return 0; } }, + changeTime(val) { + var date = new Date(val); + date.setDate(date.getDate() + 28); + var formattedDate = date.toISOString().slice(0, 10); + this.SearchData.cargoCutoffEndTime = formattedDate + }, FnReset() { this.SearchData = { cargoCategory: "General", @@ -732,10 +760,21 @@ export default { quantity: this.container.num3 }) } + for (let key in ApiData) { + if (ApiData[key] === null || ApiData[key] === undefined || ApiData[key] === '') { + delete ApiData[key]; + } + } + ApiData.size = 20 this.TableLoading = true; E2EQuery(ApiData) .then((res) => { if (res.data.code == 0) { + if (res.data.data.length == 0) { + this.$message({ message: '暂无数据', type: 'warning' }); + this.TableLoading = false; + return false + } this.TableData = res.data.data this.TableData.forEach(item => { let arr = [] @@ -744,11 +783,17 @@ export default { if (ite.cntrType == i) { ite.hasInventory = item.hasInventory[i] } - if (item.hasInventory[i] != 0) { + if (item.hasInventory[i] == 1) { arr.push(1) } } }) + item.routeProductPricingList.sort((a, b) => { + const order = ["20GP", "40GP", "40HQ"]; + const indexA = order.indexOf(a.cntrType); + const indexB = order.indexOf(b.cntrType); + return indexA - indexB; + }); if (arr.length > 0) { item.disabledOrder = false } else { diff --git a/src/views/Spot/Index.vue b/src/views/Spot/Index.vue index 5d50441..21b81e9 100644 --- a/src/views/Spot/Index.vue +++ b/src/views/Spot/Index.vue @@ -3,12 +3,8 @@ - + @@ -28,88 +24,38 @@ --> 起运港 - - + + 目的港 - - + + 预计开航时间 - + - - + 货物截止时间 - + - - + @@ -196,45 +142,19 @@
- -
+ +
{{ item.porCity.cityFullNameCn }}
- -
+ +
{{ item.porCity.cityFullNameEn }}
- -
+ +
{{ item.porCity.unlocode }}
@@ -242,31 +162,13 @@
- -
+ +
{{ item.polPort.portFullNameCn }}
- -
+ +
{{ item.polPort.portFullNameEn }}
@@ -275,32 +177,14 @@
- -
+ +
{{ item.podPort.portFullNameCn }}
- -
+ +
{{ item.podPort.portFullNameEn }}
@@ -308,45 +192,19 @@
- -
+ +
{{ item.fndCity.cityFullNameCn }}
- -
+ +
{{ item.fndCity.cityFullNameEn }}
- -
+ +
{{ item.fndCity.unlocode }}
@@ -371,30 +229,21 @@
-

+

{{ d ? d.price : "-" }}

-

+

{{ d ? d.price : "-" }}

-

+

{{ d ? d.price : "-" }} @@ -403,20 +252,14 @@

-

+

{{ d ? d.price : "-" }}

-

+

{{ d ? d.price : "-" }} @@ -429,11 +272,7 @@

- + 一键订舱 库存不足 @@ -452,173 +291,73 @@ 条款: {{ item.haulageType }} - + - + - - - - - - + + + + + + - + 附加费明细
- - + + - - + + - + - - + + - - + + - - + + - - + + @@ -717,15 +456,21 @@ export default { this.SearchData.cargoCategory = e; this.TableData = []; }, + searchTemp(val) { + if (val) { + TemList({ templateName: val }).then((res) => { + this.TemListData = res.data.data.data; + }); + } + }, FnToday() { let data = ""; let date = new Date(); let year = date.getFullYear(); let month = date.getMonth() + 1; let day = date.getDate(); - data = `${year}-${month < 10 ? `0${month}` : month}-${ - day < 10 ? `0${day}` : day - }`; + data = `${year}-${month < 10 ? `0${month}` : month}-${day < 10 ? `0${day}` : day + }`; return data; }, FndioligBookingNO() { @@ -930,6 +675,7 @@ export default { line-height: 40px; border-left: 6px solid #d63246; margin-top: 10px !important; + /deep/.CscargoCategory { .el-input { .el-input__inner { @@ -941,12 +687,14 @@ export default { padding: 0 15px; text-align: right; } + .el-input__suffix { display: none; } } } } + .searchmain { width: 100%; background: #fff; @@ -954,9 +702,11 @@ export default { .searchmainRow { padding: 40px 60px 40px 25px; + .ButtonBox { display: flex; justify-content: center; + .Button1 { margin-right: 35px; border: 1px solid #000; @@ -967,12 +717,14 @@ export default { padding-bottom: 10px; line-height: 16px; border-radius: 2px; + &:hover { color: #393737; border-color: #c4c3c3; background-color: #ebebeb; } } + .Button2 { width: 200px; height: 36px; @@ -985,6 +737,7 @@ export default { color: #fff; background-color: #d63246; border-color: #d63246; + &:hover { background: #de5b6b; border-color: #de5b6b; @@ -992,8 +745,10 @@ export default { } } } + .searchmainCol { margin-bottom: 25px; + .searchmainTitle { margin-right: 10px; font-size: 12px; @@ -1001,15 +756,18 @@ export default { text-align: right; line-height: 12px; } + .searchmainG { margin: 0 5px; } } } } + .app-main { width: 1210px; margin: 0 auto; + .tablehead { display: flex; background-color: #393737; @@ -1023,26 +781,33 @@ export default { display: flex; justify-content: space-around; align-items: center; + &:nth-child(1) { flex: 10; text-align: center; } + &:nth-child(2) { flex: 2; } + &:nth-child(3) { flex: 2; } + &:nth-child(4) { flex: 4; } + &:nth-child(5) { flex: 2; } + &:nth-child(6) { flex: 3; border: none; } + p { color: #fff; font-size: 12px; @@ -1050,17 +815,21 @@ export default { } } } + .tablemain { margin-bottom: 20px; background: #fff; box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.1); transition: box-shadow 0.2s ease-in-out; + &:hover { box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.2); } + .tabletop { display: flex; padding: 0 0 10px 0; + .tablemainunit { display: flex; justify-content: space-around; @@ -1068,10 +837,12 @@ export default { &:nth-child(1) { flex: 10; + .schedule-data { width: 100%; font-size: 12px; color: #333; + .ts-mode-icon { position: absolute; height: 100%; @@ -1079,6 +850,7 @@ export default { align-items: flex-end; justify-content: center; bottom: -6px; + .card-brand { color: #a27a51; font-size: 13px; @@ -1089,6 +861,7 @@ export default { .circle-center { text-align: center; height: 18px; + .hollow-circle { display: inline-block; text-align: center; @@ -1097,6 +870,7 @@ export default { border: 1px solid #a27a51; border-radius: 50%; } + .solid-circle { display: inline-block; text-align: center; @@ -1105,6 +879,7 @@ export default { background-color: #a27a51; border-radius: 50%; } + .beeline { margin: 0 3px; display: inline-block; @@ -1114,20 +889,24 @@ export default { border-top: 1px solid #a27a51; } } + .horizontal-content-div { margin: 0 5px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + &.facility-name { color: #909399; } } } } + &:nth-child(2) { p { text-align: center; + span { font-size: 10px !important; text-align: center; @@ -1136,45 +915,56 @@ export default { flex: 2; } + &:nth-child(3) { flex: 2; } + &:nth-child(4) { display: flex; - > div { + + >div { flex: 1; text-align: center; } - &.DG { - } + + &.DG {} + flex: 4; } + &:nth-child(5) { flex: 2; } + &:nth-child(6) { flex: 3; } + .ButtonDC { min-width: 130px; background: #fff; border-color: #d63246; color: #d63246; + &:hover { background: #d63246; border-color: #d63246; color: #fff; } } + .Insufficient { min-width: 130px; background: #fff; border-color: #999; color: #999; } + p { color: #676a6c; font-size: 14px; + span { color: red; font-weight: bold; @@ -1183,6 +973,7 @@ export default { } } } + .tablebottom { padding-left: 20px; padding-right: 20px; @@ -1192,6 +983,7 @@ export default { color: #999; font-size: 12px; letter-spacing: -0.2px; + /deep/.FJpopover { position: absolute; left: 640px; diff --git a/src/views/tem/Index.vue b/src/views/tem/Index.vue index 4c3fa17..ecfa53c 100644 --- a/src/views/tem/Index.vue +++ b/src/views/tem/Index.vue @@ -302,6 +302,13 @@ + + + + + + +

箱信息

@@ -893,7 +900,8 @@ export default { form: { blQuantity: 1, cargoCategory: "General", - isE2E:false + isE2E:false, + isTransit:false }, containerTypeData: ["20GP", "40GP", "40HQ"], moment,