diff --git a/src/views/bookingcabin/CabinManagement/columns.tsx b/src/views/bookingcabin/CabinManagement/columns.tsx index 29251f57..b2477733 100644 --- a/src/views/bookingcabin/CabinManagement/columns.tsx +++ b/src/views/bookingcabin/CabinManagement/columns.tsx @@ -602,28 +602,28 @@ export const columns: BasicColumn[] = [ title: '创建日期', align: 'center', width: 150, - dataIndex: 'createdTime', + dataIndex: 'createTime', customCell: sharedOnCell, }, { title: '创建人', align: 'center', width: 100, - dataIndex: 'createdUserName', + dataIndex: 'createUserName', customCell: sharedOnCell, }, { title: '更新日期', align: 'center', width: 150, - dataIndex: 'updatedTime', + dataIndex: 'updateTime', customCell: sharedOnCell, }, { title: '更新人', align: 'center', width: 100, - dataIndex: 'updatedUserName', + dataIndex: 'updateUserName', customCell: sharedOnCell, }, { @@ -785,12 +785,10 @@ export const detialForm: FormSchema[] = [ ], onChange: (e, obj) => { if (e && obj) { - console.log(e, obj,1) formModel.bookingSlotTypeName = obj.label } if (!obj && !e) { formModel.bookingSlotTypeName = '' - console.log(e, obj,2) } }, } diff --git a/src/views/bookingcabin/cabinBooking/columns.tsx b/src/views/bookingcabin/cabinBooking/columns.tsx index 0fc39466..35df4666 100644 --- a/src/views/bookingcabin/cabinBooking/columns.tsx +++ b/src/views/bookingcabin/cabinBooking/columns.tsx @@ -339,13 +339,13 @@ export const columns: BasicColumn[] = [ title: '订舱人', align: 'center', width: 130, - dataIndex: 'createdUserName' + dataIndex: 'createUserName' }, { title: '订舱日期', align: 'center', width: 150, - dataIndex: 'createdTime' + dataIndex: 'createTime' }, { title: '金额', diff --git a/src/views/operation/invoiceApply/api.js b/src/views/operation/invoiceApply/api.js index 0a8cf1b7..312128da 100644 --- a/src/views/operation/invoiceApply/api.js +++ b/src/views/operation/invoiceApply/api.js @@ -96,4 +96,13 @@ export function RenderTemplate(parameter) { }) } +export function InvoiceApplicationDelete(parameter) { + return request({ + url: '/feeApi/InvoiceApplication/Delete', + method: 'post', + data: parameter, + }) +} + + diff --git a/src/views/operation/invoiceApply/detail/index.vue b/src/views/operation/invoiceApply/detail/index.vue index 2e0e02a9..abf59c0b 100644 --- a/src/views/operation/invoiceApply/detail/index.vue +++ b/src/views/operation/invoiceApply/detail/index.vue @@ -50,7 +50,7 @@ import { BasicForm, useForm } from '/@/components/Form/index' import { AutoComplete } from 'ant-design-vue' import { detailForm } from '../columns' import feeTable from './feeTable.vue'; -import { InvoiceApplicationSave, InvoiceApplicationGet, GetTemplateFields, SaveTemplate, GetTemplateList } from '../api' +import { InvoiceApplicationSave, InvoiceApplicationGet, GetTemplateFields, SaveTemplate, GetTemplateList,RenderTemplate } from '../api' import { useMessage } from '/@/hooks/web/useMessage' import { useRoute } from 'vue-router' const route = useRoute() @@ -150,6 +150,12 @@ function getDetail() { } function openTempName() { nameFlag.value = true + GetTemplateList().then(res => { + tempList.value = res.data + tempList.value.forEach(item => { + item.value = item.name + }) + }) } function updateListSave() { @@ -162,6 +168,14 @@ function handleRender(){ temp = item.content } }) + const data = { + id:id.value, + template: temp + } + RenderTemplate(data).then(res=>{ + + }) + } const tempName = ref('') const tempId = ref('') diff --git a/src/views/operation/invoiceApply/index.vue b/src/views/operation/invoiceApply/index.vue index fa1d97d8..9b83a987 100644 --- a/src/views/operation/invoiceApply/index.vue +++ b/src/views/operation/invoiceApply/index.vue @@ -82,7 +82,7 @@