From 25e5a02a7a3df1760d299f8178b0b7bafb0d4a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= <yang.huaxiang@ebiz-fooge.com>
Date: Mon, 22 Jun 2020 14:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=8F=B8=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=88=E4=B8=80=E6=9C=9F?=
 =?UTF-8?q?=EF=BC=89=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3?=
 =?UTF-8?q?=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 0e0bda10689dd07e49e06a2ca29b21751c89b8bf)
---
 src/assets/js/utils/data-dictionary.js        | 46 +++++++++----------
 .../agentEenter/AgentEenterBasicImage.vue     |  8 ++++
 .../agentEenter/AgentEenterBasicInfor.vue     |  2 +-
 src/views/ebiz/agentEenter/SignContract.vue   |  4 +-
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 5cee6c0b4..be775ea83 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -1387,6 +1387,14 @@ export default {
   ],
   //入司文化程度
   rsdegree: [
+    {
+      id: 11,
+      text: '博士后'
+    },
+    {
+      id: 10,
+      text: '博士'
+    },
     {
       id: 2,
       text: '硕士'
@@ -1403,41 +1411,29 @@ export default {
       id: 5,
       text: '高中'
     },
-    {
-      id: 6,
-      text: '初中'
-    },
     {
       id: 7,
       text: '中专'
     },
-    {
-      id: 8,
-      text: '小学'
-    },
-    {
-      id: 12,
-      text: '其他'
-    },
-    {
-      id: 13,
-      text: '文盲'
-    },
     {
       id: 14,
       text: '中技'
     },
+    {
+      id: 6,
+      text: '初中'
+    },
+    {
+      id: 8,
+      text: '小学'
+    },
+    {
+      id: 13,
+      text: '文盲'
+    },
     {
       id: 12,
       text: '其他'
-    },
-    {
-      id: 10,
-      text: '博士'
-    },
-    {
-      id: 11,
-      text: '博士后'
     }
   ],
   rsRankAgent: [
@@ -1456,7 +1452,7 @@ export default {
   ],
   relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }, { id: '3', text: '无' }],
   guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }],
-  classification: [{ id: '0', text: '司内' }, { id: '1', text: '司外' }],
+  classification: [{ id: '1', text: '司外' }],
   //入司国籍/地区
   rsnativeplace: [
     { id: 'AGO', text: '安哥拉' },
diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue b/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
index f75492e45..f432c7238 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
@@ -404,6 +404,14 @@ export default {
         return
       }
       let that = this
+      if (this.fileListBank01.length < 2) {
+        this.$toast('您需要同时上传本人身份证正面及反面图像，请上传')
+        return
+      }
+      if (this.fileListBank06.length < 2) {
+        this.$toast('您需要同时上传担保人身份证正面及反面图像，请上传')
+        return
+      }
       this.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
index fded1ceab..80b274eb6 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
@@ -558,7 +558,7 @@ export default {
             Number(this.userInfo.degree) == 8 ||
             Number(this.userInfo.degree) == 6
           ) {
-            return this.$toast('学历不符合入司条件')
+            return this.$toast('您的学历不符合入司要求，不允许入司。')
           }
           this.checkShow = true //
         } else {
diff --git a/src/views/ebiz/agentEenter/SignContract.vue b/src/views/ebiz/agentEenter/SignContract.vue
index a6ecd5c96..a5c4bee7c 100644
--- a/src/views/ebiz/agentEenter/SignContract.vue
+++ b/src/views/ebiz/agentEenter/SignContract.vue
@@ -17,7 +17,7 @@
             <div class="w240 blue">{{ sign.name }}</div>
             <div class="pt5 pb5">
               <van-icon v-if="sign.signState === '1'" color="green" name="checked" />
-              <van-button v-if="sign.signState === '1'" @click="changeSign(sign, '0')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
+              <van-button v-if="sign.signState === '1' && agentInfo.audit == '04' " @click="changeSign(sign, '0')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
                 >重新签名</van-button
               >
             </div>
@@ -40,7 +40,7 @@
           <li class="flex" v-for="(sign, index) in guaranteeSignList" :key="index">
             <div class="w240 blue">{{ sign.name }}</div>
             <van-icon v-if="sign.signState === '1'" color="green" name="checked" />
-            <van-button v-if="sign.signState === '1'" @click="changeSign(sign, '1')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
+            <van-button v-if="sign.signState === '1' && agentInfo.audit == '04' " @click="changeSign(sign, '1')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
               >重新签名</van-button
             >
           </li>