Browse Source

feat: 政治面貌

LAPTOP-2ACP37JG\shark 4 years ago
parent
commit
077e8a2629
2 changed files with 72 additions and 26 deletions
  1. 69 23
      src/views/member/person/data.ts
  2. 3 3
      src/views/money/bill/popup.vue

+ 69 - 23
src/views/member/person/data.ts

@@ -47,11 +47,25 @@ export const columns: BasicColumn[] = [
     sorter: true,
   },
   {
-    title: '党派',
+    title: '政治面貌',
     dataIndex: 'party',
     width: 150,
     customRender({ record }) {
-      const options = ['无', '民革', '民盟', '民建', '民进', '农工', '致公党', '九三学社', '台盟'];
+      const options = [
+        '群众',
+        '中共党员',
+        '中共预备党员',
+        '共青团员',
+        '民革会员',
+        '民盟盟员',
+        '民建会员',
+        '民进会员',
+        '农工党党员',
+        '致公党党员',
+        '九三学社社员',
+        '台盟盟员',
+        '无党派人士',
+      ];
       return options[record.party];
     },
     sorter: true,
@@ -169,46 +183,62 @@ export function getFormConfig(): Partial<FormProps> {
       },
       {
         field: `party`,
-        label: `党派`,
+        label: `政治面貌`,
         component: 'Select',
         componentProps: {
           options: [
             {
-              label: '',
+              label: '群众',
               value: 0,
             },
             {
-              label: '民革',
+              label: '中共党员',
               value: 1,
             },
             {
-              label: '民盟',
+              label: '中共预备党员',
               value: 2,
             },
             {
-              label: '民建',
+              label: '共青团员',
               value: 3,
             },
             {
-              label: '民',
+              label: '民革会员',
               value: 4,
             },
             {
-              label: '农工',
+              label: '民盟盟员',
               value: 5,
             },
             {
-              label: '致公党',
+              label: '民建会员',
               value: 6,
             },
             {
-              label: '九三学社',
+              label: '民进会员',
               value: 7,
             },
             {
-              label: '台盟',
+              label: '农工党党员',
               value: 8,
             },
+            {
+              label: '致公党党员',
+              value: 9,
+            },
+            {
+              label: '九三学社社员',
+              value: 10,
+            },
+            {
+              label: '台盟盟员',
+              value: 11,
+            },
+            {
+              label: '无党派人士',
+              value: 12,
+            },
           ],
         },
         colProps: {
@@ -397,47 +427,63 @@ export const schemas: FormSchema[] = [
   },
   {
     field: 'party',
-    label: '党派',
+    label: '政治面貌',
     component: 'Select',
     componentProps: {
-      placeholder: '党派',
+      placeholder: '政治面貌',
       options: [
         {
-          label: '',
+          label: '群众',
           value: 0,
         },
         {
-          label: '民革',
+          label: '中共党员',
           value: 1,
         },
         {
-          label: '民盟',
+          label: '中共预备党员',
           value: 2,
         },
         {
-          label: '民建',
+          label: '共青团员',
           value: 3,
         },
         {
-          label: '民',
+          label: '民革会员',
           value: 4,
         },
         {
-          label: '农工',
+          label: '民盟盟员',
           value: 5,
         },
         {
-          label: '致公党',
+          label: '民建会员',
           value: 6,
         },
         {
-          label: '九三学社',
+          label: '民进会员',
           value: 7,
         },
         {
-          label: '台盟',
+          label: '农工党党员',
           value: 8,
         },
+        {
+          label: '致公党党员',
+          value: 9,
+        },
+        {
+          label: '九三学社社员',
+          value: 10,
+        },
+        {
+          label: '台盟盟员',
+          value: 11,
+        },
+        {
+          label: '无党派人士',
+          value: 12,
+        },
       ],
     },
     labelWidth: adaptWidth.labelWidth,

+ 3 - 3
src/views/money/bill/popup.vue

@@ -105,9 +105,9 @@
           if (data.year.year) {
             data.year = data.year.year;
           }
-          if (data.inAccount) {
-            data.accountInsideId = data.inAccount.id;
-            delete data.inAccount;
+          if (data.inaccount) {
+            data.accountInsideId = data.inaccount.id;
+            delete data.inaccount;
           }
           if (data.duesyear) {
             data.duesId = data.duesyear.id;