Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

app_modular/appworks/src/main/java/com/uas/appworks/adapter/CustomerBillInputAdapter.java

@@ -124,7 +124,7 @@ public class CustomerBillInputAdapter extends BillAdapter {
                 mInputViewHolder.valuesEd.setFocusable(false);
                 mInputViewHolder.valuesEd.setClickable(true);
                 mInputViewHolder.valuesEd.setOnClickListener(null);
-            } else if (BillTypeChangeUtils.isSelect(model.getType()) || model.getCaption().equals("企业名称")) {
+            } else if (BillTypeChangeUtils.isSelect(model.getType()) || isCompany(model)) {
                 //选择类型
                 mInputViewHolder.valuesEd.setHint("请选择");
                 mInputViewHolder.valuesEd.setFocusable(false);
@@ -156,7 +156,7 @@ public class CustomerBillInputAdapter extends BillAdapter {
                 if (view.getTag(com.modular.apputils.R.id.tag2) != null && view.getTag(com.modular.apputils.R.id.tag2) instanceof BillGroupModel.BillModel) {
                     int position = view.getTag(com.modular.apputils.R.id.tag) != null && view.getTag(com.modular.apputils.R.id.tag) instanceof Integer ? ((int) view.getTag(com.modular.apputils.R.id.tag)) : 0;
                     BillGroupModel.BillModel mBillModel = (BillGroupModel.BillModel) view.getTag(com.modular.apputils.R.id.tag2);
-                    if (mBillModel.getCaption().equals("企业名称")) {
+                    if (isCompany(mBillModel)) {
                         mCompanyClickListener.clickCompany(mBillModel.getGroupIndex(),mBillModel);
                     } else {
                         mOnAdapterListener.toSelect(position, mBillModel);
@@ -168,4 +168,8 @@ public class CustomerBillInputAdapter extends BillAdapter {
             super.onClick(view);
         }
     }
+
+    private boolean isCompany(BillGroupModel.BillModel mBillModel ){
+        return mBillModel.getCaption().equals("企业名称")||mBillModel.getField().equals("cu_name");
+    }
 }

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerManageActivity.java

@@ -243,9 +243,9 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
         map.put("item_name", "预录入客户");
         list.add(map);
 
-        map = new HashMap<>();
-        map.put("item_name", "客户联系人");
-        list.add(map);
+//        map = new HashMap<>();
+//        map.put("item_name", "客户联系人");
+//        list.add(map);
 
         map = new HashMap<>();
         map.put("item_name", "拜访报告");
@@ -262,7 +262,7 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
 //        models.add(new EasyBaseModel().setTitle("新建客户").setIconId(R.drawable.icon_customer_manage_add));
         models.add(new EasyBaseModel().setTitle("正式客户").setIconId(R.drawable.icon_customer_manage_formal));
         models.add(new EasyBaseModel().setTitle("预录入客户").setIconId(R.drawable.icon_customer_manage_entry));
-        models.add(new EasyBaseModel().setTitle("客户联系人").setIconId(R.drawable.icon_customer_manage_contact));
+//        models.add(new EasyBaseModel().setTitle("客户联系人").setIconId(R.drawable.icon_customer_manage_contact));
         models.add(new EasyBaseModel().setTitle("拜访报告").setIconId(R.drawable.icon_customer_manage_visit_report));
         return models;
     }