Merge branch 'zth' into dev

src/views/baseinfo/infoclient/menu2/columns.tsx

@@ -345,6 +345,18 @@ export const formSchema: FormSchema[] = [
   //     }
   //   },
   // },
+
+  {
+    field: 'isDefault',
+    label: '默认联系人',
+    component: 'Switch',
+    colProps: { span: 12 },
+    defaultValue: false,
+    componentProps: {
+      checkedChildren: '是',
+      unCheckedChildren: '否',
+    },
+  },
   {
     field: 'isOperator',
     label: '是否为操作',

src/views/mapping/station/columns.tsx

@@ -55,16 +55,20 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'code',
+    field: 'linkId',
     label: '场站',
     colProps: { span: 6 },
     component: 'ApiSelect',
+
     componentProps: () => {
       return {
         api: GetYardClientList,
         labelField: 'shortName',
-        valueField: 'codeName',
+        valueField: 'id',
         resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
       }
     },
   },
@@ -79,13 +83,13 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '',
-    field: 'linkId',
+    field: 'code',
     component: 'Input',
     defaultValue: '',
     show: false,
   },
   {
-    field: 'code',
+    field: 'linkId',
     label: '场站',
     component: 'ApiSelect',
     colProps: { span: 20 },
@@ -93,11 +97,17 @@ export const formSchema: FormSchema[] = [
       return {
         api: GetYardClientList,
         labelField: 'shortName',
-        valueField: 'codeName',
+        valueField: 'id',
         resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          console.log(input, option)
+          return option.shortName.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
         onChange: (v, obj) => {
           if (obj) {
-            formModel['linkId'] = obj.id
+            console.log(obj)
+
+            formModel['code'] = obj.codeName
           }
         },
       }