提交分类： 测试版本；

提交内容：  通用表单DF处理
当前版本：  正式版本6.3.4
是否冲突：  否

app_core/common/src/main/java/com/core/widget/view/Activity/SelectActivity.java

@@ -134,7 +134,7 @@ public class SelectActivity extends BaseActivity {
                                 }
                             }
 
-                        } 
+                        }
                     }
 
                 } else {
@@ -144,7 +144,7 @@ public class SelectActivity extends BaseActivity {
                     }else{
                         dispalayMuliSelect(message);
                     }
-                  
+
                 }
                 setAdapter();
 
@@ -268,12 +268,12 @@ public class SelectActivity extends BaseActivity {
             if (key.equals(showKey)) {
                 fieldkey = item.getString("dbGridField");
             }
-            
+
            if (fields!=null){//联动选择
                for (int j=0;j<fields.length;j++){
                    if (key.equals(fields[j])){
                        fieldKeys.add(item.getString("dbGridField"));
-                       
+
                    }
                }
            }
@@ -296,7 +296,7 @@ public class SelectActivity extends BaseActivity {
                        }
                        values.add(item.getString(fieldKeys.get(j)));
                    }
-                   
+
                    if (StringUtil.isEmpty(item.getString(fieldkey))){
                        bean.setName(item.getString(showKey));
                    }else{
@@ -325,12 +325,12 @@ public class SelectActivity extends BaseActivity {
                 bean.setObject(JSON.toJSONString(datas.get(i)));
                 bean.setJson(JSON.toJSONString(datas.get(i)));
                 formBeaan.add(bean);
-            } 
+            }
         }
-        
+
     }
 
-    
+
     public void parseDataMuliSelect(String message){
         JSONObject object = JSON.parseObject(message);
         if (!StringUtil.isEmpty(key)) {//root
@@ -367,9 +367,9 @@ public class SelectActivity extends BaseActivity {
             }
 
         }
-        
+
     }
-    
+
     private VoiceSearchView search_edit;
 
 
@@ -475,7 +475,7 @@ public class SelectActivity extends BaseActivity {
                 if (isSingle) {
                     putDownInput();
                     SelectBean bean = formBeaan.get(i);
-                  
+
 //                    String names[]=bean.getName().split("\\(");
 //                    bean.setName(names[0]);
                     bean.setName(bean.getName());
@@ -505,7 +505,7 @@ public class SelectActivity extends BaseActivity {
 
 
     }
-    
+
     String[] fields;
 
     private void initIntent() {
@@ -562,13 +562,13 @@ public class SelectActivity extends BaseActivity {
         } else {
             return;
         }
-        
-        
+
+
         if (StringUtil.isEmpty(method))method="post";
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, method);
     }
-    
-    
+
+
     private void loadMutilDataByNet(){
         if (progressDialog != null)
             progressDialog.show();
@@ -598,7 +598,7 @@ public class SelectActivity extends BaseActivity {
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param1, handler, headers, 0x16, null, null, "post");
     }
-    
+
 
     class ListAdapter extends BaseAdapter {
         private List<SelectBean> formBeaan;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1179,7 +1179,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 startActivityForResult(intent, categoryIndex);
                                 isLeave = true;
                             }
-                            if (data.getType().equals("SF")) {
+                            if (data.getType().equals("SF")
+                                    || data.getType().equals("DF")) {
                                 LogUtil.d(TAG, "GroupId:" + data.getGroupId());
                                 startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                                                 .putExtra("fieldKey", data.getField())
@@ -1246,7 +1247,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 isLeave = true;
                             }
                             //连带操作
-                            if (data.getType().equals("DF")) {
+                            /*if (data.getType().equals("DF")) {
                                 if ("fpd_d5".equals(data.getField())) {
                                     //出差单 客户名称联动操作特殊处理
                                     Intent intent = new Intent("com.modular.form.SelectAimActivity")
@@ -1291,7 +1292,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 }
 
                             }
-
+*/
 
                         }
                     });