Merge remote-tracking branch 'origin/feature/GFRS-1198【待确定】自助入司改造(涉及销管)' into release/0811

# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/router/ebiz/agentEenter.js
#	src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/Paction.vue
#	src/views/ebiz/agentEenter/SignContract.vue
This commit is contained in:
阳华祥
2020-08-11 13:41:33 +08:00
24 changed files with 742 additions and 152 deletions

View File

@@ -17,15 +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' && agentInfo.audit == '04'"
@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>
@@ -48,15 +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' && agentInfo.audit == '04'"
@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>