fix：机构管理app逻辑调整

Signed-off-by: tsz <2417024719@qq.com>

entbase-mobile/page_entbase_mobile/page/business_management/add_personnel.html

@@ -59,7 +59,7 @@
                         </div>
                     </div>
                 </a>
-                <a class="j-cell" id="chooseRole" href="javascript:;">
+                <a class="j-cell" style="display: none;" id="chooseRole" href="javascript:;">
                   <div class="j-cell_right">
                       <div class="j-cell_rl">角色</div>
                       <div class="j-cell_rr">
@@ -109,6 +109,9 @@
                          if (res.data) {
                            addPerson.isVirtualAccount = res.data.ent_power_virtual_account
                            addPerson.accountRule = res.data.ent_virtual_account_rule
+                           if (res.data.nicheDis_show === 1) {
+                            $('#chooseRole').show()
+                           }
                          }
                          that.validateInput();
                       },

entbase-mobile/page_entbase_mobile/page/business_management/people_management.html

@@ -91,17 +91,19 @@
                                         {{else if value.role == '部门管理员'}}
                                             <span class="b-admin">{{value.role}}</span>
                                         {{/if}}
-                                        {{if value.nicheDis == '0'}}
+                                        <span class="niche_show" style="display: none;">
+                                          {{if value.nicheDis == '0'}}
                                             <span class="a-admin">销售</span>
-                                        {{else if value.nicheDis == '1'}}
-                                            <span class="a-admin">企业资讯分配</span>
-                                        {{else if value.nicheDis == '2'}}
-                                            <span class="b-admin">部门资讯分配</span>
-                                        {{else if value.nicheDis == '3'}}
-                                            <span class="a-admin">企业资讯分配+销售</span>
-                                        {{else if value.nicheDis == '4'}}
-                                            <span class="b-admin">部门资讯分配+销售</span>
-                                        {{/if}}
+                                            {{else if value.nicheDis == '1'}}
+                                                <span class="a-admin">企业资讯分配</span>
+                                            {{else if value.nicheDis == '2'}}
+                                                <span class="b-admin">部门资讯分配</span>
+                                            {{else if value.nicheDis == '3'}}
+                                                <span class="a-admin">企业资讯分配+销售</span>
+                                            {{else if value.nicheDis == '4'}}
+                                                <span class="b-admin">部门资讯分配+销售</span>
+                                            {{/if}}
+                                        </span>
                                     </p>
                                     <p class="contact">{{value.phone}}</p>
                                 </div>
@@ -161,8 +163,6 @@
     <script>
         $(function () {
             var deptId = vTools.getParam("id");//获取上一页传来的参数部门id
-            // var deptId = 1;
-            console.log(deptId)
             sessionStorage.setItem('initId',deptId);//存储一个公司部门id，在选择部门的时候可以读取到公司全部部门
             var manage = {
                 flag:true,
@@ -195,6 +195,10 @@
                       success: function (res) {
                           if (res.error_code === 0) {
                               manage.deptId = res.data.dept_id
+                              // nicheDis_show == 1有营销功能
+                              if(res.data.nicheDis_show == '1') {
+                                $('.niche_show').show()
+                              }
                               // 企业管理员才展示批量管理按钮、新增部门、新增人员入口
                               if (res.data.admin_system) {
                                 $('#manage').show()

entbase-mobile/page_entbase_mobile/page/business_management/personnel_info.html

@@ -73,7 +73,7 @@
                                 <i class="iconfont icon-arrow"></i>
                             </div>
                         </a>
-                        <a class="panel-list role-name">
+                        <a class="panel-list role-name" style="display: none;">
                           <div class="p-label">角色</div>
                           <div class="p-value">
                               <!-- <span class="deptId" data-id="{{dept_id}}">{{dept_name}}</span> -->
@@ -125,8 +125,9 @@
                 phone:'',
                 defaultDeptId: '',
                 defaultEmail: '',
+                entInfoData: {},
                 init:function(){
-                    this.getPersonInfo();
+                    this.getEntInfo()
                     this.manageHandle();
                     this.finishHandle();
                     this.showDialog();
@@ -148,14 +149,19 @@
                       success: function (res) {
                           if (res.error_code === 0) {
                               loading.hide()
+                              that.entInfoData = res.data
+                              if(res.data.nicheDis_show == '1') {
+                                $('.role-name').show()
+                              }
                               var rules = res.data.ent_virtual_account_rule
                               var regPhone = rules ? new RegExp(rules) : '' 
                               if (isEdit == 'true' && (res.data.admin_system || res.data.admin_department)) {
-                                if (regPhone.test(that.phone)) {
+                                if (regPhone && regPhone.test(that.phone)) {
                                   $('.reset-pwd').show()
                                 }
                               }
                           }
+                          that.getPersonInfo();
                       },
                       error: function (err) {
                           weui.toast('error', {
@@ -209,35 +215,37 @@
                               $('.role-text').attr('data-id', roleInfo.roleID)
                               $('.role-text').text(roleInfo.roleName)
                             } else {
-                              let role_name = ''
-                              switch (res.data.nicheDis) {
-                                case 0:
-                                  role_name = '销售'
-                                  break;
-                                case 1:
-                                  role_name = '企业资讯分配'
-                                  break;
-                                case 2:
-                                  role_name = '部门资讯分配'
-                                  break;
-                                case 3:
-                                  role_name = '企业资讯分配+销售'
-                                  break;
-                                case 4:
-                                  role_name = '部门资讯分配+销售'
-                                  break;
-                                default:
-                                  break;
+                              if (that.entInfoData.nicheDis_show == '1') {
+                                let role_name = ''
+                                switch (res.data.nicheDis) {
+                                  case 0:
+                                    role_name = '销售'
+                                    break;
+                                  case 1:
+                                    role_name = '企业资讯分配'
+                                    break;
+                                  case 2:
+                                    role_name = '部门资讯分配'
+                                    break;
+                                  case 3:
+                                    role_name = '企业资讯分配+销售'
+                                    break;
+                                  case 4:
+                                    role_name = '部门资讯分配+销售'
+                                    break;
+                                  default:
+                                    break;
+                                }
+                                $('.role-text').attr('data-id', res.data.nicheDis)
+                                $('.role-text').text(role_name)
                               }
-                              $('.role-text').attr('data-id', res.data.nicheDis)
-                              $('.role-text').text(role_name)
                             }
                             if(res.data.mail == ''){
                                 $('.email-text').text('--');
                             }
                             $('.email-text').text(res.data.mail);//渲染邮箱
                             $('.email-input').val(res.data.mail);
-                            that.getEntInfo()
+                            // that.getEntInfo()
                         }
                     })
                 },
@@ -291,7 +299,7 @@
                                 "phone":$('.contact').text(),
                                 "mail":$('.email-input').val(),
                                 "did":$('.deptId').attr('data-id'),
-                                'nicheDis': $('.role-text').attr('data-id')
+                                'nicheDis': that.entInfoData.nicheDis_show == '1' ? $('.role-text').attr('data-id') : ''
                             },
                             success: function(res) {
                                 if(res.data.status == 1){