From 2f0f465c55e4742bc2f8c1fd02121b247ff433ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Tue, 12 Nov 2024 11:44:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerReconciliation/columns.tsx | 4 +- .../CustomerReconciliation/detail/index.vue | 2 +- .../detail/info/infoColumns.tsx | 99 ++++++++++--------- .../CustomerReconciliation/index.vue | 5 +- 4 files changed, 57 insertions(+), 53 deletions(-) diff --git a/src/views/operation/CustomerReconciliation/columns.tsx b/src/views/operation/CustomerReconciliation/columns.tsx index 9fa0c8de..57a48c15 100644 --- a/src/views/operation/CustomerReconciliation/columns.tsx +++ b/src/views/operation/CustomerReconciliation/columns.tsx @@ -72,7 +72,7 @@ export const searchFormSchema: FormSchema[] = [ }, { field: 'rmbcr', - label: '应付RBM', + label: '应付RMB', component: 'InputNumber', colProps: { span: 4 }, componentProps: () => { @@ -167,7 +167,7 @@ export const columns: BasicColumn[] = [ { title: '未收RMB', dataIndex: 'balrmbdr', align: 'left' }, { title: '应收USD', dataIndex: 'usddr', align: 'left' }, { title: '未收USD', dataIndex: 'balusddr', align: 'left' }, - { title: '应付RBM', dataIndex: 'rmbcr', align: 'left' }, + { title: '应付RMB', dataIndex: 'rmbcr', align: 'left' }, { title: '未付RMB', dataIndex: 'balrmbcr', align: 'left' }, { title: '应付USD', dataIndex: 'usdcr', align: 'left' }, { title: '未付USD', dataIndex: 'balusdcr', align: 'left' }, diff --git a/src/views/operation/CustomerReconciliation/detail/index.vue b/src/views/operation/CustomerReconciliation/detail/index.vue index bd6afd34..a6d3588e 100644 --- a/src/views/operation/CustomerReconciliation/detail/index.vue +++ b/src/views/operation/CustomerReconciliation/detail/index.vue @@ -383,7 +383,7 @@ dataIndex: 'rmbdr', }, // { - // title: '应付RBM', + // title: '应付RMB', // dataIndex: 'rmbcr', // }, { diff --git a/src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx b/src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx index 087a22f0..c7f4d1f1 100644 --- a/src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx +++ b/src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx @@ -15,7 +15,7 @@ import { GetAgentCnClientList, GetClientPortSelectList, } from '/@/views/operation/seaexport/api/BookingLedger.js' -import { GetClientListByCode } from '/@/api/common' +import { GetClientListByCode, GetSupplierListByCode } from '/@/api/common' import { billTypeData } from '/@/views/operation/CustomerReconciliation/detail/detailColumns' export const TFData = [ { value: true, label: '是' }, @@ -139,26 +139,26 @@ export const schemas: FormSchema[] = [ options: TFData, }, }, - { - label: '结算方式', - field: 'stlName', - component: 'ApiSelect', - required: false, - dynamicDisabled: false, - colProps: { span: 4 }, - componentProps: () => { - return { - api: GetClientStlModeSelectList, - immediate: true, - labelField: 'stlName', - valueField: 'id', - resultField: 'data', - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - } - }, - }, + // { + // label: '结算方式', + // field: 'stlName', + // component: 'ApiSelect', + // required: false, + // dynamicDisabled: false, + // colProps: { span: 4 }, + // componentProps: () => { + // return { + // api: GetClientStlModeSelectList, + // immediate: true, + // labelField: 'stlName', + // valueField: 'id', + // resultField: 'data', + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // } + // }, + // }, { label: '币别', field: 'currency', @@ -264,34 +264,35 @@ export const schemas: FormSchema[] = [ } }, }, + // { + // label: '国外代理', + // field: 'forwarderId', + // component: 'ApiSelect', + // required: false, + // dynamicDisabled: false, + // colProps: { span: 4 }, + // componentProps: ({ formModel }) => { + // return { + // api: GetSupplierListByCode, + // params: { code: 'agent' }, + // labelField: 'shortName', + // valueField: 'id', + // resultField: 'data', + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // onChange: (e, obj) => { + // if (e) { + // formModel.forwarder = obj.label + // } else { + // formModel.forwarder = '' + // } + // }, + // } + // }, + // }, { - label: '国外代理', - field: 'forwarderId', - component: 'ApiSelect', - required: false, - dynamicDisabled: false, - colProps: { span: 4 }, - componentProps: ({ formModel }) => { - return { - api: GetAgentCnClientList, - labelField: 'shortName', - valueField: 'id', - resultField: 'data', - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - onChange: (e, obj) => { - if (e) { - formModel.forwarder = obj.label - } else { - formModel.forwarder = '' - } - }, - } - }, - }, - { - label: '港口(国外)', + label: '卸货港', field: 'dischargePortId', component: 'ApiSelect', required: false, @@ -320,7 +321,7 @@ export const schemas: FormSchema[] = [ }, }, { - label: '港口(国内)', + label: '装货港', field: 'loadPortId', component: 'ApiSelect', required: false, diff --git a/src/views/operation/CustomerReconciliation/index.vue b/src/views/operation/CustomerReconciliation/index.vue index 78de5444..57912fd6 100644 --- a/src/views/operation/CustomerReconciliation/index.vue +++ b/src/views/operation/CustomerReconciliation/index.vue @@ -150,6 +150,7 @@ import { formatParams } from '/@/hooks/web/common' import { useAppStore } from '/@/store/modules/app' const appStore = useAppStore() + const tbHeight = window.innerHeight - 350 // 表格 const [registerTable, { reload, getForm, getPaginationRef, getSelectRows, getRawDataSource }] = useTable({ @@ -225,6 +226,8 @@ canResize: true, resizeHeightOffset: 90, immediate: true, + tableComponent: 'vxe', + autoHeight: tbHeight, actionColumn: { width: 80, title: '操作', @@ -375,7 +378,7 @@ width: 110, }, { - title: '应付RBM', + title: '应付RMB', dataIndex: 'rmbcr', width: 110, }, From 01bfc403ff4082197c393dab44432795d82099f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Tue, 12 Nov 2024 14:48:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerReconciliation/columns.tsx | 8 +- .../CustomerReconciliation/index.vue | 214 +++++++++--------- 2 files changed, 113 insertions(+), 109 deletions(-) diff --git a/src/views/operation/CustomerReconciliation/columns.tsx b/src/views/operation/CustomerReconciliation/columns.tsx index 57a48c15..5c9d6853 100644 --- a/src/views/operation/CustomerReconciliation/columns.tsx +++ b/src/views/operation/CustomerReconciliation/columns.tsx @@ -1,8 +1,8 @@ import { BasicColumn, FormSchema } from '/@/components/Table' export const billTypeData = [ - { code: 0, value: '全部' }, - { code: 1, value: '应收' }, - { code: 2, value: '应付' }, + { value: 0, label: '全部' }, + { value: 1, label: '应收' }, + { value: 2, label: '应付' }, ] export const searchFormSchema: FormSchema[] = [ { field: 'billNo', label: '对账编号', component: 'Input', colProps: { span: 4 } }, @@ -155,7 +155,7 @@ export const columns: BasicColumn[] = [ align: 'left', customRender: ({ text }) => { let RData = '-' - if (text) { + if (text == 'true') { RData = '是' } else { RData = '否' diff --git a/src/views/operation/CustomerReconciliation/index.vue b/src/views/operation/CustomerReconciliation/index.vue index 57912fd6..83979401 100644 --- a/src/views/operation/CustomerReconciliation/index.vue +++ b/src/views/operation/CustomerReconciliation/index.vue @@ -1,49 +1,48 @@