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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessAddActivity.java

@@ -78,18 +78,22 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private FormEditText et_company_man;
     @ViewInject(R.id.et_company_position)
     private FormEditText et_company_position;
-    @ViewInject(R.id.et_company_tele)
+    @ViewInject(R.id.et_company_tel)
     private FormEditText et_company_tele;
 
     @ViewInject(R.id.et_company_businesslicense)
     private FormEditText et_company_businesslicense;
     @ViewInject(R.id.et_company_planmoney)
-    private FormEditText        et_company_planmoney;
+    private FormEditText et_company_planmoney;
     @ViewInject(R.id.et_company_plantime)
-    private FormEditText  et_company_plantime;
+    private FormEditText et_company_plantime;
     @ViewInject(R.id.et_company_depart)
-    private FormEditText        et_company_depart;
-    
+    private FormEditText et_company_depart;
+    @ViewInject(R.id.et_bc_factory)
+    private FormEditText  et_bc_factory;
+    @ViewInject(R.id.et_bt_tel)
+    private FormEditText  et_bc_tel;
+
 
     private List<String> lists = new ArrayList<String>();
     private int et_business_enterCode;
@@ -110,7 +114,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         et_business_jieDuan.setOnClickListener(this);
         et_business_source.setOnClickListener(this);
         et_business_enterMan.setOnClickListener(this);
-     
+
         et_company_plantime.setOnClickListener(this);
 //        et_business_no.setOnClickListener(this);
         //   et_business.setKeyListener(null);
@@ -141,12 +145,12 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private void initView() {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("创建商机");
-        if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct,"erp_emname"))){
-            et_business_enterMan.setText(CommonUtil.getSharedPreferences(ct,"erp_emname")); 
-        }else{
+        if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_emname"))) {
+            et_business_enterMan.setText(CommonUtil.getSharedPreferences(ct, "erp_emname"));
+        } else {
             et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
         }
-       
+
     }
 
     @Override
@@ -170,8 +174,8 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
             case R.id.et_business_type:
                 onPopupButtonClick(v);
                 break;
-            case R.id. et_company_plantime:
-                showDateDialog((FormEditText) v.findViewById(R.id. et_company_plantime));
+            case R.id.et_company_plantime:
+                showDateDialog((FormEditText) v.findViewById(R.id.et_company_plantime));
                 break;
         }
     }
@@ -187,14 +191,16 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                if (et_business_name.testValidity() && 
+                if (et_business_name.testValidity() &&
                         et_business_source.testValidity() &&
                         et_business.testValidity() &&
-                        et_business_jieDuan.testValidity()&&
-                        et_company_tele.testValidity()&&
-                        et_company_businesslicense.testValidity()&&
-                        et_company_address.testValidity()&&
-                        et_company_name.testValidity()) {
+                        et_business_jieDuan.testValidity() &&
+                        et_company_tele.testValidity() &&
+                        et_company_businesslicense.testValidity() &&
+                        et_company_address.testValidity() &&
+                        et_company_name.testValidity()&&
+                        et_bc_tel.testValidity()&&
+                        et_bc_factory.testValidity()) {
                     sendHttpResquest();
                 }
                 break;
@@ -213,7 +219,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private static final int GET_BC_ID = 6;
     private JSONArray jsons;
     private JSONArray enterArray;
-    
+
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -231,7 +237,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                         public void run() {
                             finish();
                         }
-                    },3000);
+                    }, 3000);
                     break;
                 case LOAD_BUSINESS://商机库
                     progressDialog.dismiss();
@@ -272,7 +278,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                     json = msg.getData().getString("result");
                     enterArray = JSON.parseObject(json).getJSONArray("recorders");
                     if (!enterArray.isEmpty()) {
-                        for (int i = 0; i <enterArray.size(); i++) {
+                        for (int i = 0; i < enterArray.size(); i++) {
                             lists.add(enterArray.getJSONObject(i).getString("BC_DOMAN"));
                         }
                     }
@@ -340,7 +346,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
 //        String bc_recorddate = getEditText(et_business_createTime); //创建时间
         String bc_nichehouse = getEditText(et_business); //商机库
         String bc_currentprocess = getEditText(et_business_jieDuan); //当前阶段
-        String bc_recorder = CommonUtil.getSharedPreferences(mContext,"erp_emname"); //创建人
+        String bc_recorder = CommonUtil.getSharedPreferences(mContext, "erp_emname"); //创建人
         String bc_address = getEditText(et_company_address); //地址
 //        String bc_lastdate = getEditText(et_business_enterTime); //最后跟进时间
         String bc_custname = getEditText(et_company_name); //企业名称
@@ -349,25 +355,29 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         String bc_remark = getEditText(et_business_remark);//备注
         String bc_position = getEditText(et_company_position); //职位
         String bc_type = getEditText(et_business_type);  //商机类型
-        String bc_plantime=getEditText(et_company_plantime);//预计成交时间
-        String bc_planmoney=getEditText(et_company_planmoney);//预计成交时间
-        String bc_depart=getEditText(et_company_depart);//部门
-        String bc_linecse=getEditText(et_company_businesslicense);//营业执照
+        String bc_plantime = getEditText(et_company_plantime);//预计成交时间
+        String bc_planmoney = getEditText(et_company_planmoney);//预计成交时间
+        String bc_depart = getEditText(et_company_depart);//部门
+        String bc_linecse = getEditText(et_company_businesslicense);//营业执照
+        String bc_factory=getEditText(et_bc_factory);//工厂地址
+        String bc_tel=getEditText(et_bc_tel);//公司总机
         String enterCode = null;
         if (et_business_enterCode == 0) {//不可编辑  为空
             enterCode = "";
         } else {//可编辑
-            if(StringUtils.isEmpty(enterManCode)){//跟进人编号为空
-                enterCode = CommonUtil.getSharedPreferences(ct,"erp_username");//默认自己
-            }else{
+            if (StringUtils.isEmpty(enterManCode)) {//跟进人编号为空
+                enterCode = CommonUtil.getSharedPreferences(ct, "erp_username");//默认自己
+            } else {
                 enterCode = enterManCode;
             }
-           
+
         }
         LogUtil.e("commonbcid", mBcId + "");
         String formStore =
                 "{\n" +
                         "\"bc_id\":" + mBcId + "," +
+                        "\"bc_position\":\"" + bc_factory+ "\"," +//工厂地址
+                        "\"bc_desc1\":\"" + bc_tel + "\"," +//公司总机
                         "\"bc_date7\":\"" + bc_plantime + "\"," +
                         "\"bc_desc8\":\"" + bc_planmoney + "\"," +
                         "\"bc_desc4\":\"" + bc_depart + "\"," +
@@ -438,7 +448,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         intent.putExtra("key", "combos");
         intent.putExtra("showKey", "DLC_VALUE");
         intent.putExtra("action", "/mobile/crm/getBusinessChanceCombo.action");
-        intent.putExtra("title",getString(R.string.business_from));
+        intent.putExtra("title", getString(R.string.business_from));
         startActivityForResult(intent, 0x21);
     }
 
@@ -468,7 +478,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         intent.putExtra("key", "combos");
         intent.putExtra("showKey", "BD_NAME");
         intent.putExtra("action", "/mobile/crm/getNichehouse.action");
-        intent.putExtra("title",getString(R.string.business_Library));
+        intent.putExtra("title", getString(R.string.business_Library));
         startActivityForResult(intent, 0x24);
     }
 
@@ -497,7 +507,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         intent.putExtra("key", "stages");
         intent.putExtra("showKey", "BS_NAME");
         intent.putExtra("action", "/mobile/crm/getBusinessChanceStage.action");
-        intent.putExtra("title",getString(R.string.business_stage));
+        intent.putExtra("title", getString(R.string.business_stage));
         startActivityForResult(intent, 0x22);
     }
 
@@ -555,15 +565,15 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                 new SingleDialog.PickDialogListener() {
                     @Override
                     public void onListItemClick(int position, String value) {
-                        if (StringUtils.isEmpty(value))return;
-                        switch (et.getId()){
+                        if (StringUtils.isEmpty(value)) return;
+                        switch (et.getId()) {
                             case R.id.et_business_enterMan:
                                 et.setText(value);
                                 for (int i = 0; i < enterArray.size(); i++) {
-                                   if (value.equals(enterArray.getJSONObject(i).getString("BC_DOMAN"))){
-                                       //获取跟进人编号
-                                      enterManCode= enterArray.getJSONObject(i).getString("EM_CODE");
-                                   }
+                                    if (value.equals(enterArray.getJSONObject(i).getString("BC_DOMAN"))) {
+                                        //获取跟进人编号
+                                        enterManCode = enterArray.getJSONObject(i).getString("EM_CODE");
+                                    }
                                 }
                                 break;
                             case R.id.et_business_source:
@@ -575,7 +585,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                                     if (jsons.getJSONObject(i).getString("BD_NAME").equals(value)) {
                                         String bd_prop = jsons.getJSONObject(i).getString("BD_PROP");
                                         if (bd_prop.equals(getString(R.string.business_common))
-                                                ||bd_prop.equals(getString(R.string.business_get_split))) {
+                                                || bd_prop.equals(getString(R.string.business_get_split))) {
                                             //跟进人不可编辑，不可点击
                                             et_business_enterMan.setClickable(false);
                                             et_business_enterMan.setEnabled(false);
@@ -587,7 +597,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                                             et_business_enterMan.setEnabled(true);
                                             et_business_enterMan.setClickable(true);
                                             jsons.getJSONObject(i).getString("BD_PROP");
-                                           // et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
+                                            // et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
                                         }
                                     }
                                 }
@@ -596,8 +606,8 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                                 et.setText(value);
                                 break;
                         }
-                      
-                      
+
+
                     }
                 });
         singleDialog.show();
@@ -653,7 +663,6 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     }
 
 
-
     /**
      * @desc:调转界面返回参数数据
      * @author：Arison on 2016/11/14
@@ -667,15 +676,15 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                 SelectBean b = data.getParcelableExtra("data");
                 LogUtil.d(JSON.toJSONString(b));
                 if (b == null || StringUtils.isEmpty(b.getJson())) return;
-                switch (requestCode){
+                switch (requestCode) {
                     case 0x21://来源
                         et_business_source.setText(b.getName());
                         break;
                     case 0x24://商机库
                         et_business.setText(b.getName());
 
-                        String bd_prop =JSON.parseObject(b.getJson()).getString("BD_PROP");
-                        if (bd_prop.equals(getString(R.string.business_common))||bd_prop.equals(getString(R.string.business_get_split))) {
+                        String bd_prop = JSON.parseObject(b.getJson()).getString("BD_PROP");
+                        if (bd_prop.equals(getString(R.string.business_common)) || bd_prop.equals(getString(R.string.business_get_split))) {
                             //跟进人不可编辑，不可点击
                             et_business_enterMan.setClickable(false);
                             et_business_enterMan.setEnabled(false);
@@ -686,13 +695,13 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                             et_business_enterCode = 1;
                             et_business_enterMan.setEnabled(true);
                             et_business_enterMan.setClickable(true);
-                           // jsons.getJSONObject(i).getString("BD_PROP");
+                            // jsons.getJSONObject(i).getString("BD_PROP");
                             // et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
                         }
                         break;
                     case 0x23://跟进入
-                     // enterManCode
-                        enterManCode=  JSON.parseObject(b.getJson()).getString("em_code");
+                        // enterManCode
+                        enterManCode = JSON.parseObject(b.getJson()).getString("em_code");
                         et_business_enterMan.setText(b.getName());
                         break;
                     case 0x22://当前阶段

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -38,14 +38,17 @@ import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonDocDetailsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
 import com.xzjmyk.pm.activity.ui.erp.model.form.GroupData;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.PopupWindowHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.RegexUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
@@ -594,6 +597,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             }
         }
     };
+    private int currentGroupId;//当前点击的分组
 
     private void updateItemAdd() {
         if (ll_item_add != null) {
@@ -1223,43 +1227,51 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             }
                             //连带操作
                             if (data.getType().equals("DF")) {
-                                HashMap param = new HashMap<>();
-                                String[] fields = new String[]{"sa_custname"};
-                                if (caller.equals("StandbyApplication")) {
+                                if ("fpd_d5".equals(data.getField())){
+                                    //出差单 客户名称联动操作特殊处理
+                                    Intent intent = new Intent(ct, SelectAimActivity.class)
+                                            .putExtra("groupId", data.getGroupId());
+                                   currentGroupId= data.getGroupId();
+                                    startActivityForResult(intent, 0x23);
+                                }else{
+                                    HashMap param = new HashMap<>();
+                                    String[] fields = new String[]{"sa_custname"};
+                                    if (caller.equals("StandbyApplication")) {
 
+                                    }
+                                    if (caller.equals("MaterielApply")) {
+                                        fields = new String[]{"amad_spec", "amad_sysname", "amad_unit"};
+                                    }
+                                    param.put("which", "form");
+                                    param.put("caller", caller);
+                                    if (caller.equals("MainTain")) {
+                                        fields = new String[]{"mtd_proname", "mtd_remark", "mtd_unit"};
+                                        param.put("caller", "sProduct");
+                                        param.put("which", "grid");
+                                    }
+                                    param.put("page", "1");
+                                    param.put("condition", "1=1");
+                                    param.put("pageSize", "30");
+                                    param.put("field", data.getField());
+                                    Bundle bundle = new Bundle();
+                                    bundle.putSerializable("param", param);
+                                    Intent intent = new Intent(ct, SelectActivity.class);
+                                    intent.putExtra("type", 1);
+                                    intent.putExtra("reid", R.style.OAThemeMeet);
+                                    intent.putExtras(bundle);
+                                    intent.putExtra("key", "combdatas");
+                                    intent.putExtra("showKey", data.getField());
+                                    intent.putExtra("fields", fields);
+                                    intent.putExtra("action", "common/dbfind.action");
+                                    intent.putExtra("title", data.getName());
+                                    intent.putExtra("id", categoryIndex);
+                                    intent.putExtra("object", data);
+                                    startActivityForResult(intent, categoryIndex);
+                                    isLeave = true;
                                 }
-                                if (caller.equals("MaterielApply")) {
-                                    fields = new String[]{"amad_spec", "amad_sysname", "amad_unit"};
-                                }
-                                param.put("which", "form");
-                                param.put("caller", caller);
-                                if (caller.equals("MainTain")) {
-                                    fields = new String[]{"mtd_proname", "mtd_remark", "mtd_unit"};
-                                    param.put("caller", "sProduct");
-                                    param.put("which", "grid");
-                                }
-                                param.put("page", "1");
-                                param.put("condition", "1=1");
-                                param.put("pageSize", "30");
-                                param.put("field", data.getField());
-                                Bundle bundle = new Bundle();
-                                bundle.putSerializable("param", param);
-                                Intent intent = new Intent(ct, SelectActivity.class);
-                                intent.putExtra("type", 1);
-                                intent.putExtra("reid", R.style.OAThemeMeet);
-                                intent.putExtras(bundle);
-                                intent.putExtra("key", "combdatas");
-                                intent.putExtra("showKey", data.getField());
-                                intent.putExtra("fields", fields);
-                                intent.putExtra("action", "common/dbfind.action");
-                                intent.putExtra("title", data.getName());
-                                intent.putExtra("id", categoryIndex);
-                                intent.putExtra("object", data);
-                                startActivityForResult(intent, categoryIndex);
-                                isLeave = true;
+                               
                             }
-
-                            LogUtil.d("isLeave:" + isLeave);
+                            
 
                         }
                     });
@@ -1408,18 +1420,18 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (mAdapter != null) mAdapter.setIsProtectState(true);
+        if (data == null) return;
         switch (resultCode) {
-            case 0x20://单选
-                if (data == null) return;
-                SelectBean b = data.getParcelableExtra("data");
-                LogUtil.d(JSON.toJSONString(b) + "id:" + requestCode);
+            case 0x20:
+                SelectBean b=new SelectBean();
+                if (data.getParcelableExtra("data") instanceof SelectBean){
+                     b = data.getParcelableExtra("data");
+                }
                 if (requestCode == b.getId() && resultCode == 0x20) {
                     if (b == null || StringUtils.isEmpty(b.getJson())) return;
                     JsonValidator validator = new JsonValidator();
                     if (validator.validate(b.getJson())) {
                         Data vaules = JSON.parseObject(b.getObject(), Data.class);
-                        //LogUtil.d("id=" + b.getId());
-//                        LogUtil.d("groupId=" + vaules.getGroupId());
                         String value = null;
                         if ("C".equals(vaules.getType())) {
                             value = JSON.parseObject(b.getJson()).getString("VALUE");
@@ -1436,6 +1448,32 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     if (d == null) return;
                     String name = StringUtils.isEmpty(d.getName()) ? "" : d.getName();
                     getEmnameByReturn(name);
+                }else if (requestCode==0x23){
+                    SelectAimModel entity = data.getParcelableExtra("data");
+                    PopupWindowHelper.create(this, getString(R.string.perfect_company_name), entity, new PopupWindowHelper.OnClickListener() {
+                        @Override
+                        public void result(SelectAimModel model) {
+                            //出差单 写死固定参数1
+                            String cu_name = model.getName();
+                            String cu_address=model.getAddress();
+                            int sa_custname = 0;
+                            int sa_custaddress = 0;
+                            LogUtil.d("currentGroup:"+currentGroupId);
+                            List<Data> tempLists = mAdapter.getmListData().get(currentGroupId).getDatas();
+                            for (int i = 0; i < tempLists.size(); i++) {
+                                Data tempData = tempLists.get(i);
+                                if (tempData.getField().equals("fpd_d5")) {
+                                    sa_custname = i + 1;
+                                }
+                                if (tempData.getField().equals("fpd_d6")) {
+                                    sa_custaddress = i + 1;
+                                }
+                            }
+                            mAdapter.getmListData().get(currentGroupId).getDatas().get(sa_custname - 1).setValue(cu_name);
+                            mAdapter.getmListData().get(currentGroupId).getDatas().get(sa_custaddress - 1).setValue(cu_address);
+                            mAdapter.notifyDataSetChanged();
+                        }
+                    });
                 }
                 break;
             case 0x21://多选

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectAimActivity.java

@@ -77,7 +77,7 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
         adapter.setOnitemClickListener(new SelectAimAdapter.OnitemClickListener() {
             @Override
             public void click(SelectAimModel model) {
-                if (model.getType() == 1) return;
+                    if (model.getType() == 1) return;
                 Intent intent = new Intent();
                 intent.putExtra("data", model);
                 setResult(0x20, intent);

WeiChat/src/main/res/layout/activity_business_add.xml

@@ -473,6 +473,7 @@
                     android:background="@null"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
+
                 <View
                     style="@style/line_horizontal_style_one"
                     android:background="@color/item_line"></View>
@@ -485,12 +486,62 @@
                     <TextView
                         android:id="@+id/tv_date_gh"
                         style="@style/form_relative_left_text"
+                        android:text="@string/bc_factoryAdd"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                        android:id="@+id/et_bc_factory"
+                        style="@style/form_relative_right_text"
+                        editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                        editTextFormExample:testType="nocheck"
+                        android:gravity="right|center_vertical"
+                        android:background="@null"
+                        android:hint="@string/common_input" />
+                </RelativeLayout>
+
+
+                <View
+                    style="@style/line_horizontal_style_one"
+                    android:background="@color/item_line"></View>
+                <RelativeLayout
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
+                    <TextView
+                        android:id="@+id/tv_bc_position"
+                        style="@style/form_relative_left_text"
+                        android:text="@string/bc_tel"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                        android:id="@+id/et_bt_tel"
+                        style="@style/form_relative_right_text"
+                        editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                        editTextFormExample:testType="nocheck"
+                        android:gravity="right|center_vertical"
+                        android:background="@null"
+                        android:hint="@string/common_input" />
+                </RelativeLayout>
+                
+                
+                <View
+                    style="@style/line_horizontal_style_one"
+                    android:background="@color/item_line"></View>
+                <RelativeLayout
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
+                    <TextView
+                        android:id="@+id/tv_company_tel"
+                        style="@style/form_relative_left_text"
                         android:text="@string/common_tel"
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/et_company_tele"
+                        android:id="@+id/et_company_tel"
                         style="@style/form_relative_right_text"
                         editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                         editTextFormExample:testType="phone"

WeiChat/src/main/res/values/strings.xml

@@ -1651,6 +1651,9 @@
     <string name="not_message_and_add">没有找到数据，请点击右上角的+进行添加</string>
     <string name="unsubmit">反提交</string>
     <string name="Operation_succeeded">反提交成功</string>
+
+    <string name="bc_factoryAdd">工厂地址</string>
+    <string name="bc_tel">公司总机</string>
     <string name="last_visit">上次拜访</string>
     <string name="visit_num">总拜访</string>
     <string name="search_address_input_company">请搜索地址后完善单位名称</string>