RMB利润：{{ statisticData.profitCNY }}
-
USD利润：{{ statisticData.payableUSD }}
+
USD利润：{{ statisticData.profitUSD }}
其他利润：
合计利润：{{ statisticData.payableTotal }}
利润率：{{ statisticData.profitMargin }}
@@ -192,10 +192,6 @@
// if (data.profitCNY) data.profitCNY = data.profitCNY.toLocaleString()
if (data.payableTotal) data.payableTotal = data.payableTotal.toLocaleString()
statisticData.value = data
- // statisticData.value = data
- // currencyData.value = data.byCurrency
- // customerData.value = data.byCustomer
- // billData.value = data.byBusiness
})
}
// 选中的业务行数据
@@ -208,8 +204,12 @@
}
onMounted(() => {
- //初始化
- reload()
+ //初始化 有id就是从任务跳转过来，直接打开这一票的费用
+ if (route.query.id) {
+ mainFeeTable.value.init({ id: route.query.id, businessType: 1 })
+ } else {
+ reload()
+ }
})
defineExpose({
getDataSource
diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js
index 06d88a60..a59664c0 100644
--- a/src/views/operation/seaexport/api/BookingLedger.js
+++ b/src/views/operation/seaexport/api/BookingLedger.js
@@ -24,6 +24,16 @@ export function BookingOrderGet(parameter) {
params: parameter,
})
}
+
+// copy详情
+export function GetSeaExportCopyInfo(data) {
+ return request({
+ url: '/opApi/SeaExport/GetSeaExportCopyInfo',
+ method: 'post',
+ data
+ })
+}
+
// 业务单据批量删除 (Auth)
export function SeaExportBatchDel(parameter) {
return request({
@@ -2249,3 +2259,21 @@ export function IsLastMarker(params) {
params,
})
}
+
+// 确认退舱
+export function CreateRefundConfirm(data) {
+ return request({
+ url: '/opApi/SeaExportRefund/CreateRefundConfirm',
+ method: 'post',
+ data
+ })
+}
+
+// 退出入池
+export function RefundPool(data) {
+ return request({
+ url: '/opApi/SeaExportRefund/RefundPool',
+ method: 'post',
+ data
+ })
+}
\ No newline at end of file
diff --git a/src/views/operation/seaexport/detail/components/journal.vue b/src/views/operation/seaexport/detail/components/journal.vue
index b6eef219..f7d13341 100644
--- a/src/views/operation/seaexport/detail/components/journal.vue
+++ b/src/views/operation/seaexport/detail/components/journal.vue
@@ -56,11 +56,12 @@
// 初始化日志数据
const init = () => {
const data = props.data
- console.log(data)
- data.forEach(item => {
- item['flag'] = false
- })
- logList.value = data
+ if (data && data.length) {
+ data.forEach(item => {
+ item['flag'] = false
+ })
+ }
+ logList.value = data || []
}
// 折叠日志详细信息
const foldLog = (item) => {
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index b0154b81..86b793e6 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -103,9 +103,15 @@
businessType="1"
>
-
+
{{ completeText }}
+
+ 创建退舱任务
+
+
+ 退出入池
+
@@ -179,14 +185,16 @@
BookingOrderGet,
BookingOrderSave,
GetCtnListRefsh,
- SeaExportCopy,
+ CreateRefundConfirm,
SeaExportTaskAudit,
CreateTask,
SetTaskStatus,
AutomaticBooking,
SubmitAudit,
Withdraw,
- IsLastMarker
+ IsLastMarker,
+ GetSeaExportCopyInfo,
+ RefundPool
} from '../api/BookingLedger'
import { GetFormSetInfoByModule } from '/@/api/common'
const appStore = useAppStore()
@@ -299,6 +307,8 @@
return '发送AMS'
} else if (status == 'ORDER_AUDIT_REJECTED' || status == 'WAIT_SI_REJECTED') {
return '重新提交'
+ } else if (status == 'RETURN_CABIN') {
+ return '退舱'
} else {
return '完成任务'
}
@@ -384,7 +394,7 @@
}
}
// 复制新建保存后置为true。刷新不情况指定字段
- let copyFlag = false
+ var copyFlag = false
// 获取详情
function getDetail() {
if (inPageLoading.value) {
@@ -394,15 +404,18 @@
inChildLoading.value = true
detailsLoadOver.value = false
loading.value = true
- BookingOrderGet({
- id: id.value,
- })
- .then(async (res) => {
+ // 复制过来的数据清除指定字段
+ if (route.query.source == 'copy' && !copyFlag) {
+ createMessage.success('复制成功，保存后生效！')
+ GetSeaExportCopyInfo({
+ id: id.value,
+ isCopyFee: false
+ }).then(async (res) => {
bookingDetails.value = {
orderContactList: []
}
// 复制过来的数据清除指定字段
- if (route.query.source == 'copy' && !copyFlag) {
+ if (route.query.source == 'copy') {
res.data = {
...res.data,
id: null,
@@ -432,19 +445,42 @@
}
bookingDetails.value = res.data
// 如果是审批页面切状态是已审单弹出选择现舱非现舱
- // if (res.data.businessStatusName == '已审单' && route.query.taskId) {
- // cvisible.value = true
- // }
+ inPageLoading.value = false
+ })
+ .catch(() => {
+ loading.value = false
+ })
+ } else {
+ BookingOrderGet({
+ id: id.value,
+ })
+ .then(async (res) => {
+ bookingDetails.value = {
+ orderContactList: []
+ }
+ // 根据permission获取表单设置数据
+ getFormSet(res.data.businessStatus)
+ loading.value = false
+ if (!res.data.ctnPriceInfo.length) {
+ res.data.ctnPriceInfo = [{}]
+ }
+ // 如果存在应结日期，去掉时分秒
+ if (res.data.stlDate) {
+ res.data.stlDate = res.data.stlDate.split(' ')[0]
+ }
+ bookingDetails.value = res.data
+ // 如果是审批页面切状态是已审单弹出选择现舱非现舱
inPageLoading.value = false
// 如果存在表单修改规则，重新更新表单
- if (res.data.formSetList && res.data.formSetList.length) {
- const formSetContent = JSON.parse(res.data.formSetList[0].content)
+ // if (res.data.formSetList && res.data.formSetList.length) {
+ // const formSetContent = JSON.parse(res.data.formSetList[0].content)
// RefbasicInfo.value.updateSchema()
- }
+ // }
})
.catch(() => {
loading.value = false
})
+ }
}
// 点击保存
const save = async (task) => {
@@ -537,8 +573,39 @@
if (!task) {
createMessage.success('保存成功!')
} else {
+ // 创建退舱和退舱入池
+ if (task == 'cjtc' || task == 'tcrc') {
+ if (task == 'cjtc') {
+ CreateRefundConfirm({
+ id: id.value,
+ businessType: 1
+ }).then(res => {
+ // createMessage.success(res.message)
+ completeTask(null, null)
+ })
+ } else {
+ RefundPool({
+ id: id.value,
+ businessType: 1
+ }).then(res => {
+ // createMessage.success(res.message)
+ completeTask(null, null)
+ })
+ }
+ } else {
+ // 订舱审核过来不需要调用完成任务接口
+ if (task != 'dc') completeTask(null, null)
+ }
// 订舱审核过来不需要调用完成任务接口
if (task != 'dc') completeTask(null, null)
+ // if (completeText.value == '退舱') {
+ // CreateRefundConfirm({
+ // id: id.value,
+ // businessType: 1
+ // }).then(res => {
+ // console.log(res)
+ // })
+ // }
}
} else {
createMessage.success('新增成功!')
@@ -550,10 +617,10 @@
go(`/BookingDetail?id=${res.data}&source=edit`)
}, 50)
}
- init()
if (route.query.source == 'copy') {
copyFlag = true
}
+ init()
}
// 如果是改配保存，恢复字段原元素
if (changeFlag.value) {
@@ -992,10 +1059,11 @@
}
// 拷贝数据跳转
const copyData = () => {
- SeaExportCopy({ id: id.value }).then((res) => {
- createMessage.success('复制成功')
- go(`/BookingDetail?id=${res.data}&source=copy`)
- })
+ go(`/BookingDetail?id=${id.value}&source=copy`)
+ // SeaExportCopy({ id: id.value }).then((res) => {
+ // createMessage.success('复制成功')
+ // go(`/BookingDetail?id=${res.data}&source=copy`)
+ // })
}
function getRules(data) {
const { rows, type } = data
@@ -1108,6 +1176,12 @@
})
}
}
+ watch(
+ () => copyFlag,
+ (b) => {
+ console.log(b)
+ }
+ )