diff --git a/.env b/.env index c84d1c6..8a0c6fd 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ 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' # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy @@ -11,8 +11,8 @@ VUE_APP_TYPE = 'hechuan' # 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 @@ -27,8 +27,8 @@ VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 # 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 7675bb5..75bff01 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ NODE_ENV=development VUE_APP_PREVIEW=true # VUE_APP_TYPE = 'customer' # VUE_APP_TYPE = 'hechuan' -# VUE_APP_TYPE = 'yunyingduan' -VUE_APP_TYPE = 'gangjie' +VUE_APP_TYPE = 'yunyingduan' +# VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 和川大简云正式 @@ -11,16 +11,16 @@ 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 # 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/ diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index c6cd82d..32a1d31 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -1572,4 +1572,12 @@ export function CancelServiceStatusIfram(parameter) { method: 'post', data: parameter }) +} + +export function PostApiSO(parameter) { + return axios({ + url: '/BookingCustomerOrder/PostApiSO', + method: 'post', + params: parameter + }) } \ No newline at end of file diff --git a/src/api/modular/main/TaskmanageList.js b/src/api/modular/main/TaskmanageList.js index d055b77..21063d3 100644 --- a/src/api/modular/main/TaskmanageList.js +++ b/src/api/modular/main/TaskmanageList.js @@ -550,3 +550,10 @@ export function ReCompareResult(parameter) { }) } +export function GetBookingOrder(parameter) { + return axios({ + url: '/TaskManageBC/GetBookingOrder', + method: 'get', + params: parameter + }) +} \ No newline at end of file diff --git a/src/views/main/BookingCustomerLedger/list/index.vue b/src/views/main/BookingCustomerLedger/list/index.vue index 7b51130..571f88d 100644 --- a/src/views/main/BookingCustomerLedger/list/index.vue +++ b/src/views/main/BookingCustomerLedger/list/index.vue @@ -1539,13 +1539,6 @@ export default { BookingCustomerOrderGet(data).then(res => { if (res.success) { this.statusLoading = false - res.data.logList.forEach(item => { - const arr = item.status.split('，') - item.status = arr[0] - if (arr.length > 1) { - item.remark = arr[1].slice(5, arr[1].length) - } - }) this.statusList = res.data.logList } else { this.$message.error(res.message) diff --git a/src/views/main/BookingDjy/detail/index.vue b/src/views/main/BookingDjy/detail/index.vue index f7bf8ae..9848d2a 100644 --- a/src/views/main/BookingDjy/detail/index.vue +++ b/src/views/main/BookingDjy/detail/index.vue @@ -3,6 +3,7 @@
通过 驳回 + 发送API订舱 订单编号: {{ details.bookingno }}
@@ -139,6 +140,17 @@ {{ details.saleCode }} + + + {{ details.lanecode }} + + @@ -509,11 +521,12 @@ import selectView from '../../BookingLedger/detail/components/selectView' import datePickerView from '../../BookingLedger/detail/components/datePickerView' import autoView from '../../BookingLedger/detail/components/autoView' import textareaView from '../../BookingLedger/detail/components/textareaView' -import { UploadTempFile, BookingCustomerOrderGetFile } from '@/api/modular/system/fileManage' +import { BookingCustomerOrderGetFile } from '@/api/modular/system/fileManage' import { - BookingCustomerOrderSave, BookingTemplateAdd, BookingCustomerOrderGet, - BookingCustomerOrderDelete, BookingCustomerOrderSubmit, - BookingCustomerOrderCancelSubmit, BookingCustomerOrderAuditBooking + BookingCustomerOrderGet, + BookingCustomerOrderSubmit, + BookingCustomerOrderAuditBooking, + PostApiSO } from '@/api/modular/main/BookingLedger' import { mapGetters } from 'vuex' export default { @@ -552,6 +565,7 @@ export default { textEntryModalVisible: false, textEntryModalTitle: '', historyData: {}, + sendLoading:false, textEntryType: '', pkgstotalRes: 0, modelTitle: '', @@ -608,7 +622,17 @@ export default { this.getDetail() } }, - + handleSendApi() { + this.sendLoading = true + PostApiSO({ id: this.$route.query.id }).then(res => { + if (res.success) { + this.$message.success('操作成功') + } else { + this.$message.error(res.message) + } + this.sendLoading = false + }) + }, handleAutio() { this.autioFlag = true }, diff --git a/src/views/main/BookingDjy/list/index.vue b/src/views/main/BookingDjy/list/index.vue index cc41057..73c1f29 100644 --- a/src/views/main/BookingDjy/list/index.vue +++ b/src/views/main/BookingDjy/list/index.vue @@ -1478,13 +1478,6 @@ export default { BookingCustomerOrderGet(data).then(res => { if (res.success) { this.statusLoading = false - res.data.logList.forEach(item => { - const arr = item.status.split('，') - item.status = arr[0] - if (arr.length > 1) { - item.remark = arr[1].slice(5, arr[1].length) - } - }) this.statusList = res.data.logList } else { this.$message.error(res.message) diff --git a/src/views/main/Taskmanage/BCModify/index.vue b/src/views/main/Taskmanage/BCModify/index.vue index efe18ed..70767fe 100644 --- a/src/views/main/Taskmanage/BCModify/index.vue +++ b/src/views/main/Taskmanage/BCModify/index.vue @@ -5,7 +5,8 @@

Booking Amendment（{{ form.carrierId }}） -

+ +

订舱时间：{{ form.bookingConfirmDate }}

@@ -235,7 +236,7 @@ - 查看 + 查看 - - - - 直接生成舱位和订舱 - - - 只生成订舱 - - - 只生成舱位 - - - 匹配已有订舱 - - - 是否直接发送邮件给订舱联系人 -

订舱录入

- - - - - - - {{ item.shortName }} - - - - - - - - - {{ item.name }} - - - - - - - - - - - {{ item.name }} - - - - - - - - - {{ item.name }} - - - - - - - - - {{ item.name }} - - - - - - - - - - - {{ item.name }} - - - - - - - - - {{ item.name }} - - - - - - - - - {{ item.name }} - - - - - - - - - - - - - - - - - - - - - - -
-
- {{ serive.serviceProjectName }} + + + + + 更新订舱 + + + 直接生成舱位和订舱 + + + 只生成订舱 + + + 只生成舱位 + + + 匹配已有订舱 + + + 是否直接发送邮件给订舱联系人 +

订舱录入

+ + + + + + + {{ item.shortName }} + + + + + + + + + {{ item.name }} + + + + + + + + + + + {{ item.name }} + + + + + + + + + {{ item.name }} + + + + + + + + + {{ item.name }} + + + + + + + + + + + {{ item.name }} + + + + + + + + + {{ item.name }} + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + + + + + +
+
+ {{ serive.serviceProjectName }} +
-
- - - - + + + + + @@ -584,7 +607,8 @@ import { TaskManageBCSendEmai1, TaskManageBCGetCompareResult, BcSearchAndConnectBookingInfo, - ReCompareResult + ReCompareResult, + GetBookingOrder } from '@/api/modular/main/TaskmanageList' import { mapGetters } from 'vuex' import { DjyCustomerSuggest, GetSysUserPage, DjyCustomerContacts } from '@/api/modular/main/BookingLedger' @@ -596,6 +620,7 @@ export default { UserId: '', value: '', customerByList: [], + openLoading: false, compareResultFlag: false, formItemLayout: { labelCol1: { span: 6 }, @@ -819,6 +844,9 @@ export default { FnSee() { this.$router.push({ path: '/BookingDetail?id=' + this.form.bookingOrderId }) }, + FnSee1() { + this.$router.push({ path: '/CabinManagementDetails?type=Edit&id=' + this.form.bookingSlotId }) + }, FnCompleteTask() { const ApiData = [this.$route.query.taskPKId] CompleteTask(ApiData).then(res => { @@ -854,18 +882,25 @@ export default { data.isYield = !data.isYield }, OpenModal() { - this.CreateData = { - generateMethod: 'GEN_BOOKING', - customerList: [], - isDirectSend: false - } - this.UserList.forEach(item => { - if (item.id == this.userInfo.id) { - this.CreateData.opId = item.id - this.CreateData.opName = item.name + this.visible = true + this.openLoading = true + GetBookingOrder({ taskPkId: this.$route.query.taskPKId }).then(res => { + if (res.data.ext) { + this.CreateData = { + generateMethod: 'UPD_BOOKING', + customerList: [], + isDirectSend: false, + ...res.data.ext + } + } else { + this.CreateData = { + generateMethod: 'UPD_BOOKING', + customerList: [], + isDirectSend: false + } } + this.openLoading = false }) - this.visible = true }, getList() { this.spinning = true @@ -907,18 +942,6 @@ export default { this.CustomerList = res.data.rows }) }, - OpenModal() { - this.CreateData = { - generateMethod: 'GEN_BOOKING_SLOT' - } - this.UserList.forEach(item => { - if (item.id == this.userInfo.id) { - this.CreateData.opId = item.id - this.CreateData.opName = item.name - } - }) - this.visible = true - }, OpenUser() { this.UserId = '' this.UserVisible = true diff --git a/src/views/main/Taskmanage/BcFileDetail/Editing.vue b/src/views/main/Taskmanage/BcFileDetail/Editing.vue index 1de444b..4bc75e3 100644 --- a/src/views/main/Taskmanage/BcFileDetail/Editing.vue +++ b/src/views/main/Taskmanage/BcFileDetail/Editing.vue @@ -207,7 +207,7 @@ - 查看 + 查看 { diff --git a/src/views/main/Taskmanage/cancellation/index.vue b/src/views/main/Taskmanage/cancellation/index.vue index 83acf96..1255ba8 100644 --- a/src/views/main/Taskmanage/cancellation/index.vue +++ b/src/views/main/Taskmanage/cancellation/index.vue @@ -206,7 +206,7 @@ - 查看 + 查看 { diff --git a/src/views/main/ruleTemp/detail.vue b/src/views/main/ruleTemp/detail.vue index fd1dd4a..a68ed49 100644 --- a/src/views/main/ruleTemp/detail.vue +++ b/src/views/main/ruleTemp/detail.vue @@ -74,6 +74,18 @@ + + + + + + + + + + + +
船期匹配优先级 (船舶路径默认直达优先，航程默认最短优先，离港日期默认最早优先，预抵日期默认最早优先) diff --git a/src/views/system/ServiceItems/addForm.vue b/src/views/system/ServiceItemList/addForm.vue similarity index 100% rename from src/views/system/ServiceItems/addForm.vue rename to src/views/system/ServiceItemList/addForm.vue diff --git a/src/views/system/ServiceItems/editForm.vue b/src/views/system/ServiceItemList/editForm.vue similarity index 100% rename from src/views/system/ServiceItems/editForm.vue rename to src/views/system/ServiceItemList/editForm.vue diff --git a/src/views/system/ServiceItems/index.vue b/src/views/system/ServiceItemList/index.vue similarity index 100% rename from src/views/system/ServiceItems/index.vue rename to src/views/system/ServiceItemList/index.vue