From e98cab7a94f5bed40fdb0063b94652d07994a0f9 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: Mon, 19 Aug 2024 09:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/baseinfo/infoclient/columns.tsx | 149 ++++++++++------------
 1 file changed, 69 insertions(+), 80 deletions(-)

diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index b9ad86dd..74035dc0 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -212,7 +212,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '负责人',
+    title: '法人',
     dataIndex: 'chief',
     sorter: true,
     width: 150,
@@ -656,8 +656,8 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
   },
   {
-    field: 'tel1',
-    label: '法人？？？？？',
+    field: 'chief',
+    label: '法人',
     // required: true,
     component: 'Input',
     defaultValue: '',
@@ -886,50 +886,6 @@ export const formSchema: FormSchema[] = [
     label: '',
     colProps: { span: 24 },
   },
-  {
-    field: 'saleOrgIdList',
-    label: '所属分部',
-    // required: true,
-    component: 'Select',
-    colProps: { span: 12 },
-    componentProps: {
-      options: DeptList,
-      allowClear: true,
-      mode: 'multiple',
-      class: 'NoLimitHeight',
-    },
-  },
-
-  {
-    field: 'chief',
-    label: '负责人',
-    // required: true,
-    component: 'Input',
-    defaultValue: '',
-    colProps: { span: 4 },
-  },
-
-  {
-    field: 'divider-selects2',
-    component: 'Divider',
-    label: '业务属性及干系人',
-    colProps: { span: 24 },
-  },
-  // {
-  //   field: 'sourceId',
-  //   label: '业务来源',
-  //   component: 'Select',
-  //   colProps: { span: 4 },
-  //   defaultValue: '',
-  //   componentProps: {
-  //     options: ClientSourceList,
-  //     allowClear: true,
-  //     showSearch: true,
-  //     filterOption: (input: string, option: any) => {
-  //       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  //     },
-  //   },
-  // },
   {
     label: '业务来源Name',
     field: 'sourceName',
@@ -1028,15 +984,14 @@ export const formSchema: FormSchema[] = [
     },
     colProps: { span: 4 },
   },
-
-  // {
-  //   field: 'unitPrice',
-  //   label: '冷藏费率',
-  //   // required: true,
-  //   component: 'Input',
-  //   defaultValue: '',
-  //   colProps: { span: 4 },
-  // },
+  {
+    field: 'unitPrice',
+    label: '冷藏费率',
+    // required: true,
+    component: 'Input',
+    defaultValue: '',
+    colProps: { span: 4 },
+  },
   {
     field: 'commissionRate',
     label: '提成比例',
@@ -1068,24 +1023,6 @@ export const formSchema: FormSchema[] = [
       },
     },
   },
-
-  // {
-  //   field: 'wmsFeeRateType',
-  //   label: '仓储费开始日期模式',
-  //   // required: true,
-  //   component: 'Select',
-  //   colProps: { span: 4 },
-  //   labelWidth: 140,
-  //   defaultValue: '',
-  //   componentProps: {
-  //     options: wmsFeeRateTypeList,
-  //     allowClear: true,
-  //     showSearch: true,
-  //     filterOption: (input: string, option: any) => {
-  //       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  //     },
-  //   },
-  // },
   {
     label: '开票方式',
     field: 'invoicingMethod',
@@ -1165,7 +1102,25 @@ export const formSchema: FormSchema[] = [
       unCheckedChildren: '否',
     },
   },
-
+  {
+    field: 'Divider4',
+    component: 'Divider',
+    label: '',
+    colProps: { span: 24 },
+  },
+  {
+    field: 'saleOrgIdList',
+    label: '所属分部',
+    // required: true,
+    component: 'Select',
+    colProps: { span: 12 },
+    componentProps: {
+      options: DeptList,
+      allowClear: true,
+      mode: 'multiple',
+      class: 'NoLimitHeight',
+    },
+  },
   {
     label: '客户属性',
     field: 'ArrclientTag',
@@ -1210,8 +1165,9 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'note',
-    label: '备注',
+    field: 'blContent',
+    label: '提单信息',
+    // required: true,
     component: 'InputTextArea',
     defaultValue: '',
     colProps: { span: 12 },
@@ -1220,9 +1176,8 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'blContent',
-    label: '提单信息',
-    // required: true,
+    field: 'note',
+    label: '备注',
     component: 'InputTextArea',
     defaultValue: '',
     colProps: { span: 12 },
@@ -1230,6 +1185,40 @@ export const formSchema: FormSchema[] = [
       rows: 4,
     },
   },
+  // {
+  //   field: 'sourceId',
+  //   label: '业务来源',
+  //   component: 'Select',
+  //   colProps: { span: 4 },
+  //   defaultValue: '',
+  //   componentProps: {
+  //     options: ClientSourceList,
+  //     allowClear: true,
+  //     showSearch: true,
+  //     filterOption: (input: string, option: any) => {
+  //       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //     },
+  //   },
+  // },
+
+  // {
+  //   field: 'wmsFeeRateType',
+  //   label: '仓储费开始日期模式',
+  //   // required: true,
+  //   component: 'Select',
+  //   colProps: { span: 4 },
+  //   labelWidth: 140,
+  //   defaultValue: '',
+  //   componentProps: {
+  //     options: wmsFeeRateTypeList,
+  //     allowClear: true,
+  //     showSearch: true,
+  //     filterOption: (input: string, option: any) => {
+  //       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //     },
+  //   },
+  // },
+
   // {
   //   label: '客户属性',
   //   field: 'ArrclientTag',