Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-10-10 13:53:36
+ * @LastEditTime: 2019-10-12 09:42:44
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -31,7 +31,7 @@
           <item v-if="bp_type_flag">
             <div slot="name">{{ typeName }}</div>
             <input v-if="bpClass_flag" slot="content" :placeholder="type" v-model="baseInfo.agent_username" >
-            <input v-if="!bpClass_flag" slot="content" :placeholder="type" v-model="baseInfo.business_license_num" >
+            <!-- <input v-if="!bpClass_flag" slot="content" :placeholder="type" v-model="baseInfo.business_license_num" > -->
           </item>
         </list-item>
         <div class="userInfo martop">企业信息</div>
@@ -347,9 +347,10 @@ export default {
           vm.baseInfo.bp_type === 'OFFICE' ||
           vm.baseInfo.bp_type === 'FACTORY'
       ) {
-        vm.typeName = '营业执照'
-        vm.type = '请输入营业执照号'
-        vm.baseInfo.agent_username = ''
+        vm.bp_type_flag = false
+        // vm.typeName = '营业执照'
+        // vm.type = '请输入营业执照号'
+        // vm.baseInfo.agent_username = ''
       }
     },
     flag () {
@@ -748,12 +749,19 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.typeList = res.lists.map(item => {
+          console.log('客户类型。。。。。。', res.lists)
+          vm.typeList = res.lists.filter(item => item.bp_type !== 'OFFICE').map(item => {
             return {
               code: item.bp_type,
               code_name: item.bp_type_n,
             }
           })
+          // vm.typeList = res.lists.map(item => {
+          //   return {
+          //     code: item.bp_type,
+          //     code_name: item.bp_type_n,
+          //   }
+          // })
         }
       })
     },