From 8395e5855b4c8b2cb7848b4a50812b437a67a8e9 Mon Sep 17 00:00:00 2001
From: nimengmeng_1990 <1175001086@qq.com>
Date: Fri, 13 Dec 2019 17:27:36 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=8ABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/agentEenter/AgentEenterBasicFamily.vue    |  5 ++++-
 .../ebiz/agentEenter/AgentEenterBasicInfor.vue     |  2 +-
 src/views/ebiz/agentEenter/AgentEnterGuarantor.vue |  6 ++++++
 src/views/ebiz/agentEenter/Confirmation.vue        |  2 +-
 src/views/ebiz/agentEenter/Guarantee.vue           |  4 ++--
 src/views/ebiz/agentEenter/HealthNotice.vue        |  5 +++--
 .../ebiz/agentEenter/IllegalLetterOfCommitment.vue |  2 +-
 src/views/ebiz/agentEenter/LetterCommitment.vue    |  2 +-
 src/views/ebiz/agentEenter/LetterOfKnow.vue        |  2 +-
 .../ebiz/agentEenter/MessageLetterOfCommitment.vue |  2 +-
 src/views/ebiz/agentEenter/Paction.vue             |  2 +-
 src/views/ebiz/agentEenter/SignContract.vue        | 14 +++++++-------
 12 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
index f664e9ca5..a591d2a0f 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
@@ -40,6 +40,7 @@
         type="date"
         :flag="true"
         ref="birthday"
+        :maxDate="currentTime"
         required
       ></FieldDatePicter>
         <van-field v-model="item.mobile" label="联系电话" name="联系电话" placeholder="请输入" v-validate="'required|mobile'" maxlength="11" required clearable />
@@ -64,6 +65,7 @@ import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import RsTop from '@/components/ebiz/agentEenter/RsTop'
 import idNoCheck from '@/assets/js/utils/idNoCheck'
+import beforeDate from '@/assets/js/utils/getBeforeDate.js'
 import { saveOrUpdateInfo, agentAll } from '@/api/ebiz/agentEenter/agentEenter'
 export default {
   name: 'AgentEenterBasicFamily',
@@ -112,7 +114,8 @@ export default {
       gatPass: true,
       twPass: true,
       gtFlag1: true,
-      gtFlag2: true
+      gtFlag2: true,
+      currentTime: beforeDate.getBeforeDays(1),
     }
   },
   mounted() {
diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
index 09e9071ba..93ace30f2 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
@@ -54,7 +54,7 @@
         maxlength="20"
         required
       />
-      <van-field v-model="userInfo.title" label="职称" name="职称" v-validate="'required'" placeholder="请输入" required />
+      <van-field v-model="userInfo.title" label="职称" name="职称" v-validate="'required'" placeholder="请输入" required clearable />
       <!-- <van-field
         :value="userInfo.health | idToText('rshealthCondition')"
         label="健康状况"
diff --git a/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue b/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
index 490088d2e..0914754af 100644
--- a/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
+++ b/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
@@ -137,6 +137,12 @@ export default {
         that.$toast.clear()
         if (res.content.ebizGuarantorDto.length != 0) {
           that.userInfo = res.content.ebizGuarantorDto
+          //性别返显
+          if (res.content.ebizGuarantorDto.sex == null) {
+            this.userInfo.sex = '0'
+          } else {
+            this.userInfo.sex = String(res.content.ebizGuarantorDto.sex) //性别
+          }
         }
       })
     },
diff --git a/src/views/ebiz/agentEenter/Confirmation.vue b/src/views/ebiz/agentEenter/Confirmation.vue
index d5f31eec1..7d8bb6dfd 100644
--- a/src/views/ebiz/agentEenter/Confirmation.vue
+++ b/src/views/ebiz/agentEenter/Confirmation.vue
@@ -21,7 +21,7 @@
       </van-radio-group>
       <div class="p30 pb15">
         本人签字：
-        <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <van-button type="danger" size="large" :disabled="isDisabledComplite" v-no-more-click="1000" @click="goNext">下一步</van-button>
     </div>
diff --git a/src/views/ebiz/agentEenter/Guarantee.vue b/src/views/ebiz/agentEenter/Guarantee.vue
index 549d5e3a9..4a08f9197 100644
--- a/src/views/ebiz/agentEenter/Guarantee.vue
+++ b/src/views/ebiz/agentEenter/Guarantee.vue
@@ -12,11 +12,11 @@
       </van-radio-group>
       <div class="pl30 pb15">
         担保人签字：
-        <van-button type="danger" @click="signD" :disabled="isDisableD" v-no-more-click="1000">{{ appntSign.signStateD == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="signD" :disabled="isDisableD" v-no-more-click="1000">{{ appntSign.signStateD == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
diff --git a/src/views/ebiz/agentEenter/HealthNotice.vue b/src/views/ebiz/agentEenter/HealthNotice.vue
index a48093397..a31b263cc 100644
--- a/src/views/ebiz/agentEenter/HealthNotice.vue
+++ b/src/views/ebiz/agentEenter/HealthNotice.vue
@@ -12,7 +12,7 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
@@ -175,7 +175,8 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/agentEenter/letterOfCommitment`
+              url: location.origin + `/#/agentEenter/letterOfCommitment`,
+              forbidSwipeBack: '1'
             },
             routerInfo: {
               path: `/agentEenter/letterOfCommitment`
diff --git a/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue b/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue
index 58ef63381..ffe40e028 100644
--- a/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue
+++ b/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue
@@ -12,7 +12,7 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
diff --git a/src/views/ebiz/agentEenter/LetterCommitment.vue b/src/views/ebiz/agentEenter/LetterCommitment.vue
index a6756520f..6d691cb79 100644
--- a/src/views/ebiz/agentEenter/LetterCommitment.vue
+++ b/src/views/ebiz/agentEenter/LetterCommitment.vue
@@ -12,7 +12,7 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" v-no-more-click="1000" @click="goNext" size="large">下一步</van-button>
     </div>
diff --git a/src/views/ebiz/agentEenter/LetterOfKnow.vue b/src/views/ebiz/agentEenter/LetterOfKnow.vue
index 1f567be3d..1426edbd5 100644
--- a/src/views/ebiz/agentEenter/LetterOfKnow.vue
+++ b/src/views/ebiz/agentEenter/LetterOfKnow.vue
@@ -12,7 +12,7 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
diff --git a/src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue b/src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue
index 98c276646..b2d11f8de 100644
--- a/src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue
+++ b/src/views/ebiz/agentEenter/MessageLetterOfCommitment.vue
@@ -12,7 +12,7 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <van-button type="danger" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000" size="large">下一步</van-button>
     </div>
diff --git a/src/views/ebiz/agentEenter/Paction.vue b/src/views/ebiz/agentEenter/Paction.vue
index 231d0d47d..44d2ad48c 100644
--- a/src/views/ebiz/agentEenter/Paction.vue
+++ b/src/views/ebiz/agentEenter/Paction.vue
@@ -12,7 +12,7 @@
       </van-radio-group>
       <div class="pl30 pb15">
         本人签字：
-        <van-button type="danger" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
+        <van-button type="danger" size="small" @click="sign" :disabled="isDisable" v-no-more-click="1000">{{ appntSign.signState == '0' ? '签名' : '已签名' }}</van-button>
       </div>
       <van-button type="danger" size="large" :disabled="isDisabledComplite" v-no-more-click="1000" @click="finish">完成</van-button>
     </div>
diff --git a/src/views/ebiz/agentEenter/SignContract.vue b/src/views/ebiz/agentEenter/SignContract.vue
index 13edbcd94..349cfc39b 100644
--- a/src/views/ebiz/agentEenter/SignContract.vue
+++ b/src/views/ebiz/agentEenter/SignContract.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="signContract-container bg-white">
-    <van-field readonly label="销售人员姓名" v-model="agentInfo.name" />
-    <van-field readonly label="证件号码" v-model="agentInfo.idNo" />
-    <van-field readonly label="入司申请时间" v-model="agentInfo.createdDate" />
-    <van-field readonly label="所属分公司" v-model="referrerInfo.manageName" />
-    <van-field readonly label="所属团队" v-model="referrerInfo.orgLabel" />
+    <van-field readonly label-width="120px" label="销售人员姓名" v-model="agentInfo.name" />
+    <van-field readonly label-width="120px" label="证件号码" v-model="agentInfo.idNo" />
+    <van-field readonly label-width="120px" label="入司申请时间" v-model="agentInfo.createdDate" />
+    <van-field readonly label-width="120px" label="所属分公司" v-model="referrerInfo.manageName" />
+    <van-field readonly label-width="120px" label="所属团队" v-model="referrerInfo.orgLabel" />
     <p class="p15 line-height">
       恭喜您的入司资料已经通过公司审核，<br />
       以下内容需要您按照顺序阅读并签字确认：
@@ -13,13 +13,13 @@
       需签署：
       <ul>
         <li class="flex" v-for="(sign, index) in signList" :key="index">
-          <div style="width:260px;">{{ sign.name }}</div>
+          <div class="w260 blue" >{{ sign.name }}</div>
           <van-icon v-if="sign.signState === '1'" color="green" name="checked" />
         </li>
       </ul>
       点击【开始】按钮，进行相关操作
     </div>
-    <div class="text-center mt20"><van-button @click="faceAuth" v-no-more-click="1000" :disabled="isSubmit" type="danger" style="width:40%">开始</van-button></div>
+    <div class="text-center mt20"><van-button @click="faceAuth" v-no-more-click="1000" :disabled="isSubmit" type="danger" size="normal" style="width:30%">开始</van-button></div>
     <van-button v-if="isSubmit" class="fixed bottom0" type="danger" v-no-more-click="1000" @click="clickSubmit" size="large">提交</van-button>
   </div>
 </template>