diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx index 0de6247b..85524851 100644 --- a/src/views/ContainerManagement/SellCtn/columns.tsx +++ b/src/views/ContainerManagement/SellCtn/columns.tsx @@ -29,7 +29,7 @@ export const columns: BasicColumn[] = [ }, { title: '新箱主', - dataIndex: 'BuyContainerOwner', + dataIndex: 'buyContainerOwner', sorter: true, width: 200, }, @@ -145,13 +145,13 @@ export const formSchema: FormSchema[] = [ }, { label: '购箱单位Id', - field: 'BuyContainerOwnerId', + field: 'buyContainerOwnerId', component: 'Input', defaultValue: '', show: false, }, { - field: 'BuyContainerOwner', + field: 'buyContainerOwner', label: '购箱单位', component: 'ApiSelect', required: true, @@ -173,10 +173,10 @@ export const formSchema: FormSchema[] = [ }, onChange: (e, obj) => { if (e && obj) { - formModel.BuyContainerOwnerId = obj.id + formModel.buyContainerOwnerId = obj.id } if (!e && !obj) { - formModel.BuyContainerOwnerId = '' + formModel.buyContainerOwnerId = '' } }, } diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index d17ba75b..c85adc11 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -17,7 +17,7 @@ import { getVouchingClerkList, getSaleUserList, getCustomerServiceList, - getDeptList, + getOrgList, GetFeeCurrencySelectList, GetUserList, GetAllClientList, @@ -100,12 +100,12 @@ if (res9.succeeded) { CustomerServiceList.push({ label: e.userName, value: e.id }) }) } -let DeptList = [] -const res10: API.DataResult = await getDeptList() +let OrgList = [] +const res10: API.DataResult = await getOrgList() if (res10.succeeded) { - DeptList = [] + OrgList = [] res10.data.forEach((e) => { - DeptList.push({ label: e.orgName, value: e.id }) + OrgList.push(e) }) } let OrgTree = [] @@ -180,7 +180,7 @@ export const columns: BasicColumn[] = [ width: 150, customRender: ({ text }) => { let RText = '' - DeptList.forEach((e) => { + OrgList.forEach((e) => { text.forEach((item) => { if (e.value == item) { RText = RText == '' ? e.label : `${RText},${e.label}` @@ -1179,7 +1179,7 @@ export const formSchema: FormSchema[] = [ colProps: { span: 8 }, componentProps: ({ formModel }) => { return { - options: DeptList, + options: OrgList, allowClear: true, onChange: (e, obj) => { console.log(e, obj)