diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index ef99bf19..5679f777 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -15,6 +15,7 @@ import {
   getCustomerServiceList,
   getDeptList,
 } from '/@/api/common'
+import { getOrgTree } from '/@/api/system/org'
 let ClientFrtList = []
 const res: API.DataResult = await getClientFrtSelectList()
 if (res.succeeded) {
@@ -93,11 +94,19 @@ let DeptList = []
 const res10: API.DataResult = await getDeptList()
 if (res10.succeeded) {
   DeptList = []
-  console.log(res10)
   res10.data.forEach((e) => {
     DeptList.push({ label: e.orgName, value: e.id })
   })
 }
+let OrgTree = []
+const res11: API.DataResult = await getOrgTree()
+if (res11.succeeded) {
+  OrgTree = []
+  res11.data.forEach((e) => {
+    OrgTree.push(e)
+  })
+}
+console.log(res11, OrgTree)
 export const columns: BasicColumn[] = [
   {
     title: '客户代码',
@@ -187,7 +196,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '组织机构代码',
+    title: '社会信用代码',
     dataIndex: 'organizationCode',
     sorter: true,
     width: 150,
@@ -204,24 +213,24 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
-  {
-    title: '传真',
-    dataIndex: 'fax',
-    sorter: true,
-    width: 150,
-  },
+  // {
+  //   title: '传真',
+  //   dataIndex: 'fax',
+  //   sorter: true,
+  //   width: 150,
+  // },
   {
     title: '负责人',
     dataIndex: 'chief',
     sorter: true,
     width: 150,
   },
-  {
-    title: 'QQ',
-    dataIndex: 'qq',
-    sorter: true,
-    width: 150,
-  },
+  // {
+  //   title: 'QQ',
+  //   dataIndex: 'qq',
+  //   sorter: true,
+  //   width: 150,
+  // },
   {
     title: '邮箱',
     dataIndex: 'email',
@@ -234,12 +243,12 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
-  {
-    title: 'MSN',
-    dataIndex: 'msn',
-    sorter: true,
-    width: 150,
-  },
+  // {
+  //   title: 'MSN',
+  //   dataIndex: 'msn',
+  //   sorter: true,
+  //   width: 150,
+  // },
   {
     title: '城市',
     dataIndex: 'city',
@@ -519,16 +528,31 @@ export const formSchema: FormSchema[] = [
     // required: true,
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 18 },
+    colProps: { span: 6 },
   },
+  // {
+  //   field: 'pcorpName',
+  //   label: '所属集团',
+  //   component: 'Input',
+  //   defaultValue: '',
+  //   colProps: { span: 6 },
+  // },
   {
     field: 'pcorpName',
     label: '所属集团',
-    // required: true,
-    component: 'Input',
+    component: 'TreeSelect',
     defaultValue: '',
     colProps: { span: 6 },
+    componentProps: {
+      treeData: OrgTree,
+      allowClear: true,
+      showSearch: true,
+      filterOption: (input: string, option: any) => {
+        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
+    },
   },
+
   {
     field: 'name',
     label: '客户英文简称',
@@ -551,7 +575,7 @@ export const formSchema: FormSchema[] = [
     // required: true,
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
   },
   {
     field: 'saleOrgId',
@@ -569,17 +593,18 @@ export const formSchema: FormSchema[] = [
       },
     },
   },
-  {
-    field: 'address',
-    label: '通讯地址',
-    // required: true,
-    component: 'InputTextArea',
-    defaultValue: '',
-    colProps: { span: 24 },
-    componentProps: {
-      rows: 3,
-    },
-  },
+
+  // {
+  //   field: 'address',
+  //   label: '通讯地址',
+  //   // required: true,
+  //   component: 'InputTextArea',
+  //   defaultValue: '',
+  //   colProps: { span: 24 },
+  //   componentProps: {
+  //     rows: 3,
+  //   },
+  // },
   {
     field: 'registrationNo',
     label: '企业备案号',
@@ -589,21 +614,22 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
   {
-    field: 'inspectionNo',
-    label: '商检备案号',
+    field: 'address',
+    label: '通讯地址',
     // required: true,
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 6 },
+    colProps: { span: 12 },
   },
   {
-    field: 'organizationCode',
-    label: '组织机构代码',
+    field: 'inspectionNo',
+    label: '商检备案号',
     // required: true,
     component: 'Input',
     defaultValue: '',
     colProps: { span: 6 },
   },
+
   // {
   //   field: 'rcvMode',
   //   label: '收单据模式',
@@ -621,14 +647,14 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     colProps: { span: 12 },
   },
-  {
-    field: 'fax',
-    label: '传真',
-    // required: true,
-    component: 'Input',
-    defaultValue: '',
-    colProps: { span: 12 },
-  },
+  // {
+  //   field: 'fax',
+  //   label: '传真',
+  //   // required: true,
+  //   component: 'Input',
+  //   defaultValue: '',
+  //   colProps: { span: 12 },
+  // },
   {
     field: 'chief',
     label: '负责人',
@@ -637,14 +663,14 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     colProps: { span: 12 },
   },
-  {
-    field: 'qq',
-    label: 'QQ',
-    // required: true,
-    component: 'Input',
-    defaultValue: '',
-    colProps: { span: 12 },
-  },
+  // {
+  //   field: 'qq',
+  //   label: 'QQ',
+  //   // required: true,
+  //   component: 'Input',
+  //   defaultValue: '',
+  //   colProps: { span: 12 },
+  // },
   {
     field: 'email',
     label: '邮箱',
@@ -661,14 +687,14 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     colProps: { span: 12 },
   },
-  {
-    field: 'msn',
-    label: 'MSN',
-    // required: true,
-    component: 'Input',
-    defaultValue: '',
-    colProps: { span: 12 },
-  },
+  // {
+  //   field: 'msn',
+  //   label: 'MSN',
+  //   // required: true,
+  //   component: 'Input',
+  //   defaultValue: '',
+  //   colProps: { span: 12 },
+  // },
   {
     field: 'city',
     label: '城市',
@@ -785,8 +811,9 @@ export const formSchema: FormSchema[] = [
   {
     field: 'isStop',
     label: '是否停用',
-    component: 'RadioGroup',
-    colProps: { span: 12 },
+    component: 'RadioButtonGroup',
+    defaultValue: true,
+    colProps: { span: 6 },
     componentProps: {
       options: [
         { label: '是', value: true },
@@ -853,6 +880,14 @@ export const formSchema: FormSchema[] = [
       },
     },
   },
+  {
+    field: 'organizationCode',
+    label: '社会信用代码',
+    // required: true,
+    component: 'Input',
+    defaultValue: '',
+    colProps: { span: 6 },
+  },
   {
     field: 'wmsFeeRateType',
     label: '仓储费开始日期模式',