@@ -106,6 +110,13 @@
isParent="parent"
@changeDetail="changeDetailFun">
+
+
+
@@ -435,10 +446,17 @@ export default {
if (nVal == '1-1') {
document.querySelector('#tab1').checked = true
document.querySelector('#tab2').checked = false
+ document.querySelector('#tab3').checked = false
}
if (nVal == '2-2') {
document.querySelector('#tab2').checked = true
document.querySelector('#tab1').checked = false
+ document.querySelector('#tab3').checked = false
+ }
+ if (nVal == '3-3') {
+ document.querySelector('#tab3').checked = true
+ document.querySelector('#tab1').checked = false
+ document.querySelector('#tab2').checked = false
}
}
}
@@ -611,6 +629,34 @@ export default {
// this.$refs.basicInfo.refresh()
// this.$refs.goodsTable.tableData = data.data2
},
+ sendMessageFY() {
+ const mapFrame = this.$refs['iframe']
+ const data = {
+ custno: this.bookingDetails.custno,
+ mblno: this.bookingDetails.mblno,
+ cntrtotal: this.bookingDetails.cntrtotal,
+ cbm: this.bookingDetails.cbm,
+ kgs: this.bookingDetails.kgs,
+ pkgs: this.bookingDetails.pkgs,
+ customername: this.bookingDetails.customername,
+ portdischarge: this.bookingDetails.portdischarge,
+ vessel: this.bookingDetails.vessel,
+ voyno: this.bookingDetails.voyno,
+ sale: this.bookingDetails.sale,
+ etd: this.bookingDetails.etd,
+ blfrt: this.bookingDetails.blfrt,
+ destination: this.bookingDetails.destination,
+ portload: this.bookingDetails.portload,
+ id: this.bookingDetails.id
+ }
+ const iframeWin = mapFrame.contentWindow
+ console.log(mapFrame.contentWindow)
+ iframeWin.postMessage(
+ {
+ token: localStorage.getItem('pro__Access-Token'),
+ data: data
+ }, '*')
+ },
...mapActions(['setNeedSavePages', 'setBookingList', 'setBookingGridOptions', 'setInBookingDetailsSave', 'setSET_SAVEFLAG']),
getRouterHis() {
this.inChildLoading = true
@@ -782,7 +828,7 @@ export default {
}, 200)
setTimeout(() => {
const key = this.$route.fullPath
-
+ this.sendMessageFY()
setTimeout(() => {
const detailsChange = Object.keys(this.needSavePages).includes(key)
? !!this.needSavePages[key].details
@@ -1198,6 +1244,7 @@ export default {
const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt }
this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } })
this.oldBookingDetails = JSON.parse(JSON.stringify(this.bookingDetails))
+ this.sendMessageFY()
if (this.$route.query.isCopy && this.$route.query.copyId) {
const hisData = {
bookingDetails: this.bookingDetails,
@@ -1299,7 +1346,13 @@ export default {
return true
},
handleSaveCtnList(data, slots) {
- this.bookingDetails.ctnInputs = data
+ const arr = []
+ data.forEach(item => {
+ if (item.ctnnum > 0) {
+ arr.push(item)
+ }
+ })
+ this.bookingDetails.ctnInputs = arr
this.bookingDetails.slots = slots
this.$refs.goodsTable.init()
},
diff --git a/src/views/main/CabinInventory/index.vue b/src/views/main/CabinInventory/index.vue
index b99b31f..f294ed9 100644
--- a/src/views/main/CabinInventory/index.vue
+++ b/src/views/main/CabinInventory/index.vue
@@ -80,12 +80,16 @@
+
{{ row.eta?row.eta.substring(0,10):'' }}
-
+
{{ row.etd?row.etd.substring(0,10):'' }}
+
+ {{ row.totaL_ORDERS - row.usE_NUM }}
+
+
{{ row[item.dataIndex] }}
@@ -204,7 +208,12 @@ export default {
width: '100',
dataIndex: 'ctN_STAT'
},
-
+ {
+ title: '剩余箱型箱量',
+ align: 'center',
+ width: '110',
+ dataIndex: 'remaiN_CTN_STAT'
+ },
{
title: 'ETD',
align: 'center',
diff --git a/src/views/main/CabinManagement/index.vue b/src/views/main/CabinManagement/index.vue
index af541f1..41225a4 100644
--- a/src/views/main/CabinManagement/index.vue
+++ b/src/views/main/CabinManagement/index.vue
@@ -171,12 +171,13 @@
{{ row.vessel }}/{{ row.voyno }}
-
+
{{ row.eta?row.eta.substring(0,10):'' }}
-
+
{{ row.etd?row.etd.substring(0,10):'' }}
+
{{ row[item.dataIndex] }}
diff --git a/src/views/main/Taskmanage/BCModify/index.vue b/src/views/main/Taskmanage/BCModify/index.vue
new file mode 100644
index 0000000..6c32575
--- /dev/null
+++ b/src/views/main/Taskmanage/BCModify/index.vue
@@ -0,0 +1,893 @@
+
+
+
+
+
+
+
Booking Amendment（{{ form.carrierId }}）
+
订舱时间：{{ form.bookingConfirmDate }}
+
一程
+
+
+
+ {{ form.vessel }}/{{ form.voyNo }}
+
+
+
+
+ {{ form.etd ? form.etd.substring(0, 11) : '-' }}
+
+
+
+
+ {{ form.portload }}
+
+
+
+
+ {{ form.eta ? form.eta.substring(0, 11) : '-' }}
+
+
+
+
+ {{ form.portDischarge }}
+
+
+
+
+
+ 二程
+
+
+
+ {{ form.secondVessel }}/{{ form.secondVoyno }}
+
+
+
+
+ {{ form.secondETD ? form.secondETD.substring(0, 11) : '-' }}
+
+
+
+
+ {{ form.transferPort1 }}
+
+
+
+
+ {{ form.secondETA ? form.secondETA.substring(0, 11) : '-' }}
+
+
+
+
+ {{ form.portDischarge }}
+
+
+
关联详情
+
+
+
+
+
+ {{ form.bookingSlotId ? '是' : '否' }}
+
+
+
+ 查看
+
+
+
+ {{ form.bookingOrderId ? '是' : '否' }}
+
+
+
+ 查看
+
+
+
+ {{ form.taskStatus == 'Complete' ? '已完成' : '-' }}
+
+
+
+
+
+
+ 关键信息
+
+
+
+
+
+
+
订舱变更比对BC存在差异
+ 差异总数:{{ compareResultList.length }}项
+
+
+
+
+ 直接生成舱位和订舱
+
+
+ 只生成订舱
+
+
+ 只生成舱位
+
+
+ 匹配已有订舱
+
+
+ 订舱录入
+
+
+
+
+
+
+ {{ item.shortName }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ serive.serviceProjectName }}
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ {{ item.fieldName }}：{{ item.reqVal }}
+ 变更为
+
+
+
+
订舱录入
@@ -331,13 +334,13 @@
{{ item.name }}
@@ -574,6 +577,16 @@ export default {
this.getList()
},
methods: {
+ copyText(text) {
+ const inputDom = document.createElement('textarea')
+ document.body.appendChild(inputDom)
+ inputDom.value = text
+ inputDom.select()
+ inputDom.focus()
+ document.execCommand('copy')
+ document.body.removeChild(inputDom)
+ this.$message.success('复制成功')
+ },
ChangeFileRadio() {
this.spinning = true
const ApiData = {
@@ -678,9 +691,9 @@ export default {
taskPKId: this.$route.query.taskPKId
}
GetInfoByTaskId(ApiData).then(res => {
- console.log(res.data)
if (res.data.succ) {
this.form = res.data.ext
+ console.log(this.form)
if (this.form.fileList) {
this.isPdf = this.form.fileList[0].fileType
}
@@ -714,7 +727,9 @@ export default {
},
OpenModal() {
this.CreateData = {
- generateMethod: 'GEN_BOOKING_SLOT'
+ generateMethod: 'GEN_BOOKING_SLOT',
+ customerList: [],
+ isDirectSend: false
}
this.UserList.forEach(item => {
if (item.id == this.userInfo.id) {
@@ -743,6 +758,20 @@ export default {
projectList,
...this.CreateData
}
+ if (this.CreateData.customerList.length > 0) {
+ const arr = []
+ this.customerByList.forEach(item => {
+ this.CreateData.customerList.forEach(ite => {
+ if (ite == item.id) {
+ arr.push({
+ customerContactId: item.id,
+ customerContactName: item.name
+ })
+ }
+ })
+ })
+ ApiData.customerContactList = arr
+ }
console.log(ApiData)
CreateBookingAndSlot(ApiData).then(res => {
if (res.data.succ) {
diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue
index 33fe96d..5b8f4ce 100644
--- a/src/views/main/Taskmanage/TaskmanageList/index.vue
+++ b/src/views/main/Taskmanage/TaskmanageList/index.vue
@@ -10,8 +10,9 @@
- {{ item.name }}({{ item.total }}){{ item.name }}({{ item.total }})
@@ -206,8 +207,10 @@
>
LARA登记
-
LARA记录LARA记录
@@ -1473,6 +1476,12 @@ export default {
// this.$router.push({ path: '/commontaskmanage/BcFileDetail', query: { taskPKId: data.pkId } })
// BC编辑
this.$router.push({ path: '/commontaskmanage/BcEditing', query: { taskPKId: data.pkId } })
+ } else if (data.taskType === 'BC_MODIFY') {
+ // BC变更
+ this.$router.push({ path: '/commontaskmanage/BCModify', query: { taskPKId: data.pkId } })
+ } else if (data.taskType === 'CANCELLATION') {
+ // Cancellation
+ this.$router.push({ path: '/commontaskmanage/Cancellation', query: { taskPKId: data.pkId } })
} else {
// 订舱详情查看
this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } })
diff --git a/src/views/main/Taskmanage/cancellation/index.vue b/src/views/main/Taskmanage/cancellation/index.vue
new file mode 100644
index 0000000..4afdf31
--- /dev/null
+++ b/src/views/main/Taskmanage/cancellation/index.vue
@@ -0,0 +1,893 @@
+
+
+
+
+
+
+
Booking Cancellation（{{ form.carrierId }}）
+
订舱时间：{{ form.bookingConfirmDate }}
+
一程
+
+
+
+ {{ form.vessel }}/{{ form.voyNo }}
+
+
+
+
+ {{ form.etd ? form.etd.substring(0, 11) : '-' }}
+
+
+
+
+ {{ form.portload }}
+
+
+
+
+ {{ form.eta ? form.eta.substring(0, 11) : '-' }}
+
+
+
+
+ {{ form.portDischarge }}
+
+
+
+
+
+ 二程
+
+
+
+ {{ form.secondVessel }}/{{ form.secondVoyno }}
+
+
+
+
+ {{ form.secondETD ? form.secondETD.substring(0, 11) : '-' }}
+
+
+
+
+ {{ form.transferPort1 }}
+
+
+
+
+ {{ form.secondETA ? form.secondETA.substring(0, 11) : '-' }}
+
+
+
+
+ {{ form.portDischarge }}
+
+
+
关联详情
+
+
+
+
+
+ {{ form.bookingSlotId ? '是' : '否' }}
+
+
+
+ 查看
+
+
+
+ {{ form.bookingOrderId ? '是' : '否' }}
+
+
+
+ 查看
+
+
+
+ {{ form.taskStatus == 'Complete' ? '已完成' : '-' }}
+
+
+
+
+
+
+ 关键信息
+
+
+
+
+
+
+
订舱变更比对BC存在差异
+ 差异总数:{{ compareResultList.length }}项
+
+
+
+
+ 直接生成舱位和订舱
+
+
+ 只生成订舱
+
+
+ 只生成舱位
+
+
+ 匹配已有订舱
+
+
+ 订舱录入
+
+
+
+
+
+
+ {{ item.shortName }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ serive.serviceProjectName }}
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ {{ item.fieldName }}：{{ item.reqVal }}
+ 变更为
+
+
+
+
+
+
diff --git a/src/views/main/fee/feeUnits.vue b/src/views/main/fee/feeUnits.vue
new file mode 100644
index 0000000..1ee23a3
--- /dev/null
+++ b/src/views/main/fee/feeUnits.vue
@@ -0,0 +1,425 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+ 是
+ 否
+
+ {{ row[item.dataIndex] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+
+
+ 否
+
+
+
+
+
+
+
+
+ 是
+
+
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+