Merge branch 'liuin' into uat

src/pages/userBindNew/np/base-info.vue

@@ -8,7 +8,7 @@
     </h-header>
     <h-content>
       <list-item :item-height="44">
-        <item v-if="(isApproved&&!isMultiRole)||!isApproved" :showArrow="true">
+        <item v-if="!isApproved" :showArrow="true">
           <div slot="name" class="required">客户类型</div>
           <input
             slot="content"
@@ -20,6 +20,10 @@
             @click="selectIdTypeOnly()"
           >
         </item>
+        <item v-if="isApproved&&!isMultiRole">
+          <div slot="name" class="required">客户类型</div>
+          <span slot="content">{{ baseInfo.bp_type_n }}</span>
+        </item>
         <item v-if="isApproved&&isMultiRole&&!hasMultiRole" :showArrow="true" @click.native="selectIdType">
           <div slot="name" class="required">客户类型</div>
           <div slot="content" class="typeBP">

src/pages/userBindNew/org/baseInfo.vue

@@ -16,7 +16,7 @@
     <h-content class="content">
       <div>
         <list-item :item-height="44">
-          <item v-if="(isApproved&&!isMultiRole)||!isApproved" :showArrow="true">
+          <item v-if="!isApproved" :showArrow="true">
             <div slot="name" class="font-color required">客户类型</div>
             <input
               slot="content"
@@ -27,6 +27,10 @@
               @click="selectIdTypeOnly()"
             >
           </item>
+          <item v-if="isApproved&&!isMultiRole">
+            <div slot="name" class="required">客户类型</div>
+            <span slot="content">{{ baseInfo.bp_type_n }}</span>
+          </item>
           <item v-if="(isMultiRole&&!hasMultiRole)" :showArrow="true" @click.native="selectIdType">
             <div slot="name" class="required">客户类型</div>
             <div slot="content" class="typeBP">