diff --git a/.env b/.env index 33e92d4..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 # 和川大简云正式 @@ -11,8 +11,8 @@ VUE_APP_TYPE = 'gangjie' # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # 和川大简云测试 -# VUE_APP_API_BASE_URL=http://60.209.125.238:35100 -# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 +VUE_APP_API_BASE_URL=http://60.209.125.238:35100 +VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 # 客户端测试 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813 @@ -23,8 +23,8 @@ VUE_APP_TYPE = 'gangjie' # 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:6001 diff --git a/.env.development b/.env.development index ed1d2a1..cf7bf3e 100644 --- a/.env.development +++ b/.env.development @@ -1,14 +1,14 @@ 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 # 和川大简云正式 -# 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 @@ -26,8 +26,8 @@ VUE_APP_TYPE = 'gangjie' # VUE_APP_SOCKET_BASE_URL=http://192.168.0.80:7373/ # 港捷 -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 diff --git a/src/components/mskBookingOrder/index.vue b/src/components/mskBookingOrder/index.vue index 15ab484..6f71e0a 100644 --- a/src/components/mskBookingOrder/index.vue +++ b/src/components/mskBookingOrder/index.vue @@ -626,7 +626,7 @@ export default { } }) }, - init(id) { + init(id, type) { this.getContractnoList() this.shipData = [] if (!id) { diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js index 6aa2357..228449d 100644 --- a/src/router/generator-routers.js +++ b/src/router/generator-routers.js @@ -35,9 +35,8 @@ const constantRouterComponents = { '403': () => import('@/views/system/exception/403'), '404': () => import('@/views/system/exception/404'), '500': () => import('@/views/system/exception/500'), - + // 各种详情页以及独立页面 Workplace: () => import('@/views/system/dashboard/Workplace'), - // account AccountCenter: () => import('@/views/system/account/center/Index'), AccountSettings: () => import('@/views/system/account/settings/Index'), BaseSettings: () => import('@/views/system/account/settings/BaseSetting'), @@ -47,7 +46,6 @@ const constantRouterComponents = { NotificationSettings: () => import('@/views/system/account/settings/Notification'), TableDemo: () => import('@/views/tableDemo/index'), OrderList: () => import('@/views/Booking/OrderList/index'), - // 默认首页 Console: () => import('@/views/system/index/welcome'), BookingDetail: () => import('@/views/main/BookingLedger/detail'), BookingDetailDjy: () => import('@/views/main/BookingDjyLedger/detail'), @@ -59,7 +57,6 @@ const constantRouterComponents = { CustomerInformationManagementAdd: () => import('@/views/main/Customer/addForm'), CustomerInformationManagementEdit: () => import('@/views/main/Customer/editForm'), SendCarAdd: () => import('@/views/main/SendCar/addForm'), - // 任务模块 TaskmanageDetail: () => import('@/views/main/Taskmanage/TaskmanageDetail'), TaskLaraRecord: () => import('@/views/main/Taskmanage/TaskLaraRecord'), TaskLaraRegist: () => import('@/views/main/Taskmanage/TaskLaraRegist'), diff --git a/src/views/ServiceItems/index.vue b/src/views/ServiceItems/index.vue new file mode 100644 index 0000000..cd79b08 --- /dev/null +++ b/src/views/ServiceItems/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/main/BookingGangjie/detail/index.vue b/src/views/main/BookingGangjie/detail/index.vue index 7759047..ca445ce 100644 --- a/src/views/main/BookingGangjie/detail/index.vue +++ b/src/views/main/BookingGangjie/detail/index.vue @@ -884,7 +884,6 @@ export default { if (arr.includes('ctnall')) { copyData.ctnInputs = $data.bookingDetails.ctnInputs } - console.log($data) this.bookingDetails = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData } this.oldBookingDetails = JSON.parse(JSON.stringify(this.bookingDetails)) } else { diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 6fb8ca7..c2fa6c2 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -865,21 +865,20 @@ export default { }) } if (this.isCopy && !$data.isCopy) { + const arr = localStorage.getItem('booking_form_copy') ? JSON.parse(localStorage.getItem('booking_form_copy')) : [] const copyData = { - customername: $data.bookingDetails.customername, - portloadid: $data.bookingDetails.portloadid, - carrierid: $data.bookingDetails.carrierid, - carrier: $data.bookingDetails.carrier, - portload: $data.bookingDetails.portload, - issueplace: $data.bookingDetails.issueplace, - prepardat: $data.bookingDetails.prepardat, - route: $data.bookingDetails.route, - shippingMethod: $data.bookingDetails.shippingMethod, - shipper: $data.bookingDetails.shipper, - consignee: $data.bookingDetails.consignee, - notifyparty: $data.bookingDetails.notifyparty, - goodsStatus: $data.bookingDetails.goodsStatus, - sale: $data.bookingDetails.sale + bookingEDIExt: {} + } + arr.forEach(item => { + if (item.includes('bookingEDIExt')) { + const str = item.replace('bookingEDIExt.', '') + copyData.bookingEDIExt[str] = $data.bookingDetails.bookingEDIExt[str] + } else { + copyData[item] = $data.bookingDetails[item] + } + }) + if (arr.includes('ctnall')) { + copyData.ctnInputs = $data.bookingDetails.ctnInputs } this.bookingDetails = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData } this.oldBookingDetails = JSON.parse(JSON.stringify(this.bookingDetails)) @@ -1329,18 +1328,20 @@ export default { let newData = res.data if (this.$route.query.isCopy && !overSet) { delete res.data.id + const arr = localStorage.getItem('booking_form_copy') ? JSON.parse(localStorage.getItem('booking_form_copy')) : [] const copyData = { - customername: res.data.customername, - portloadid: res.data.portloadid, - portload: res.data.portload, - issueplace: res.data.issueplace, - prepardat: res.data.prepardat, - route: res.data.route, - shippingMethod: res.data.shippingMethod, - shipper: res.data.shipper, - consignee: res.data.consignee, - notifyparty: res.data.notifyparty, - sale: res.data.sale + bookingEDIExt: {} + } + arr.forEach(item => { + if (item.includes('bookingEDIExt')) { + const str = item.replace('bookingEDIExt.', '') + copyData.bookingEDIExt[str] = res.data.bookingEDIExt[str] + } else { + copyData[item] = res.data[item] + } + }) + if (arr.includes('ctnall')) { + copyData.ctnInputs = res.data.ctnInputs } newData = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData } } diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index 8f5062a..9a3388a 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -277,7 +277,7 @@ -