From 512c6c717e3daa44d8d9ea044a0bece2952baed4 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Sat, 12 Oct 2024 13:35:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=AE=A2?= =?UTF-8?q?=E8=88=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 19 ++- .env.development | 17 ++- public/index.html | 4 +- src/api/modular/main/BookingLedger.js | 22 +++ src/assets/puqi.jpeg | Bin 0 -> 234756 bytes src/components/tools/Logo.vue | 12 +- src/layouts/UserLayout.vue | 17 ++- src/utils/domUtil.js | 3 +- .../BookingCustomerLedger/detail/index.vue | 8 +- .../main/BookingGangjie/detail/index.vue | 6 +- .../detail/modules/basicInfo.vue | 4 + .../detail/modules/operationArea.vue | 10 +- src/views/main/SendCar/addForm.vue | 5 + src/views/main/mskOrderList/index.vue | 133 +++++++++++++++++- src/views/main/vesselinfo/editForm.vue | 4 + src/views/main/vesselinfo/index.vue | 12 ++ src/views/userLoginReg/Login.vue | 56 ++++---- vue.config.js | 4 + 18 files changed, 277 insertions(+), 59 deletions(-) create mode 100644 src/assets/puqi.jpeg diff --git a/.env b/.env index 99f2e07..dfbe110 100644 --- a/.env +++ b/.env @@ -1,14 +1,15 @@ 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' +# VUE_APP_TYPE = 'puqi' # 打包部署的三个端 客户端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,9 +28,13 @@ VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # 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 -# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 \ No newline at end of file +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 + +# puqi +# VUE_APP_API_BASE_URL=http://118.190.144.189:5003 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5003 \ No newline at end of file diff --git a/.env.development b/.env.development index cf7bf3e..9c39d06 100644 --- a/.env.development +++ b/.env.development @@ -1,14 +1,15 @@ NODE_ENV=development 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' +# VUE_APP_TYPE = 'puqi' # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 和川大简云正式 -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 @@ -34,5 +35,9 @@ VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 # 客户端正式 -# VUE_APP_API_BASE_URL=http://118.190.144.189:6001 -# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 \ No newline at end of file +VUE_APP_API_BASE_URL=http://118.190.144.189:6001 +VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 + +# puqi +# VUE_APP_API_BASE_URL=http://118.190.144.189:5003 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5003 \ No newline at end of file diff --git a/public/index.html b/public/index.html index 75fb5a6..b6bce83 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - 大简云工作平台 + <%= htmlWebpackPlugin.options.title %> diff --git a/src/utils/domUtil.js b/src/utils/domUtil.js index 80705ea..6799ce3 100644 --- a/src/utils/domUtil.js +++ b/src/utils/domUtil.js @@ -15,5 +15,4 @@ export const setDocumentTitle = function(title) { document.body.appendChild(i) } } - -export const domTitle = '大简云工作平台' +export const domTitle = process.env.VUE_APP_TYPE !== 'puqi' ? '大简云工作平台' : '工作平台' diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue index 61b4960..06d6265 100644 --- a/src/views/main/BookingCustomerLedger/detail/index.vue +++ b/src/views/main/BookingCustomerLedger/detail/index.vue @@ -1999,7 +1999,7 @@ export default { obj = item } }) - if (this.details.carrierid === 'EMC') { + if (this.details.carrierid === 'EMC' || this.details.carrierid === 'COSCO') { data.shipData = obj } data.vessel = obj.vesselName @@ -2602,11 +2602,11 @@ export default { handleSubimt() { this.$refs.basicFrom.validate(valid => { if (valid) { - if (this.details.carrierid === 'EMC') { - if (!this.details.contractno || !this.details.contractType) { + if (!this.details.contractno || !this.details.contractType) { this.$message.error('请填写合约号') return false - } + } + if (this.details.carrierid === 'EMC') { if (!this.details.shipperPhone || !this.details.shipperPhoneCode || !this.details.shipperPhoneCountryCode || !this.details.shipperFirstName || !this.details.shipperLastName || !this.details.shipperSex || !this.details.shipperName) { diff --git a/src/views/main/BookingGangjie/detail/index.vue b/src/views/main/BookingGangjie/detail/index.vue index 8307523..f22271c 100644 --- a/src/views/main/BookingGangjie/detail/index.vue +++ b/src/views/main/BookingGangjie/detail/index.vue @@ -351,6 +351,7 @@ const initDetail = { wncm: '', acihbl: '' }, + shippingMethod:'', hbList: [], remark: [], file: [], @@ -1051,8 +1052,9 @@ export default { const field = item.field.split('.') let label = field[1].toLowerCase() if (field[0] === 'order') { - if (['EPCODE', 'DZREMARK', 'CZREMARK', 'Warehouse'].includes(field[1])) { + if (['EPCODE', 'DZREMARK', 'CZREMARK', 'Warehouse', 'ShippingMethod'].includes(field[1])) { label = this.emnuDefaultLabel(field[1]) + console.log(label) } if (Object.keys(initDetail).includes(label)) { initDetail[label] = item.code @@ -1151,6 +1153,8 @@ export default { switch (field) { case 'EPCODE': return 'epCode' + case 'ShippingMethod': + return 'shippingMethod' case 'DZREMARK': return 'dzRemark' case 'CZREMARK': diff --git a/src/views/main/BookingGangjie/detail/modules/basicInfo.vue b/src/views/main/BookingGangjie/detail/modules/basicInfo.vue index f9e0134..eba9f92 100644 --- a/src/views/main/BookingGangjie/detail/modules/basicInfo.vue +++ b/src/views/main/BookingGangjie/detail/modules/basicInfo.vue @@ -1131,6 +1131,10 @@ export default { }, changeCustomer(type) { + if (!this.$route.query.id) { + this.$message.warning('请先保存') + return false + } if (type == 'add') { this.$router.push({ name: 'CustomerInformationManagementAdd' }) localStorage.setItem('CustomerInformationManagementAdd', 'new') diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index cf529c5..419cfa7 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -2636,12 +2636,18 @@ export default { handleModelSubmit(type) { const data = { 'id': this.details.id, - 'sendType': 'E' + 'sendType': '' + } + if (this.modelType === 'bookingSpace') { + data.sendType = 'B' + } + if (this.modelType === 'cutOff') { + data.sendType = 'E' } this.EDISloading = true CheckAndInitVOLTAEdi(data).then(res => { if (res.code === 200) { - this.voltaForm = res.data.extra + this.voltaForm = res.data.extra ? res.data.extra : {} if (!res.data.extra.blfrt) { this.$set(this.voltaForm, 'blfrt', 'PrePaid') } diff --git a/src/views/main/SendCar/addForm.vue b/src/views/main/SendCar/addForm.vue index 4a738df..2156e50 100644 --- a/src/views/main/SendCar/addForm.vue +++ b/src/views/main/SendCar/addForm.vue @@ -571,6 +571,11 @@ + + +