Merge branch 'devRs' into dev

src/assets/js/utils/data-dictionary.js

@@ -262,6 +262,33 @@ export default {
       text: '丧偶'
     }
   ],
+  //入司婚姻状况
+  rsmarriage: [
+    {
+      id: 5,
+      text: '结婚'
+    },
+    {
+      id: 6,
+      text: '单身'
+    },
+    {
+      id: 7,
+      text: '离婚'
+    },
+    {
+      id: 8,
+      text: '丧偶'
+    },
+    {
+      id: 9,
+      text: '分居'
+    },
+    {
+      id: 10,
+      text: '其他'
+    }
+  ],
   //文化程度
   degree: [
     {
@@ -1078,6 +1105,23 @@ export default {
       text: '无党派人士'
     }
   ],
+  //入司政治面貌
+  rspoliticsStatus: [
+    { id: '01', text: '中共党员' },
+    { id: '02', text: '中共预备党员' },
+    { id: '04', text: '民革党员' },
+    { id: '05', text: '民盟盟员' },
+    { id: '06', text: '民建会员' },
+    { id: '07', text: '民进会员' },
+    { id: '08', text: '农工党党员' },
+    { id: '09', text: '致公党党员' },
+    { id: '10', text: '九三学社社员' },
+    { id: '11', text: '台盟盟员' },
+    { id: '12', text: '无党派人士' },
+    { id: '13', text: '群众' },
+    { id: '15', text: '工商' },
+    { id: '99', text: '其他党派' }
+  ],
   rsIdType: [
     {
       id: 1,
@@ -1156,15 +1200,58 @@ export default {
   ],
   //入司文化程度
   rsdegree: [
-    { id: '1', text: '初中' },
-    { id: '2', text: '中专' },
-    { id: '3', text: '中技' },
-    { id: '4', text: '高中' },
-    { id: '5', text: '大专' },
-    { id: '6', text: '本科' },
-    { id: '7', text: '硕士' },
-    { id: '8', text: '博士' },
-    { id: '9', text: '博士后' }
+    {
+      id: 2,
+      text: '硕士'
+    },
+    {
+      id: 3,
+      text: '本科'
+    },
+    {
+      id: 4,
+      text: '大专'
+    },
+    {
+      id: 5,
+      text: '高中'
+    },
+    {
+      id: 6,
+      text: '初中'
+    },
+    {
+      id: 7,
+      text: '中专'
+    },
+    {
+      id: 8,
+      text: '小学'
+    },
+    {
+      id: 12,
+      text: '其他'
+    },
+    {
+      id: 13,
+      text: '文盲'
+    },
+    {
+      id: 14,
+      text: '中技'
+    },
+    {
+      id: 12,
+      text: '其他'
+    },
+    {
+      id: 10,
+      text: '博士'
+    },
+    {
+      id: 11,
+      text: '博士后'
+    }
   ],
   rsRankAgent: [
     { id: 'TRM', text: '见习风险管理师' },