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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java

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

@@ -550,8 +550,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
                 break;
             case R.id.btn_update:
-                commitAfter();
-                // updata();
+                //commitAfter();
+                updata();
                 break;
         }
     }
@@ -755,9 +755,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             final int itemViewType = getItemViewType(position);
             switch (itemViewType) {
                 case TYPE_CATEGORY_ITEM:
-                    if (null == convertView) {
+                   // if (null == convertView) {
                         convertView = inflater.inflate(R.layout.listview_item_header, null);
-                    }
+                  //  }
                     TextView textView = (TextView) convertView.findViewById(R.id.tv_title);
                     TextView item_add = (TextView) convertView.findViewById(R.id.iv_item_add);
                     RelativeLayout header = (RelativeLayout) convertView.findViewById(R.id.rl_item_header);
@@ -765,12 +765,16 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     // final  int id= getGroupPosition(position);
                     textView.setText(itemValue.getGroup());
                     if (StringUtils.isEmpty(itemValue.getGroup())) {
-                        header.setVisibility(View.GONE);
+                            header.setVisibility(View.GONE);
                     } else {
-                        if (itemValue.getGroup().contains("明细") && !itemValue.getGroup().equals("明细项1")) {
-                            item_add.setVisibility(View.VISIBLE);
-                        } else {
-                            item_add.setVisibility(View.GONE);
+                        try {
+                            if (itemValue.getGroup().contains("明细") && !itemValue.getGroup().equals("明细项1")) {
+                                item_add.setVisibility(View.VISIBLE);
+                            } else {
+                                item_add.setVisibility(View.GONE);
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
 
                     }
@@ -917,6 +921,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                         ViewUtil.cancelToast();
                                     }
 
+                                }else{
+                                    ToastMessage(data.getName() + "只能输入数值！");
                                 }
 
                             } else {

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

@@ -13,7 +13,7 @@
         android:background="@drawable/top_background"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:visibility="gone">
+        >
 
         <RelativeLayout
             android:id="@+id/rlSearchFrameDelete"