修改查询字段

src/views/member/member/customCom/person/data.ts

@@ -13,19 +13,16 @@ export const columns: BasicColumn[] = [
       prefix: '$',
     },
     width: 100,
-    sorter: true,
   },
   {
     title: '姓名',
     dataIndex: 'name',
     width: 130,
-    sorter: true,
   },
   {
     title: '性别',
     dataIndex: 'gender',
     width: 130,
-    sorter: true,
     customRender({ record }) {
       const options = ['男', '女'];
       return options[record.gender];
@@ -35,13 +32,11 @@ export const columns: BasicColumn[] = [
     title: '籍贯',
     dataIndex: 'origin',
     width: 150,
-    sorter: true,
   },
   {
     title: '出生年月',
     dataIndex: 'birthday',
     width: 200,
-    sorter: true,
     customRender({ record }) {
       return moment(record.birthday).format('YYYY-MM-DD');
     },
@@ -50,7 +45,6 @@ export const columns: BasicColumn[] = [
     title: '党派',
     dataIndex: 'party',
     width: 150,
-    sorter: true,
     customRender({ record }) {
       const options = ['无', '民革', '民盟', '民建', '民进', '农工', '致公党', '九三学社', '台盟'];
       return options[record.party];
@@ -60,37 +54,31 @@ export const columns: BasicColumn[] = [
     title: '民族',
     dataIndex: 'nation',
     width: 160,
-    sorter: true,
   },
   {
     title: '单位',
     dataIndex: 'company',
     width: 160,
-    sorter: true,
   },
   {
     title: '人大职务',
     dataIndex: 'peopleJob',
     width: 160,
-    sorter: true,
   },
   {
     title: '政协职务',
     dataIndex: 'cppccJob',
     width: 160,
-    sorter: true,
   },
   {
     title: '社会职务',
     dataIndex: 'job',
     width: 160,
-    sorter: true,
   },
   {
     title: '联系方式',
     dataIndex: 'mobile',
     width: 160,
-    sorter: true,
   },
 ];
 
@@ -102,62 +90,112 @@ export function getFormConfig(): Partial<FormProps> {
         field: `id`,
         label: `ID`,
         component: 'Input',
+        componentProps: {
+          placeholder: 'ID',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `username`,
-        label: `用户名`,
+        field: `name`,
+        label: `姓名`,
         component: 'Input',
+        componentProps: {
+          placeholder: '姓名',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `nickname`,
-        label: `昵称`,
-        component: 'Input',
+        field: `gender`,
+        label: `性别`,
+        component: 'Select',
+        componentProps: {
+          options: [
+            {
+              label: '男',
+              value: 0,
+            },
+            {
+              label: '女',
+              value: 1,
+            },
+          ],
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `email`,
-        label: `Email`,
+        field: `origin`,
+        label: `籍贯`,
         component: 'Input',
+        componentProps: {
+          placeholder: '籍贯',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `logintime`,
-        label: `最后登录`,
-        component: 'RangePicker',
+        field: `birthday`,
+        label: `出生年月`,
+        component: 'DatePicker',
+        componentProps: {
+          placeholder: '出生年月',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `status`,
-        label: `状态`,
+        field: `party`,
+        label: `党派`,
         component: 'Select',
         componentProps: {
           options: [
             {
-              label: '启用',
-              value: 'normal',
-              key: 'status',
+              label: '无',
+              value: 0,
+            },
+            {
+              label: '民革',
+              value: 1,
+            },
+            {
+              label: '民盟',
+              value: 2,
+            },
+            {
+              label: '民建',
+              value: 3,
+            },
+            {
+              label: '民进',
+              value: 4,
+            },
+            {
+              label: '农工',
+              value: 5,
             },
             {
-              label: '停用',
-              value: 'locked',
-              key: 'status',
+              label: '致公党',
+              value: 6,
+            },
+            {
+              label: '九三学社',
+              value: 7,
+            },
+            {
+              label: '台盟',
+              value: 8,
             },
           ],
         },
@@ -167,10 +205,71 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
+        field: `nation`,
+        label: `民族`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '名族',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `company`,
+        label: `单位`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '单位',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `peopleJob`,
+        label: `人大职务`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '人大职务',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `cppccJob`,
+        label: `政协职务`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '政协职务',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `job`,
+        label: `社会职务`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '社会职务',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
         field: `sort`,
         label: `排序字段`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序字段',
           options: [
             {
               label: 'ID',
@@ -178,24 +277,49 @@ export function getFormConfig(): Partial<FormProps> {
               key: 'id',
             },
             {
-              label: '用户名',
-              value: 'username',
-              key: 'username',
+              label: '姓名',
+              value: 'name',
+              key: 'name',
+            },
+            {
+              label: '性别',
+              value: 'gender',
+              key: 'gender',
+            },
+            {
+              label: '籍贯',
+              value: 'origin',
+              key: 'origin',
+            },
+            {
+              label: '党派',
+              value: 'party',
+              key: 'party',
             },
             {
-              label: '昵称',
-              value: 'nickname',
-              key: 'nickname',
+              label: '民族',
+              value: 'nation',
+              key: 'nation',
             },
             {
-              label: 'Email',
-              value: 'email',
-              key: 'email',
+              label: '单位',
+              value: 'company',
+              key: 'company',
             },
             {
-              label: '最后登录',
-              value: 'logintime',
-              key: 'logintime',
+              label: '人大职务',
+              value: 'peopleJob',
+              key: 'peopleJob',
+            },
+            {
+              label: '政协职务',
+              value: 'cppccJob',
+              key: 'cppccJob',
+            },
+            {
+              label: '社会职务',
+              value: 'job',
+              key: 'job',
             },
           ],
         },
@@ -209,6 +333,7 @@ export function getFormConfig(): Partial<FormProps> {
         label: `排序方式`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序方式',
           options: [
             {
               label: '升序',
@@ -227,44 +352,6 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 8,
         },
       },
-      {
-        field: `filter`,
-        label: `筛选字段`,
-        component: 'CheckboxGroup',
-        componentProps: {
-          options: [
-            {
-              label: 'ID',
-              value: 'id',
-              key: 'filter1',
-            },
-            {
-              label: '用户名',
-              value: 'username',
-              key: 'filter2',
-            },
-            {
-              label: '昵称',
-              value: 'nickname',
-              key: 'filter3',
-            },
-            {
-              label: 'Email',
-              value: 'email',
-              key: 'filter4',
-            },
-            {
-              label: '昵称',
-              value: 'logintime',
-              key: 'filter5',
-            },
-          ],
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
     ],
   };
 }
@@ -447,7 +534,6 @@ export const schemas: FormSchema[] = [
     componentProps: {
       placeholder: '职称',
     },
-    required: true,
   },
   {
     field: 'job',

src/views/member/member/customCom/unit/data.ts

@@ -12,25 +12,21 @@ export const columns: BasicColumn[] = [
       prefix: '$',
     },
     width: 100,
-    sorter: true,
   },
   {
     title: '企业名称',
     dataIndex: 'name',
     width: 130,
-    sorter: true,
   },
   {
     title: '法人代表',
     dataIndex: 'legalman',
     width: 130,
-    sorter: true,
   },
   {
     title: '成立时间',
     dataIndex: 'foundingtime',
     width: 150,
-    sorter: true,
     customRender({ record }) {
       return moment(record.foundingtime).format('YYYY-MM-DD');
     },
@@ -39,13 +35,11 @@ export const columns: BasicColumn[] = [
     title: '工商登记号',
     dataIndex: 'businessNo',
     width: 350,
-    sorter: true,
   },
   {
     title: '单位性质',
     dataIndex: 'nature',
     width: 160,
-    sorter: true,
     customRender: ({ record }) => {
       const options = [
         '国有企业',
@@ -64,19 +58,16 @@ export const columns: BasicColumn[] = [
     title: '行业分类',
     dataIndex: 'job',
     width: 160,
-    sorter: true,
   },
   {
     title: '注册资金',
     dataIndex: 'regMoney',
     width: 160,
-    sorter: true,
   },
   {
     title: '职工人数',
     dataIndex: 'jobnum',
     width: 160,
-    sorter: true,
   },
 ];
 
@@ -88,62 +79,100 @@ export function getFormConfig(): Partial<FormProps> {
         field: `id`,
         label: `ID`,
         component: 'Input',
+        componentProps: {
+          placeholder: 'ID',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `username`,
-        label: `用户名`,
+        field: `name`,
+        label: `企业名称`,
         component: 'Input',
+        componentProps: {
+          placeholder: '企业名称',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `nickname`,
-        label: `昵称`,
+        field: `legalman`,
+        label: `法人代表`,
         component: 'Input',
+        componentProps: {
+          placeholder: '法人代表',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `email`,
-        label: `Email`,
-        component: 'Input',
+        field: `foundingtime`,
+        label: `成立时间`,
+        component: 'DatePicker',
+        componentProps: {
+          placeholder: '成立时间',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `logintime`,
-        label: `最后登录`,
-        component: 'RangePicker',
+        field: `businessNo`,
+        label: `工商登记号`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '工商登记号',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `status`,
-        label: `状态`,
+        field: `nature`,
+        label: `单位性质`,
         component: 'Select',
         componentProps: {
+          placeholder: '单位性质',
           options: [
             {
-              label: '启用',
-              value: 'normal',
-              key: 'status',
+              label: '国有企业',
+              value: 0,
+            },
+            {
+              label: '集体所有制',
+              value: 1,
+            },
+            {
+              label: '私营企业',
+              value: 2,
             },
             {
-              label: '停用',
-              value: 'locked',
-              key: 'status',
+              label: '股份制企业',
+              value: 3,
+            },
+            {
+              label: '有限合伙企业',
+              value: 4,
+            },
+            {
+              label: '联营企业',
+              value: 5,
+            },
+            {
+              label: '外商投资企业',
+              value: 6,
+            },
+            {
+              label: '个人独资企业',
+              value: 7,
             },
           ],
         },
@@ -153,10 +182,23 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
+        field: `job`,
+        label: `行业分类`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '行业分类',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
         field: `sort`,
         label: `排序字段`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序字段',
           options: [
             {
               label: 'ID',
@@ -164,24 +206,39 @@ export function getFormConfig(): Partial<FormProps> {
               key: 'id',
             },
             {
-              label: '用户名',
-              value: 'username',
-              key: 'username',
+              label: '企业名称',
+              value: 'name',
+              key: 'name',
+            },
+            {
+              label: '法人代表',
+              value: 'legalman',
+              key: 'legalman',
+            },
+            {
+              label: '工商登记号',
+              value: 'businessNo',
+              key: 'businessNo',
+            },
+            {
+              label: '单位性质',
+              value: 'nature',
+              key: 'nature',
             },
             {
-              label: '昵称',
-              value: 'nickname',
-              key: 'nickname',
+              label: '行业分类',
+              value: 'job',
+              key: 'job',
             },
             {
-              label: 'Email',
-              value: 'email',
-              key: 'email',
+              label: '注册资金',
+              value: 'regMoney',
+              key: 'regMoney',
             },
             {
-              label: '最后登录',
-              value: 'logintime',
-              key: 'logintime',
+              label: '职工人数',
+              value: 'jobnum',
+              key: 'jobnum',
             },
           ],
         },
@@ -195,6 +252,7 @@ export function getFormConfig(): Partial<FormProps> {
         label: `排序方式`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序方式',
           options: [
             {
               label: '升序',
@@ -213,44 +271,6 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 8,
         },
       },
-      {
-        field: `filter`,
-        label: `筛选字段`,
-        component: 'CheckboxGroup',
-        componentProps: {
-          options: [
-            {
-              label: 'ID',
-              value: 'id',
-              key: 'filter1',
-            },
-            {
-              label: '用户名',
-              value: 'username',
-              key: 'filter2',
-            },
-            {
-              label: '昵称',
-              value: 'nickname',
-              key: 'filter3',
-            },
-            {
-              label: 'Email',
-              value: 'email',
-              key: 'filter4',
-            },
-            {
-              label: '昵称',
-              value: 'logintime',
-              key: 'filter5',
-            },
-          ],
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
     ],
   };
 }

src/views/member/member/data.ts

@@ -15,13 +15,11 @@ export const columns: BasicColumn[] = [
       prefix: '$',
     },
     width: 100,
-    sorter: true,
   },
   {
     title: '会员身份',
     dataIndex: 'status',
     width: 130,
-    sorter: true,
     customRender({ record }) {
       const options = ['个人', '单位'];
       return options[record.status];
@@ -31,7 +29,6 @@ export const columns: BasicColumn[] = [
     title: '职务',
     dataIndex: 'duty',
     width: 130,
-    sorter: true,
     customRender({ record }) {
       const options = ['会长', '副会长', '秘书长', '副秘书长', '理事', '会员'];
       return options[record.duty];
@@ -41,7 +38,6 @@ export const columns: BasicColumn[] = [
     title: '入会时间',
     dataIndex: 'jointime',
     width: 150,
-    sorter: true,
     customRender({ record }) {
       return moment(record.foundingtime).format('YYYY-MM-DD');
     },
@@ -50,25 +46,21 @@ export const columns: BasicColumn[] = [
     title: '当年会费',
     dataIndex: 'current',
     width: 200,
-    sorter: true,
   },
   {
     title: '去年会费',
     dataIndex: 'party',
     width: 150,
-    sorter: true,
   },
   {
     title: '当年参会率',
     dataIndex: 'nation',
     width: 130,
-    sorter: true,
   },
   {
     title: '去年参会率',
     dataIndex: 'company',
     width: 130,
-    sorter: true,
   },
 ];
 
@@ -80,24 +72,37 @@ export function getFormConfig(): Partial<FormProps> {
         field: `id`,
         label: `ID`,
         component: 'Input',
+        componentProps: {
+          placeholder: 'ID',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `username`,
-        label: `用户名`,
-        component: 'Input',
+        field: `status`,
+        label: `会员身份`,
+        component: 'Select',
+        componentProps: {
+          placeholder: '会员身份',
+          options: [
+            { label: '个人', value: 0 },
+            { label: '单位', value: 1 },
+          ],
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `nickname`,
-        label: `昵称`,
-        component: 'Input',
+        field: `jointime`,
+        label: `入会时间`,
+        component: 'DatePicker',
+        componentProps: {
+          placeholder: '入会时间',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
@@ -105,8 +110,12 @@ export function getFormConfig(): Partial<FormProps> {
       },
       {
         field: `email`,
-        label: `Email`,
+        label: `当年费率`,
         component: 'Input',
+        componentProps: {
+          placeholder: '全年费率',
+          disabled: true,
+        },
         colProps: {
           xl: 12,
           xxl: 8,
@@ -114,30 +123,37 @@ export function getFormConfig(): Partial<FormProps> {
       },
       {
         field: `logintime`,
-        label: `最后登录`,
-        component: 'RangePicker',
+        label: `去年费率`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '去年费率',
+          disabled: true,
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `status`,
-        label: `状态`,
-        component: 'Select',
+        field: `logintime1`,
+        label: `当年参会率`,
+        component: 'Input',
         componentProps: {
-          options: [
-            {
-              label: '启用',
-              value: 'normal',
-              key: 'status',
-            },
-            {
-              label: '停用',
-              value: 'locked',
-              key: 'status',
-            },
-          ],
+          placeholder: '当年参会率',
+          disabled: true,
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `logintime2`,
+        label: `去年参会率`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '去年参会率',
+          disabled: true,
         },
         colProps: {
           xl: 12,
@@ -149,6 +165,7 @@ export function getFormConfig(): Partial<FormProps> {
         label: `排序字段`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序字段',
           options: [
             {
               label: 'ID',
@@ -156,22 +173,37 @@ export function getFormConfig(): Partial<FormProps> {
               key: 'id',
             },
             {
-              label: '用户名',
-              value: 'username',
-              key: 'username',
+              label: '会员身份',
+              value: 'status',
+              key: 'status',
             },
             {
-              label: '昵称',
-              value: 'nickname',
-              key: 'nickname',
+              label: '职务',
+              value: 'duty',
+              key: 'duty',
             },
             {
-              label: 'Email',
-              value: 'email',
-              key: 'email',
+              label: '入会时间',
+              value: 'jointime',
+              key: 'jointime',
             },
             {
-              label: '最后登录',
+              label: '当年会费',
+              value: 'logintime',
+              key: 'logintime',
+            },
+            {
+              label: '去年会费',
+              value: 'logintime',
+              key: 'logintime',
+            },
+            {
+              label: '当年参会率',
+              value: 'logintime',
+              key: 'logintime',
+            },
+            {
+              label: '去年参会率',
               value: 'logintime',
               key: 'logintime',
             },
@@ -187,6 +219,7 @@ export function getFormConfig(): Partial<FormProps> {
         label: `排序方式`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序方式',
           options: [
             {
               label: '升序',
@@ -205,44 +238,6 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 8,
         },
       },
-      {
-        field: `filter`,
-        label: `筛选字段`,
-        component: 'CheckboxGroup',
-        componentProps: {
-          options: [
-            {
-              label: 'ID',
-              value: 'id',
-              key: 'filter1',
-            },
-            {
-              label: '用户名',
-              value: 'username',
-              key: 'filter2',
-            },
-            {
-              label: '昵称',
-              value: 'nickname',
-              key: 'filter3',
-            },
-            {
-              label: 'Email',
-              value: 'email',
-              key: 'filter4',
-            },
-            {
-              label: '昵称',
-              value: 'logintime',
-              key: 'filter5',
-            },
-          ],
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
     ],
   };
 }
@@ -407,23 +402,23 @@ export const schemas: FormSchema[] = [
         },
         {
           label: '副会长',
-          value: 2,
+          value: 1,
         },
         {
           label: '秘书长',
-          value: 3,
+          value: 2,
         },
         {
           label: '副秘书长',
-          value: 4,
+          value: 3,
         },
         {
           label: '理事',
-          value: 5,
+          value: 4,
         },
         {
           label: '会员',
-          value: 6,
+          value: 5,
         },
       ],
     },

src/views/member/person/data.ts

@@ -13,19 +13,16 @@ export const columns: BasicColumn[] = [
       prefix: '$',
     },
     width: 100,
-    sorter: true,
   },
   {
     title: '姓名',
     dataIndex: 'name',
     width: 130,
-    sorter: true,
   },
   {
     title: '性别',
     dataIndex: 'gender',
     width: 130,
-    sorter: true,
     customRender({ record }) {
       const options = ['男', '女'];
       return options[record.gender];
@@ -35,13 +32,11 @@ export const columns: BasicColumn[] = [
     title: '籍贯',
     dataIndex: 'origin',
     width: 150,
-    sorter: true,
   },
   {
     title: '出生年月',
     dataIndex: 'birthday',
     width: 200,
-    sorter: true,
     customRender({ record }) {
       return moment(record.birthday).format('YYYY-MM-DD');
     },
@@ -50,7 +45,6 @@ export const columns: BasicColumn[] = [
     title: '党派',
     dataIndex: 'party',
     width: 150,
-    sorter: true,
     customRender({ record }) {
       const options = ['无', '民革', '民盟', '民建', '民进', '农工', '致公党', '九三学社', '台盟'];
       return options[record.party];
@@ -60,37 +54,31 @@ export const columns: BasicColumn[] = [
     title: '民族',
     dataIndex: 'nation',
     width: 160,
-    sorter: true,
   },
   {
     title: '单位',
     dataIndex: 'company',
     width: 160,
-    sorter: true,
   },
   {
     title: '人大职务',
     dataIndex: 'peopleJob',
     width: 160,
-    sorter: true,
   },
   {
     title: '政协职务',
     dataIndex: 'cppccJob',
     width: 160,
-    sorter: true,
   },
   {
     title: '社会职务',
     dataIndex: 'job',
     width: 160,
-    sorter: true,
   },
   {
     title: '联系方式',
     dataIndex: 'mobile',
     width: 160,
-    sorter: true,
   },
 ];
 
@@ -102,62 +90,112 @@ export function getFormConfig(): Partial<FormProps> {
         field: `id`,
         label: `ID`,
         component: 'Input',
+        componentProps: {
+          placeholder: 'ID',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `username`,
-        label: `用户名`,
+        field: `name`,
+        label: `姓名`,
         component: 'Input',
+        componentProps: {
+          placeholder: '姓名',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `nickname`,
-        label: `昵称`,
-        component: 'Input',
+        field: `gender`,
+        label: `性别`,
+        component: 'Select',
+        componentProps: {
+          options: [
+            {
+              label: '男',
+              value: 0,
+            },
+            {
+              label: '女',
+              value: 1,
+            },
+          ],
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `email`,
-        label: `Email`,
+        field: `origin`,
+        label: `籍贯`,
         component: 'Input',
+        componentProps: {
+          placeholder: '籍贯',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `logintime`,
-        label: `最后登录`,
-        component: 'RangePicker',
+        field: `birthday`,
+        label: `出生年月`,
+        component: 'DatePicker',
+        componentProps: {
+          placeholder: '出生年月',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `status`,
-        label: `状态`,
+        field: `party`,
+        label: `党派`,
         component: 'Select',
         componentProps: {
           options: [
             {
-              label: '启用',
-              value: 'normal',
-              key: 'status',
+              label: '无',
+              value: 0,
+            },
+            {
+              label: '民革',
+              value: 1,
+            },
+            {
+              label: '民盟',
+              value: 2,
+            },
+            {
+              label: '民建',
+              value: 3,
+            },
+            {
+              label: '民进',
+              value: 4,
+            },
+            {
+              label: '农工',
+              value: 5,
             },
             {
-              label: '停用',
-              value: 'locked',
-              key: 'status',
+              label: '致公党',
+              value: 6,
+            },
+            {
+              label: '九三学社',
+              value: 7,
+            },
+            {
+              label: '台盟',
+              value: 8,
             },
           ],
         },
@@ -167,10 +205,71 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
+        field: `nation`,
+        label: `民族`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '名族',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `company`,
+        label: `单位`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '单位',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `peopleJob`,
+        label: `人大职务`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '人大职务',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `cppccJob`,
+        label: `政协职务`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '政协职务',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
+        field: `job`,
+        label: `社会职务`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '社会职务',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
         field: `sort`,
         label: `排序字段`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序字段',
           options: [
             {
               label: 'ID',
@@ -178,24 +277,49 @@ export function getFormConfig(): Partial<FormProps> {
               key: 'id',
             },
             {
-              label: '用户名',
-              value: 'username',
-              key: 'username',
+              label: '姓名',
+              value: 'name',
+              key: 'name',
+            },
+            {
+              label: '性别',
+              value: 'gender',
+              key: 'gender',
+            },
+            {
+              label: '籍贯',
+              value: 'origin',
+              key: 'origin',
+            },
+            {
+              label: '党派',
+              value: 'party',
+              key: 'party',
             },
             {
-              label: '昵称',
-              value: 'nickname',
-              key: 'nickname',
+              label: '民族',
+              value: 'nation',
+              key: 'nation',
             },
             {
-              label: 'Email',
-              value: 'email',
-              key: 'email',
+              label: '单位',
+              value: 'company',
+              key: 'company',
             },
             {
-              label: '最后登录',
-              value: 'logintime',
-              key: 'logintime',
+              label: '人大职务',
+              value: 'peopleJob',
+              key: 'peopleJob',
+            },
+            {
+              label: '政协职务',
+              value: 'cppccJob',
+              key: 'cppccJob',
+            },
+            {
+              label: '社会职务',
+              value: 'job',
+              key: 'job',
             },
           ],
         },
@@ -209,6 +333,7 @@ export function getFormConfig(): Partial<FormProps> {
         label: `排序方式`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序方式',
           options: [
             {
               label: '升序',
@@ -227,44 +352,6 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 8,
         },
       },
-      {
-        field: `filter`,
-        label: `筛选字段`,
-        component: 'CheckboxGroup',
-        componentProps: {
-          options: [
-            {
-              label: 'ID',
-              value: 'id',
-              key: 'filter1',
-            },
-            {
-              label: '用户名',
-              value: 'username',
-              key: 'filter2',
-            },
-            {
-              label: '昵称',
-              value: 'nickname',
-              key: 'filter3',
-            },
-            {
-              label: 'Email',
-              value: 'email',
-              key: 'filter4',
-            },
-            {
-              label: '昵称',
-              value: 'logintime',
-              key: 'filter5',
-            },
-          ],
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
     ],
   };
 }
@@ -447,7 +534,6 @@ export const schemas: FormSchema[] = [
     componentProps: {
       placeholder: '职称',
     },
-    required: true,
   },
   {
     field: 'job',

src/views/member/unit/data.ts

@@ -12,25 +12,21 @@ export const columns: BasicColumn[] = [
       prefix: '$',
     },
     width: 100,
-    sorter: true,
   },
   {
     title: '企业名称',
     dataIndex: 'name',
     width: 130,
-    sorter: true,
   },
   {
     title: '法人代表',
     dataIndex: 'legalman',
     width: 130,
-    sorter: true,
   },
   {
     title: '成立时间',
     dataIndex: 'foundingtime',
     width: 150,
-    sorter: true,
     customRender({ record }) {
       return moment(record.foundingtime).format('YYYY-MM-DD');
     },
@@ -39,13 +35,11 @@ export const columns: BasicColumn[] = [
     title: '工商登记号',
     dataIndex: 'businessNo',
     width: 350,
-    sorter: true,
   },
   {
     title: '单位性质',
     dataIndex: 'nature',
     width: 160,
-    sorter: true,
     customRender: ({ record }) => {
       const options = [
         '国有企业',
@@ -64,19 +58,16 @@ export const columns: BasicColumn[] = [
     title: '行业分类',
     dataIndex: 'job',
     width: 160,
-    sorter: true,
   },
   {
     title: '注册资金',
     dataIndex: 'regMoney',
     width: 160,
-    sorter: true,
   },
   {
     title: '职工人数',
     dataIndex: 'jobnum',
     width: 160,
-    sorter: true,
   },
 ];
 
@@ -88,62 +79,100 @@ export function getFormConfig(): Partial<FormProps> {
         field: `id`,
         label: `ID`,
         component: 'Input',
+        componentProps: {
+          placeholder: 'ID',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `username`,
-        label: `用户名`,
+        field: `name`,
+        label: `企业名称`,
         component: 'Input',
+        componentProps: {
+          placeholder: '企业名称',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `nickname`,
-        label: `昵称`,
+        field: `legalman`,
+        label: `法人代表`,
         component: 'Input',
+        componentProps: {
+          placeholder: '法人代表',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `email`,
-        label: `Email`,
-        component: 'Input',
+        field: `foundingtime`,
+        label: `成立时间`,
+        component: 'DatePicker',
+        componentProps: {
+          placeholder: '成立时间',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `logintime`,
-        label: `最后登录`,
-        component: 'RangePicker',
+        field: `businessNo`,
+        label: `工商登记号`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '工商登记号',
+        },
         colProps: {
           xl: 12,
           xxl: 8,
         },
       },
       {
-        field: `status`,
-        label: `状态`,
+        field: `nature`,
+        label: `单位性质`,
         component: 'Select',
         componentProps: {
+          placeholder: '单位性质',
           options: [
             {
-              label: '启用',
-              value: 'normal',
-              key: 'status',
+              label: '国有企业',
+              value: 0,
+            },
+            {
+              label: '集体所有制',
+              value: 1,
+            },
+            {
+              label: '私营企业',
+              value: 2,
             },
             {
-              label: '停用',
-              value: 'locked',
-              key: 'status',
+              label: '股份制企业',
+              value: 3,
+            },
+            {
+              label: '有限合伙企业',
+              value: 4,
+            },
+            {
+              label: '联营企业',
+              value: 5,
+            },
+            {
+              label: '外商投资企业',
+              value: 6,
+            },
+            {
+              label: '个人独资企业',
+              value: 7,
             },
           ],
         },
@@ -153,10 +182,23 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
+        field: `job`,
+        label: `行业分类`,
+        component: 'Input',
+        componentProps: {
+          placeholder: '行业分类',
+        },
+        colProps: {
+          xl: 12,
+          xxl: 8,
+        },
+      },
+      {
         field: `sort`,
         label: `排序字段`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序字段',
           options: [
             {
               label: 'ID',
@@ -164,24 +206,39 @@ export function getFormConfig(): Partial<FormProps> {
               key: 'id',
             },
             {
-              label: '用户名',
-              value: 'username',
-              key: 'username',
+              label: '企业名称',
+              value: 'name',
+              key: 'name',
+            },
+            {
+              label: '法人代表',
+              value: 'legalman',
+              key: 'legalman',
+            },
+            {
+              label: '工商登记号',
+              value: 'businessNo',
+              key: 'businessNo',
+            },
+            {
+              label: '单位性质',
+              value: 'nature',
+              key: 'nature',
             },
             {
-              label: '昵称',
-              value: 'nickname',
-              key: 'nickname',
+              label: '行业分类',
+              value: 'job',
+              key: 'job',
             },
             {
-              label: 'Email',
-              value: 'email',
-              key: 'email',
+              label: '注册资金',
+              value: 'regMoney',
+              key: 'regMoney',
             },
             {
-              label: '最后登录',
-              value: 'logintime',
-              key: 'logintime',
+              label: '职工人数',
+              value: 'jobnum',
+              key: 'jobnum',
             },
           ],
         },
@@ -195,6 +252,7 @@ export function getFormConfig(): Partial<FormProps> {
         label: `排序方式`,
         component: 'Select',
         componentProps: {
+          placeholder: '排序方式',
           options: [
             {
               label: '升序',
@@ -213,44 +271,6 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 8,
         },
       },
-      {
-        field: `filter`,
-        label: `筛选字段`,
-        component: 'CheckboxGroup',
-        componentProps: {
-          options: [
-            {
-              label: 'ID',
-              value: 'id',
-              key: 'filter1',
-            },
-            {
-              label: '用户名',
-              value: 'username',
-              key: 'filter2',
-            },
-            {
-              label: '昵称',
-              value: 'nickname',
-              key: 'filter3',
-            },
-            {
-              label: 'Email',
-              value: 'email',
-              key: 'filter4',
-            },
-            {
-              label: '昵称',
-              value: 'logintime',
-              key: 'filter5',
-            },
-          ],
-        },
-        colProps: {
-          xl: 12,
-          xxl: 8,
-        },
-      },
     ],
   };
 }