From 2e390eddb3908245d7ccddb787d476615e6ea01d Mon Sep 17 00:00:00 2001 From: sunzehua Date: Wed, 3 Jul 2024 09:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 +- .env.development | 4 +- src/api/modular/main/BookingLedger.js | 51 +- src/components/mskBookingOrder/index.vue | 489 ++++++++++++++---- src/store/getters.js | 1 + src/store/modules/user.js | 17 +- .../BookingCustomerLedger/detail/index.vue | 193 ++++++- .../detail/childModules/sendMail.vue | 26 +- .../detail/modules/operationArea.vue | 6 +- src/views/main/CommondbPortlist/index.vue | 23 +- src/views/main/CommondbPortloadlist/index.vue | 23 +- src/views/main/Printing/addForm.vue | 7 + src/views/main/Printing/editForm.vue | 9 +- src/views/main/Printing/index.vue | 2 +- .../main/Taskmanage/TaskmanageList/index.vue | 17 +- .../TaskmanageList/modules/initData.js | 19 +- src/views/main/mskOrderList/index.vue | 66 ++- src/views/main/taskCustom/data.json | 28 +- src/views/system/user/userOrgForm.vue | 18 +- 19 files changed, 787 insertions(+), 216 deletions(-) diff --git a/.env b/.env index ab44d3d..c84d1c6 100644 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ NODE_ENV=production VUE_APP_PREVIEW=true # VUE_APP_TYPE = 'customer' -# VUE_APP_TYPE = 'hechuan' +VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'yunyingduan' -VUE_APP_TYPE = 'gangjie' +# VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy # 和川大简云正式 diff --git a/.env.development b/.env.development index 7caaa7b..7675bb5 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ NODE_ENV=development VUE_APP_PREVIEW=true # VUE_APP_TYPE = 'customer' -VUE_APP_TYPE = 'hechuan' +# VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'yunyingduan' -# VUE_APP_TYPE = 'gangjie' +VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 和川大简云正式 diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index 0fcb470..cea35ce 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -1449,6 +1449,14 @@ export function SearchShipSailingSchedule(parameter) { }) } +export function SearchShipSailingScheduleSpot(parameter) { + return axios({ + url: '/BookingMSKSPOTAPI/SearchShipSailingSchedule', + method: 'post', + data: parameter + }) +} + export function SearchLocations(parameter) { return axios({ url: '/BookingMSKAPI/SearchLocations', @@ -1457,6 +1465,14 @@ export function SearchLocations(parameter) { }) } +export function SearchLocationsSpot(parameter) { + return axios({ + url: '/BookingMSKSPOTAPI/SearchLocations', + method: 'post', + data: parameter + }) +} + export function SendMSKBooking(parameter) { return axios({ url: '/BookingMSKAPI/SendMSKBooking', @@ -1465,6 +1481,14 @@ export function SendMSKBooking(parameter) { }) } +export function SendMSKBookingSpot(parameter) { + return axios({ + url: '/BookingMSKSPOTAPI/SendMSKBooking', + method: 'post', + data: parameter + }) +} + export function mskGetPage(parameter) { return axios({ url: '/BookingMSKAPI/GetPage', @@ -1489,6 +1513,14 @@ export function mskGetSave(parameter) { }) } +export function mskGetSaveSpot(parameter) { + return axios({ + url: '/BookingMSKSPOTAPI/Save', + method: 'post', + data: parameter + }) +} + export function mskGetGetInfo(parameter) { return axios({ url: '/BookingMSKAPI/GetInfo', @@ -1497,6 +1529,14 @@ export function mskGetGetInfo(parameter) { }) } +export function mskGetGetInfoSpot(parameter) { + return axios({ + url: '/BookingMSKSPOTAPI/GetInfo', + method: 'get', + params: parameter + }) +} + export function GetBookingVGMResult(parameter) { return axios({ url: '/BookingValueAdded/GetBookingVGMResult', @@ -1687,4 +1727,13 @@ export function CancelBook(parameter) { method: 'post', params: parameter }) -} \ No newline at end of file +} + +export function GetInitInfoMsk(parameter) { + return axios({ + url: '/BookingMSKSPOTAPI/GetInitInfo', + method: 'get', + params: parameter + }) +} + diff --git a/src/components/mskBookingOrder/index.vue b/src/components/mskBookingOrder/index.vue index fa8b385..b775660 100644 --- a/src/components/mskBookingOrder/index.vue +++ b/src/components/mskBookingOrder/index.vue @@ -15,6 +15,7 @@ v-model="form.productCode" style="width: 100%"> MaerskContract + MaerskSpot @@ -27,7 +28,7 @@ - + - + @@ -75,54 +76,106 @@ - - - - {{ form.bookedByCompanyName }} - - - - - {{ form.bookedByMaerskPartyCode }} - - - - - - - {{ form.bookedByCompanyContactName }} - - - - - {{ form.bookedByCompanyContactEmail }} - - - - - - - {{ form.priceOwnerCompanyName }} - - - - - {{ form.priceOwnerMaerskPartyCode }} - - - - - - - {{ form.priceOwnerContactName }} - - - - - {{ form.priceOwnerContactEmail }} - - - +
+ + + + {{ form.bookedByCompanyName }} + + + + + {{ form.bookedByMaerskPartyCode }} + + + + + + + {{ form.bookedByCompanyContactName }} + + + + + {{ form.bookedByCompanyContactEmail }} + + + + + + + {{ form.priceOwnerCompanyName }} + + + + + {{ form.priceOwnerMaerskPartyCode }} + + + + + + + {{ form.priceOwnerContactName }} + + + + + {{ form.priceOwnerContactEmail }} + + + +
+
+ + + + {{ mskSpotInfo.bookedByCompanyName }} + + + + + {{ mskSpotInfo.bookedMaerskByPartyCode }} + + + + + + + {{ mskSpotInfo.bookedByPartyContactName }} + + + + + {{ mskSpotInfo.bookedByPartyContactEmail }} + + + + + + + {{ mskSpotInfo.priceOwnerCompanyName }} + + + + + {{ mskSpotInfo.priceOwnerMaerskPartyCode }} + + + + + + + {{ mskSpotInfo.priceOwnerContactName }} + + + + + {{ mskSpotInfo.priceOwnerContactEmail }} + + + +
地点、船期详情
@@ -209,9 +262,12 @@
- {{ item.orignCityName }} + {{ item.orignCityName }},{{ item.originRegionName }},{{ item.originCountryName }} - {{ item.deliveryCityName }} + {{ item.deliveryCityName }},{{ item.deliveryRegionName }},{{ item.deliveryCountryName }} + {{ item.shipRateTotalCurrency + }} + {{ item.shipRateTotalAmount }}
@@ -225,7 +281,7 @@
到港
-
{{ item.atd }}
+
{{ item.eta }}
@@ -243,6 +299,20 @@
+
+
+ {{ index1 + 1 }} + + {{ ite.from.cityName }},{{ + ite.from.regionName }},{{ ite.from.countryName }} + ETD：{{ ite.etd }} + -------- + + {{ ite.to.cityName }},{{ ite.to.regionName + }},{{ ite.to.countryName }} + ETA：{{ ite.eta }} +
+
货物详情
@@ -373,6 +443,7 @@ 取消 +
@@ -422,6 +493,8 @@ {{ item.orignCityName }} {{ item.deliveryCityName }} + {{ item.totalCurrency }} + {{ item.totalAmount }}
@@ -435,7 +508,7 @@
到港
-
{{ item.atd }}
+
{{ item.eta }}
@@ -453,6 +526,20 @@
+
+
+ {{ index1 + 1 }} + + {{ ite.from.cityName }},{{ + ite.from.regionName }},{{ ite.from.countryName }} + ETD：{{ ite.etd }} + -------- + + {{ ite.to.cityName }},{{ + ite.to.regionName }},{{ ite.to.countryName }} + ETA：{{ ite.eta }} +
+
选择 @@ -506,9 +593,9 @@