1 创建商机老界面添加两个字段

2 出差单特殊化处理，客户连带地址

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

@@ -78,7 +78,7 @@ 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)

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

@@ -597,6 +597,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             }
         }
     };
+    private int currentGroupId;//当前点击的分组
 
     private void updateItemAdd() {
         if (ll_item_add != null) {
@@ -1226,9 +1227,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             }
                             //连带操作
                             if (data.getType().equals("DF")) {
-                                if ("客户名称".equals(data.getName())){
+                                if ("fpd_d5".equals(data.getField())){
                                     //出差单 客户名称联动操作特殊处理
-                                    Intent intent = new Intent(ct, SelectAimActivity.class).putExtra("type", 1);
+                                    Intent intent = new Intent(ct, SelectAimActivity.class)
+                                            .putExtra("groupId", data.getGroupId());
+                                   currentGroupId= data.getGroupId();
                                     startActivityForResult(intent, 0x23);
                                 }else{
                                     HashMap param = new HashMap<>();
@@ -1455,8 +1458,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             String cu_address=model.getAddress();
                             int sa_custname = 0;
                             int sa_custaddress = 0;
-                          int groupId=  mAdapter.getmListData().size()-1;
-                            List<Data> tempLists = mAdapter.getmListData().get(groupId).getDatas();
+                            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")) {
@@ -1466,8 +1469,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     sa_custaddress = i + 1;
                                 }
                             }
-                            mAdapter.getmListData().get(groupId).getDatas().get(sa_custname - 1).setValue(cu_name);
-                            mAdapter.getmListData().get(groupId).getDatas().get(sa_custaddress - 1).setValue(cu_address);
+                            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();
                         }
                     });