From c0f6254fb35691a221ec87ca0dd280c65419b4c4 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Mon, 2 Mar 2020 12:44:47 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E5=85=A5=E5=8F=B8-=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A1=AB=E5=86=99-=E5=AD=A6=E5=8E=86?=
 =?UTF-8?q?=E9=98=BB=E6=96=AD=E5=85=A5=E5=8F=B8=EF=BC=88=E5=88=9D=E4=B8=AD?=
 =?UTF-8?q?=E3=80=81=E5=B0=8F=E5=AD=A6=E3=80=81=E6=96=87=E7=9B=B2=E3=80=81?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=20=E9=98=BB=E6=96=AD=E5=85=A5=E5=8F=B8?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js        | 30 ++++++++-----------
 .../agentEenter/AgentEenterBasicInfor.vue     |  4 +--
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 9fe7f3dfa..018b3900f 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -911,7 +911,7 @@ export default {
       shortName: '万能险',
       name: '国富人寿鑫管家终身寿险（万能型）',
       code: 'GFRS_M0017'
-    },
+    }
   ],
   // 职级
   applGrade: [
@@ -1355,49 +1355,45 @@ export default {
   //入司文化程度
   rsdegree: [
     {
-      id: 2,
+      id: 9,
       text: '硕士'
     },
     {
-      id: 3,
+      id: 8,
       text: '本科'
     },
     {
-      id: 4,
+      id: 7,
       text: '大专'
     },
     {
-      id: 5,
+      id: 4,
       text: '高中'
     },
     {
-      id: 6,
+      id: 3,
       text: '初中'
     },
     {
-      id: 7,
+      id: 5,
       text: '中专'
     },
     {
-      id: 8,
+      id: 2,
       text: '小学'
     },
     {
-      id: 12,
+      id: 0,
       text: '其他'
     },
     {
-      id: 13,
+      id: 1,
       text: '文盲'
     },
     {
-      id: 14,
+      id: 6,
       text: '中技'
     },
-    {
-      id: 12,
-      text: '其他'
-    },
     {
       id: 10,
       text: '博士'
@@ -2015,7 +2011,7 @@ export default {
   //险种类型字典
   insuranceDictionary: [
     { code: '01', value: '寿险' },
-    { code: '02', value: '重疾' }
-    // { code: '03', value: '年金' }
+    { code: '02', value: '重疾' },
+    { code: '03', value: '年金' }
   ]
 }
diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
index ddb841d4c..0520e2222 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
@@ -105,7 +105,7 @@
         label="所学专业"
         name="所学专业"
         placeholder="请输入"
-        v-validate="Number(userInfo.degree) <= 4 || Number(userInfo.degree) == 10 || Number(userInfo.degree) == 11 ? 'required' : ''"
+        v-validate="Number(userInfo.degree) >= 7 ? 'required' : ''"
         clearable
       />
       <!-- <van-field v-model="userInfo.discipline" label="所学专业" name="所学专业" placeholder="请输入" v-validate="'required'" required clearable /> -->
@@ -527,7 +527,7 @@ export default {
           if (this.userInfo.bankName == '工商银行') {
             this.userInfo.bankName = '102'
           }
-          if (Number(this.userInfo.degree) >= 6 && Number(this.userInfo.degree) <= 14 && Number(this.userInfo.degree) != 12) {
+          if (Number(this.userInfo.degree) < 4) {
             return this.$toast('学历不符合入司条件')
           }
           console.log('this.userInfo.bankName', this.userInfo.bankName)