diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx index aecfe7a0..435cb6c2 100644 --- a/src/views/ContainerManagement/CurrentState/columns.tsx +++ b/src/views/ContainerManagement/CurrentState/columns.tsx @@ -310,12 +310,12 @@ export const searchFormSchema: FormSchema[] = [ allowClear: true, }, }, - { - field: 'ctnReleaseNo', - label: '关联合同号', - component: 'Input', - colProps: { span: 4 }, - }, + // { + // field: 'ctnReleaseNo', + // label: '关联合同号', + // component: 'Input', + // colProps: { span: 4 }, + // }, { field: 'remark', diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx index 674af413..1250a11e 100644 --- a/src/views/ContainerManagement/RentIn/columns.tsx +++ b/src/views/ContainerManagement/RentIn/columns.tsx @@ -161,17 +161,18 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { - field: 'billno', - label: '租箱业务号', + field: 'cntrnoAll', + label: '箱号', component: 'Input', - colProps: { span: 4 }, + colProps: { span: 8 }, }, { - field: 'cntrnoAll', - label: '箱号', + field: 'billno', + label: '租箱业务号', component: 'Input', colProps: { span: 4 }, }, + { field: 'oldContainerOwner', label: '原箱主', diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx index e6f25c28..2c6fde30 100644 --- a/src/views/ContainerManagement/RentOneWay/columns.tsx +++ b/src/views/ContainerManagement/RentOneWay/columns.tsx @@ -146,17 +146,18 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { - field: 'billno', - label: '租箱业务号', + field: 'cntrnoAll', + label: '箱号', component: 'Input', - colProps: { span: 4 }, + colProps: { span: 8 }, }, { - field: 'cntrnoAll', - label: '箱号', + field: 'billno', + label: '租箱业务号', component: 'Input', colProps: { span: 4 }, }, + { field: 'rentCustomerName', label: '租箱客户', diff --git a/src/views/ContainerManagement/RentOneWayIn/columns.tsx b/src/views/ContainerManagement/RentOneWayIn/columns.tsx index ab49b2c5..c3b22919 100644 --- a/src/views/ContainerManagement/RentOneWayIn/columns.tsx +++ b/src/views/ContainerManagement/RentOneWayIn/columns.tsx @@ -150,17 +150,18 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { - field: 'billno', - label: '租箱业务号', + field: 'cntrnoAll', + label: '箱号', component: 'Input', - colProps: { span: 4 }, + colProps: { span: 8 }, }, { - field: 'cntrnoAll', - label: '箱号', + field: 'billno', + label: '租箱业务号', component: 'Input', colProps: { span: 4 }, }, + { field: 'oldContainerOwner', label: '原箱主', diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx index d5089a5f..0fba853c 100644 --- a/src/views/ContainerManagement/RentOut/columns.tsx +++ b/src/views/ContainerManagement/RentOut/columns.tsx @@ -170,17 +170,18 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { - field: 'billno', - label: '租箱业务号', + field: 'cntrnoAll', + label: '箱号', component: 'Input', - colProps: { span: 4 }, + colProps: { span: 8 }, }, { - field: 'cntrnoAll', - label: '箱号', + field: 'billno', + label: '租箱业务号', component: 'Input', colProps: { span: 4 }, }, + { field: 'rentCustomerName', label: '租箱客户', diff --git a/src/views/baseinfo/CodeInvoice/columns.tsx b/src/views/baseinfo/CodeInvoice/columns.tsx index 2ec5216c..ba799ee4 100644 --- a/src/views/baseinfo/CodeInvoice/columns.tsx +++ b/src/views/baseinfo/CodeInvoice/columns.tsx @@ -133,32 +133,32 @@ export const searchFormSchema: FormSchema[] = [ field: 'code', label: '编码', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { field: 'name', label: '名称', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { field: 'taxCategory', label: '税目', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { field: 'taxRate', label: '税率', component: 'InputNumber', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { field: 'identification', label: '零税率标识', component: 'ApiSelect', - colProps: { span: 6 }, + colProps: { span: 4 }, componentProps: ({ formActionType }) => { return { api: () => { @@ -184,19 +184,19 @@ export const searchFormSchema: FormSchema[] = [ field: 'taxClassificationCode', label: '税收分类编码', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { field: 'taxClassificationName', label: '税收分类名称', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { field: 'isIncludingTax', label: '是否含税', component: 'Switch', - colProps: { span: 6 }, + colProps: { span: 4 }, componentProps: { checkedChildren: '是', checkedValue: true, @@ -208,7 +208,7 @@ export const searchFormSchema: FormSchema[] = [ field: 'hasPreferentialPolicy', label: '是否享受优惠政策', component: 'Switch', - colProps: { span: 6 }, + colProps: { span: 4 }, componentProps: { checkedChildren: '是', checkedValue: true, @@ -220,7 +220,7 @@ export const searchFormSchema: FormSchema[] = [ field: 'preferentialPolicyDescription', label: '优惠政策说明', component: 'InputTextArea', - colProps: { span: 6 }, + colProps: { span: 4 }, componentProps: { rows: 2, }, @@ -229,7 +229,7 @@ export const searchFormSchema: FormSchema[] = [ field: 'isDefault', label: '是否默认商品名', component: 'Switch', - colProps: { span: 6 }, + colProps: { span: 4 }, componentProps: { checkedChildren: '是', checkedValue: true, @@ -241,7 +241,7 @@ export const searchFormSchema: FormSchema[] = [ field: 'defaultCurrency', label: '默认币别', component: 'ApiSelect', - colProps: { span: 6 }, + colProps: { span: 4 }, componentProps: () => { return { api: GetFeeCurrencySelectList, @@ -255,13 +255,13 @@ export const searchFormSchema: FormSchema[] = [ field: 'specification', label: '规格型号', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, { field: 'unit', label: '单位', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 4 }, }, ] export const formSchema: FormSchema[] = [