diff --git a/src/views/operation/invoiceApply/api.js b/src/views/operation/invoiceApply/api.js index aad8c6eb..0a8cf1b7 100644 --- a/src/views/operation/invoiceApply/api.js +++ b/src/views/operation/invoiceApply/api.js @@ -86,4 +86,14 @@ export function GetTemplateList(parameter) { method: 'get', params:parameter }) -} \ No newline at end of file +} + +export function RenderTemplate(parameter) { + return request({ + url: '/feeApi/InvoiceApplication/RenderTemplate', + method: 'get', + params:parameter + }) +} + + diff --git a/src/views/operation/invoiceApply/detail/index.vue b/src/views/operation/invoiceApply/detail/index.vue index 943db5f0..2e0e02a9 100644 --- a/src/views/operation/invoiceApply/detail/index.vue +++ b/src/views/operation/invoiceApply/detail/index.vue @@ -9,7 +9,8 @@ @@ -57,6 +63,7 @@ const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({ }) const feeTableRef = ref(null) as any const open = ref(false) +const nameFlag = ref(false) async function handleSave() { const values = await validate() const data = { @@ -141,11 +148,20 @@ function getDetail() { } }) } -function openTempName(){ - +function openTempName() { + nameFlag.value = true } function updateListSave() { +} +const tempNameId = ref('') +function handleRender(){ + let temp = '' + tempList.value.forEach(item=>{ + if(item.id==tempNameId.value){ + temp = item.content + } + }) } const tempName = ref('') const tempId = ref('') diff --git a/src/views/operation/seaexport/detail/modules/goodsTable.vue b/src/views/operation/seaexport/detail/modules/goodsTable.vue index 8ebd7f5b..809e3ba0 100644 --- a/src/views/operation/seaexport/detail/modules/goodsTable.vue +++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue @@ -1702,10 +1702,10 @@ let RData = 0 list.value.forEach((e) => { if (e.kgs) { - RData = RData + parseInt(e.kgs) + RData = RData + Number(e.kgs) } }) - totalKgs.value = RData + totalKgs.value = RData.toFixed(2) emit('changeTotal', { type: 'totalKgs', val: totalKgs.value }) } // 计算尺码 @@ -1713,10 +1713,10 @@ let RData = 0 list.value.forEach((e) => { if (e.cbm) { - RData = RData + parseInt(e.cbm) + RData = RData + Number(e.cbm) } }) - totalCbm.value = RData + totalCbm.value = RData.toFixed(2) emit('changeTotal', { type: 'totalCbm', val: totalCbm.value }) } // 计算箱量 diff --git a/src/views/operation/seaexport/detail/modules/operationArea.vue b/src/views/operation/seaexport/detail/modules/operationArea.vue index 5dfc6018..6177502e 100644 --- a/src/views/operation/seaexport/detail/modules/operationArea.vue +++ b/src/views/operation/seaexport/detail/modules/operationArea.vue @@ -1053,7 +1053,7 @@ const voltaFlag = ref(false) const voltaData = ref([]) const bookingModelFrom = reactive({ - id: props, + id: props.id, orderNo: props.details.mblno, useForwarderCode: false, forwarderCode: '', @@ -1281,7 +1281,6 @@ fileRole: bookingModelFrom.fileRole, sendType: modelType.value === 'bookingSpace' ? 'B' : 'E', } - EDISloading.value = true if (modelType.value === 'bookingSpace') { // 订舱