From 46b0579529d49b1af302185093f49112c5a534ca Mon Sep 17 00:00:00 2001 From: sunzehua Date: Wed, 24 Apr 2024 15:07:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=93=8D=E4=BD=9C+=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8D=95=E5=AF=B9=E6=AF=94+=E6=8F=90=E7=AE=B1?= =?UTF-8?q?=E8=BF=94=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 12 +- .env.development | 8 +- src/api/modular/main/BookingLedger.js | 29 + src/components/mskBookingOrder/index.vue | 61 +- src/views/main/BookingDjy/detail/index.vue | 6 +- .../detail/modules/basicInfo.vue | 21 +- .../main/BookingDjyLedger/list/index.vue | 2 +- .../detail/modules/goodsTable.vue | 83 +- src/views/main/BookingGangjie/list/index.vue | 627 ++++++---- .../detail/modules/basicInfo.vue | 4 +- src/views/main/BookingLedger/list/index.vue | 1080 ++++++++++------- src/views/main/BookingLedger/list/list.less | 4 + .../detail/modules/basicInfo.vue | 2 +- .../BookingLedgerByCustomer/list/index.vue | 2 +- src/views/main/CommondbPortload/editForm.vue | 2 +- src/views/main/Printing/index.vue | 43 +- src/views/main/intoYardConfig/Data.json | 3 +- src/views/main/ruleTemp/index.vue | 32 + 18 files changed, 1339 insertions(+), 682 deletions(-) diff --git a/.env b/.env index 8a0c6fd..214e7c0 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ NODE_ENV=production VUE_APP_PREVIEW=true -VUE_APP_TYPE = 'customer' +# VUE_APP_TYPE = 'customer' # VUE_APP_TYPE = 'hechuan' -# VUE_APP_TYPE = 'yunyingduan' +VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy @@ -19,16 +19,16 @@ VUE_APP_TYPE = 'customer' # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30813 # 运营端测试 -# VUE_APP_API_BASE_URL=http://60.209.125.238:30814 -# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 +VUE_APP_API_BASE_URL=http://60.209.125.238:30814 +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: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 75bff01..2afe06a 100644 --- a/.env.development +++ b/.env.development @@ -19,8 +19,8 @@ VUE_APP_TYPE = 'yunyingduan' # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30813 # 运营端测试 -VUE_APP_API_BASE_URL=http://60.209.125.238:30814 -VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 +# VUE_APP_API_BASE_URL=http://60.209.125.238:30814 +# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 # VUE_APP_API_BASE_URL=http://192.168.0.80:7373/ # VUE_APP_SOCKET_BASE_URL=http://192.168.0.80:7373/ @@ -30,8 +30,8 @@ VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 # 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/BookingLedger.js b/src/api/modular/main/BookingLedger.js index 32a1d31..a253ca1 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -956,6 +956,27 @@ export function RefreshBillTrace(parameter) { }) } +export function SetTxxpEndTime(parameter) { + return axios({ + url: '/BookingOrder/SetTxxpEndTime', + method: 'post', + params: parameter + }) +} +export function RefreshYGT(parameter) { + return axios({ + url: '/BookingYunZong/RefreshYGT?' + parameter, + method: 'post' + }) +} + +export function RefreshYard(parameter) { + return axios({ + url: '/BookingYunZong/RefreshYard?' + parameter, + method: 'post' + }) +} + export function GetToDoBCList(parameter) { return axios({ url: '/TaskManageBC/GetToDoBCList', @@ -1168,6 +1189,14 @@ export function GetDraftCompareResultInfo(parameter) { }) } +export function SaveDraftComparellanual(parameter) { + return axios({ + url: '/TaskDraftCompare/SaveDraftCompareManual', + method: 'post', + data: parameter + }) +} + export function GetShippingOrderCompareResult(parameter) { return axios({ url: '/TaskShippingOrderCompare/GetShippingOrderCompareResult', diff --git a/src/components/mskBookingOrder/index.vue b/src/components/mskBookingOrder/index.vue index d9f9d6a..147d677 100644 --- a/src/components/mskBookingOrder/index.vue +++ b/src/components/mskBookingOrder/index.vue @@ -373,10 +373,10 @@ 取消 - +
- - + + {{ this.form.placeOfReceiptCityName }} @@ -387,19 +387,33 @@ {{ this.form.placeOfDeliveryCityName }} - + + + + + {{ item.name }} + + + + + - + - + - + - 检索 + 检索
@@ -497,6 +511,7 @@ import { CheckWarningBatchCopy, maskCopy } from '@/api/modular/main/BookingLedger' import { mapGetters } from 'vuex' +import moment from 'moment' export default { data() { return { @@ -514,7 +529,9 @@ export default { mskType: '', mskNumber: '', mskCopyId: '', - searchForm: {}, + searchForm: { + isoEquipmentCode: '' + }, formLoading: false, shipData: [], contractnoList: [], @@ -614,6 +631,8 @@ export default { importServiceMode: this.form.importServiceMode, vesselOperatorCarrierCode: this.form.carrierCode, startDate: this.form.earliestDepartureDate, + carrierCollectionOriginGeoID: this.form.carrierCollectionOriginGeoID, + carrierDeliveryDestinationGeoID: this.form.carrierDeliveryDestinationGeoID, ...this.searchForm } SearchShipSailingSchedule(data).then(res => { @@ -639,15 +658,20 @@ export default { this.mskCopyId = copyId this.getContractnoList() this.shipData = [] + // 获取当前时间 if (!id) { this.form = { - ctns: [], + ctns: [ + { ctnSufferWeight: 15000, ctnNum: 1, ctnCode: '22G1', ctnName: '20GP' }, + { ctnSufferWeight: 15000, ctnNum: 1, ctnCode: '45G11', ctnName: '40HC' } + ], isReefer: false, productCode: 'MaerskContract', carrierCode: 'MAEU', isBookingPartOwnPrice: true, importServiceMode: 'CY', exportServiceMode: 'CY', + earliestDepartureDate: moment().format('YYYY-MM-DD'), cargoType: 'DRY', sender: 'BOOKAPI', commodityCodeType: 'MaerskCode' @@ -739,6 +763,7 @@ export default { handleSelectCQ(item) { this.shipData = [] this.form.originDepartureDateTimeLocal = item.etd + this.form.isoEquipmentCode = this.searchForm.isoEquipmentCode this.form.destinationArrivalDateTimeLocal = item.atd this.form.placeOfReceiptUnLocCode = item.orignUNLocationCode this.form.placeOfDeliveryUnLocCode = item.deliveryUNLocationCode @@ -748,6 +773,19 @@ export default { this.form.estSailingDays = item.days this.form.transportMode = item.transportMode this.form.carrierProductId = item.carrierProductId + const arr = [] + if (this.form.ctns.length > 0) { + this.form.ctns.forEach(item => { + if (item.ctnCode === this.searchForm.isoEquipmentCode) { + arr.push(1) + } + }) + } else { + this.form.ctns.push({ ctnCode: this.searchForm.isoEquipmentCode, ctnNum: 1, ctnSufferWeight: 0 }) + } + if (arr.length === 0) { + this.form.ctns.push({ ctnCode: this.searchForm.isoEquipmentCode, ctnNum: 1, ctnSufferWeight: 0 }) + } this.shipData.push(item) this.visible = false this.$forceUpdate() @@ -782,6 +820,7 @@ export default { }); }, handleSave() { + console.log(this.form); this.$refs.form.validate(valid => { if (valid) { this.form.carrierId = 'MSK' @@ -858,6 +897,7 @@ export default { this.portloadList.forEach(item => { if (item.carrierGeoID === val) { this.form.placeOfReceiptCityName = item.cityName + this.form.carrierCollectionOriginGeoID = item.carrierGeoID this.form.placeOfReceiptCountryCode = item.countryCode this.form.userPlaceOfReceiptUnLocCode = item.unLocationCode this.form.userPlaceOfReceiptCityName = item.cityName @@ -872,6 +912,7 @@ export default { if (item.carrierGeoID === val) { this.form.placeOfDeliveryCityName = item.cityName this.form.placeOfDeliveryCountryCode = item.countryCode + this.form.carrierDeliveryDestinationGeoID = item.carrierGeoID this.form.userPlaceOfDeliveryUnLocCode = item.unLocationCode this.form.userPlaceOfDeliveryCityName = item.cityName this.form.userPlaceOfDeliveryCountryCode = item.countryCode diff --git a/src/views/main/BookingDjy/detail/index.vue b/src/views/main/BookingDjy/detail/index.vue index 9848d2a..bc38dbd 100644 --- a/src/views/main/BookingDjy/detail/index.vue +++ b/src/views/main/BookingDjy/detail/index.vue @@ -492,7 +492,11 @@ 其他信息 -
账号：{{ details.extendData.Account }}   密码：{{ details.extendData.Password }}
+
+ 账号：{{ details.extendData.Account }}    + 密码：{{ details.extendData.Password }}    + 邮箱{{ details.extendData.OpMail }} +
diff --git a/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue b/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue index 4a90a45..b27422e 100644 --- a/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue @@ -519,21 +519,15 @@ - + prop="bookingUserName"> + @@ -934,9 +928,10 @@ export default { }, deep: true }, - '$route.query': { + '$route': { immediate: true, handler(nD, oD) { + console.log(this.$route,111) this.id = this.$route.query.id if (this.$route.name === 'BookingDetail') { this.init() diff --git a/src/views/main/BookingDjyLedger/list/index.vue b/src/views/main/BookingDjyLedger/list/index.vue index f3c1cad..08cd91b 100644 --- a/src/views/main/BookingDjyLedger/list/index.vue +++ b/src/views/main/BookingDjyLedger/list/index.vue @@ -2362,7 +2362,7 @@ export default { document.body.removeChild(cInput); }, editColumns(row) { - this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } }) + this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno ? row.mblno : '' } }) }, getList(queryParam = {}, isInit = false, isAdd = 'normal') { this.$set(this.gridOptions, 'loading', true) diff --git a/src/views/main/BookingGangjie/detail/modules/goodsTable.vue b/src/views/main/BookingGangjie/detail/modules/goodsTable.vue index e236d2f..39154a1 100644 --- a/src/views/main/BookingGangjie/detail/modules/goodsTable.vue +++ b/src/views/main/BookingGangjie/detail/modules/goodsTable.vue @@ -4,10 +4,12 @@
- 添加 + 添加 删除 + style="margin-right: 5px;" + class="iconfont icon-shanchu1">删除 多品名 @@ -23,15 +25,24 @@ 展开箱量 - 刷新 + 刷新
-
- - +
@@ -44,9 +55,18 @@
-
暂无数据
@@ -54,10 +74,19 @@ -
-
新增 @@ -65,9 +94,15 @@ 保存
-
暂无数据
@@ -1910,15 +1945,17 @@ export default { data.map((item, index) => { const _data = { rowKey: lastNum + index, - weightype: '', - weighkgs: '' + weightype: '' } ctnSetArr.forEach(ite => { - if (ite.code !== 'KINDPKGS') { - _data[ite.intoName] = item[ite.code] - } else { + if (ite.code === 'KINDPKGS') { _data.kindpkgs = kindpkgsOld || item.KINDPKGS } + if (ite.code === 'WEIGHKGS') { + const setWeighkgs = this.calc(Number(item.KGS), Number(item.TAREWEIGHT), '+') + _data.weighkgs = setWeighkgs + } + _data[ite.intoName] = item[ite.code] }) addTable.push(_data) }) diff --git a/src/views/main/BookingGangjie/list/index.vue b/src/views/main/BookingGangjie/list/index.vue index e6928e2..8e9db2a 100644 --- a/src/views/main/BookingGangjie/list/index.vue +++ b/src/views/main/BookingGangjie/list/index.vue @@ -279,22 +279,25 @@ -
+
@@ -417,7 +436,8 @@ + type="redo" + />