diff --git a/src/views/operation/CustomerReconciliation/columns.tsx b/src/views/operation/CustomerReconciliation/columns.tsx index 25ef0508..11a13c4c 100644 --- a/src/views/operation/CustomerReconciliation/columns.tsx +++ b/src/views/operation/CustomerReconciliation/columns.tsx @@ -16,61 +16,119 @@ export const searchFormSchema: FormSchema[] = [ options: billTypeData, }, }, - { field: 'customerName', label: '对账客户名称', component: 'Input', colProps: { span: 4 } }, - { field: 'isNoTax', label: '是否不含税', component: 'Switch', colProps: { span: 4 } }, + { field: 'customerName', label: '对账客户', component: 'Input', colProps: { span: 4 } }, + { field: 'rmbdr', label: '应收RMB', - component: 'Input', + component: 'InputNumber', colProps: { span: 4 }, + componentProps: () => { + return { + min: '0', + step: '0.01', + stringMode: true, + } + }, }, { field: 'balrmbdr', label: '未收RMB', - component: 'Input', + component: 'InputNumber', colProps: { span: 4 }, + componentProps: () => { + return { + min: '0', + step: '0.01', + stringMode: true, + } + }, }, { field: 'usddr', label: '应收USD', - component: 'Input', + component: 'InputNumber', colProps: { span: 4 }, + componentProps: () => { + return { + min: '0', + step: '0.01', + stringMode: true, + } + }, }, { field: 'balusddr', label: '未收USD', - component: 'Input', + component: 'InputNumber', colProps: { span: 4 }, + componentProps: () => { + return { + min: '0', + step: '0.01', + stringMode: true, + } + }, }, { field: 'rmbcr', label: '应付RBM', - component: 'Input', + component: 'InputNumber', colProps: { span: 4 }, + componentProps: () => { + return { + min: '0', + step: '0.01', + stringMode: true, + } + }, }, { field: 'balrmbcr', label: '未付RMB', - component: 'Input', + component: 'InputNumber', colProps: { span: 4 }, + componentProps: () => { + return { + min: '0', + step: '0.01', + stringMode: true, + } + }, }, { field: 'usdcr', label: '应付USD', - component: 'Input', + component: 'InputNumber', colProps: { span: 4 }, + componentProps: () => { + return { + min: '0', + step: '0.01', + stringMode: true, + } + }, }, { field: 'balusdcr', label: '未付USD', - component: 'Input', + component: 'InputNumber', colProps: { span: 4 }, + componentProps: () => { + return { + min: '0', + step: '0.01', + stringMode: true, + } + }, }, + { field: 'isNoTax', label: '是否不含税', component: 'Switch', colProps: { span: 4 } }, ] //列表 export const columns: BasicColumn[] = [ { title: '对账编号', dataIndex: 'billNo', align: 'left' }, + { title: '对账客户', dataIndex: 'customerName', align: 'left' }, { title: '对账单名称', dataIndex: 'billName', align: 'left' }, { title: '收付类型', @@ -86,7 +144,6 @@ export const columns: BasicColumn[] = [ return RData }, }, - { title: '对账客户名称', dataIndex: 'customerName', align: 'left' }, { title: '账单状态', dataIndex: 'isLocking', align: 'left' }, { title: '是否不含税', dataIndex: 'isNoTax', align: 'left' }, { title: '应收RMB', dataIndex: 'rmbdr', align: 'left' }, diff --git a/src/views/operation/CustomerReconciliation/detail/info/index.vue b/src/views/operation/CustomerReconciliation/detail/info/index.vue index 9911fa8a..eac62544 100644 --- a/src/views/operation/CustomerReconciliation/detail/info/index.vue +++ b/src/views/operation/CustomerReconciliation/detail/info/index.vue @@ -120,6 +120,7 @@ registerTableL, { getPaginationRef, setTableData, getSelectRows: getSelectRowsL, getDataSource }, ] = useTable({ + maxHeight: 180, title: '', dataSource: dataSourceL.value, rowSelection: { type: 'checkbox' }, @@ -258,6 +259,7 @@ // 右上侧表格 const [registerTableRT, { setTableData: setTableDataRT, getSelectRows: getSelectRowsR }] = useTable({ + maxHeight: 180, title: '', rowSelection: { type: 'checkbox' }, columns: columnsRT, @@ -266,7 +268,7 @@ showTableSetting: false, bordered: true, showIndexColumn: true, - canResize: false, + immediate: false, }) // // 右下侧表格