diff --git a/src/views/finance/paymentSettlement/api.ts b/src/views/finance/paymentSettlement/api.ts index 1296c0f0..0fd28a1e 100644 --- a/src/views/finance/paymentSettlement/api.ts +++ b/src/views/finance/paymentSettlement/api.ts @@ -8,9 +8,9 @@ import { request } from '/@/utils/request' import { DataResult, PageRequest } from '/@/api/model/baseModel' enum Api { list = '/feeApi/PaymentSettlement/GetList', - edit = '/mainApi/MappingYard/EditMappingYard', + Save = '/feeApi/PaymentSettlement/Save', info = '/feeApi/PaymentSettlement/Get', - delete = '/mainApi/MappingYard/BatchDelMappingYard', + delete = '/feeApi/PaymentSettlement/Delete', GetApplicationList = '/feeApi/PaymentSettlement/GetApplicationList', GetApplicationDetailsById = '/feeApi/PaymentSettlement/GetApplicationDetailsById' } @@ -23,9 +23,9 @@ export function GetList(data: PageRequest) { }) } // 编辑 (Auth) -export function EditMappingYard(data: PageRequest) { +export function Save(data: PageRequest) { return request({ - url: Api.edit, + url: Api.Save, method: 'post', data }) @@ -40,7 +40,7 @@ export function Get(params) { } // 删除 (Auth) -export function BatchDelMappingYard(data: PageRequest) { +export function Delete(data: PageRequest) { return request({ url: Api.delete, method: 'post', diff --git a/src/views/finance/paymentSettlement/detail/columns.tsx b/src/views/finance/paymentSettlement/detail/columns.tsx index b6c52c41..16806d38 100644 --- a/src/views/finance/paymentSettlement/detail/columns.tsx +++ b/src/views/finance/paymentSettlement/detail/columns.tsx @@ -134,16 +134,132 @@ export const businessColumns: BasicColumn[] = [ // 费用表格 export const feeColumns: BasicColumn[] = [ - + { + dataIndex: 'customerNo', + title: '委托编号', + sorter: true, + width: 110, + }, + { + dataIndex: 'mblno', + title: '主提单号', + sorter: true, + width: 110, + }, + { + title: '委托单位', + dataIndex: 'customerName', + sorter: true, + width: 120, + }, + { + dataIndex: 'etd', + sorter: true, + title: '开船日期', + width: 100, + }, + { + title: '业务来源', + dataIndex: 'sourceCode', + sorter: true, + width: 100, + }, + { + title: '费用名称', + dataIndex: 'feeName', + sorter: true, + width: 100, + }, + { + title: '收付', + dataIndex: 'feeType', + width: 80, + customRender: ({ text }) => { + if (text === 1) { + return '应收' + } else if (text === 2) { + return '应付' + } + return text + } + }, + { + title: '结算金额', + dataIndex: 'settlementAmount', + width: 100, + sorter: true + }, + { + title: '原始币别', + dataIndex: 'originalCurrency', + width: 100, + sorter: true + }, + { + title: '原始汇率', + dataIndex: 'originalRate', + width: 100, + sorter: true + }, + { + title: '原始金额', + dataIndex: 'originalAmount', + width: 100, + sorter: true + }, + { + title: '发票号', + dataIndex: 'invoiceNO', + width: 100, + sorter: true + }, + { + title: '揽货人', + dataIndex: 'saleName', + width: 100, + sorter: true + }, + { + title: '会计期间', + dataIndex: 'accountDate', + width: 100, + sorter: true + }, + { + title: '船名', + dataIndex: 'vessel', + width: 100, + sorter: true + }, + { + title: '航次', + dataIndex: 'voyage', + width: 100, + sorter: true + }, ] export const formSchema: FormSchema[] = [ { field: 'id', - label: 'id', + label: '', component: 'Input', show: false }, + { + field: 'billType', + label: '', + component: 'Input', + show: false, + defaultValue: 2 + }, + { + field: 'mode', + label: '', + component: 'Input', + show: false, + defaultValue: 1 + }, { field: 'customerName', label: '结算单位', @@ -439,51 +555,46 @@ export const searchFormSchema: FormSchema[] = [ } }, { - label: '编号查询', + label: '编号检索', field: 'mblno:hblno:debitNo:hblno:bookingNO:customerNo', component: 'Input', dynamicDisabled: false, colProps: { span: 4 } }, { - label: '编号查询', - field: 'mblno:hblno:debitNo', - component: 'Input', - dynamicDisabled: false, - colProps: { span: 4 } - }, - { - field: 'accountDate', - label: '会计期间', - component: 'DatePicker', + field: 'createTime', + label: '申请日期', + component: 'RangePicker', colProps: { span: 4 }, componentProps: { allowClear: true, - valueFormat: 'YYYY-MM' + valueFormat: 'YYYY-MM-DD' } }, { - field: 'isInvoice', - label: '是否开票', - component: 'Select', - colProps: { span: 4 }, - componentProps: { - options: [ - { label: '是', value: true }, - { label: '否', value: false } - ] - } + field: 'loadPort:dischargePort', + label: '装货港/卸货港', + component: 'Input', + colProps: { span: 4 } }, { - field: 'isAdvancedPay', - label: '是否垫付', - component: 'Select', + field: 'currency', + label: '结算币别:', + defaultValue: null, + component: 'ApiSelect', colProps: { span: 4 }, - componentProps: { - options: [ - { label: '是', value: true }, - { label: '否', value: false } - ] + placeholder: '原币结算', + componentProps: () => { + return { + allowClear: true, + showSearch: true, + option: optionsStore.getOptionsByCode('GetFeeCurrencySelectList'), + labelField: 'codeName', + valueField: 'codeName', + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + } + } } }, { @@ -501,6 +612,13 @@ export const searchFormSchema: FormSchema[] = [ immediate: false } } + }, + { + label: '仅未结申请', + field: 'unsettledOnly', + component: 'Switch', + required: false, + colProps: { span: 4 } } ] diff --git a/src/views/finance/paymentSettlement/detail/components/applyInfo.vue b/src/views/finance/paymentSettlement/detail/components/applyInfo.vue index 11cf6380..ea1a1a3d 100644 --- a/src/views/finance/paymentSettlement/detail/components/applyInfo.vue +++ b/src/views/finance/paymentSettlement/detail/components/applyInfo.vue @@ -41,8 +41,6 @@ />
@@ -71,10 +69,11 @@ import { columns } from './applyInfoColumns' // 引入附近上传组件 import DsFile from "/@/components/File/index.vue" - import { BatchDelMappingYard } from '../../api' + import { Divider } from 'ant-design-vue' + // import { BatchDelMappingYard } from '../../api' import { exportExcelByData } from '/@/hooks/web/common' import { useMessage } from '/@/hooks/web/useMessage' - import feeTable from '/@/components/CostEntry/components/feeTable.vue' + import feeTable from './feeTable.vue' const { createMessage } = useMessage() import { useRoute } from 'vue-router' const route = useRoute() @@ -129,12 +128,12 @@ ids } deleteFlag.value = false - BatchDelMappingYard(postData).then(res => { - if (res.succeeded) { - createMessage.success('删除成功!') - emit('del') - } - }) + // BatchDelMappingYard(postData).then(res => { + // if (res.succeeded) { + // createMessage.success('删除成功!') + // emit('del') + // } + // }) } // 导出 const exportExcel = () => { @@ -177,6 +176,11 @@ h4 { margin-bottom: 0; } + .ant-divider-vertical { + margin: 48px 20px 0; + height: auto; + background: #E8EBED; + } .flex { align-items: center; } diff --git a/src/views/finance/paymentSettlement/detail/components/businessTable.vue b/src/views/finance/paymentSettlement/detail/components/businessTable.vue index 155e9ea7..ae3c08af 100644 --- a/src/views/finance/paymentSettlement/detail/components/businessTable.vue +++ b/src/views/finance/paymentSettlement/detail/components/businessTable.vue @@ -11,7 +11,7 @@ :canRowSelect="true" :scroll="{ x: '100%', y: 400 }" :row-selection="{ selectedRowKeys: state.historyRowKeys, onChange: historyChange }" - rowKey="idIndex" + rowKey="id" @register="registerTable" @row-click="onRowClick" > @@ -30,6 +30,16 @@ /> +