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

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

@@ -181,7 +181,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                 ll_infomal.setVisibility(View.VISIBLE);
                 getSupportActionBar().setTitle("正式客户");
                 if (StringUtils.isEmpty(cu_code)) {
-                    CommonUtil.getCommonId(this, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
+                    CommonUtil.getCommonId(this, "CUSTOMER_SEQ", mHandler, GET_CU_ID);
                 } else {
                     //初始化数据
                     initCustomerData(INITCUSTOMER, cu_code);
@@ -190,7 +190,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             } else {
                 ll_infomal.setVisibility(View.GONE);
                 getSupportActionBar().setTitle("客户预录入");
-                CommonUtil.getCommonId(this, "CUSTOMER_SEQ", mHandler, GET_CU_ID);
+                CommonUtil.getCommonId(this, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
             }
         }
     }
@@ -201,7 +201,19 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_btn_submit, menu);
         mMenu = menu;
-        menu.findItem(R.id.btn_save).setVisible(false);
+        if (type == 1){
+            if (cu_code != null){
+                menu.findItem(R.id.btn_save).setVisible(true);
+
+            }else {
+                menu.findItem(R.id.btn_save).setVisible(false);
+
+            }
+
+        }else if (type == 0){
+            menu.findItem(R.id.btn_save).setVisible(false);
+
+        }
         return true;
     }
 
@@ -339,10 +351,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     if (type == 0){
                         bt_commit.setVisibility(View.GONE);
                     }else if (type == 1){
-                        if (cu_code == null){
                             bt_commit.setVisibility(View.VISIBLE);
-
-                        }
                     }
                     bt_save.setVisibility(View.GONE);
                     mMenu.findItem(R.id.btn_save).setTitle("更新");
@@ -379,9 +388,11 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                         
                         mCuId=jsonArray.getString("cu_id");
                         bt_save.setVisibility(View.GONE);
-                        if (cu_code == null){
+                        if (type == 1){
                             bt_commit.setVisibility(View.VISIBLE);
 
+                        }else if (type == 0){
+                            bt_commit.setVisibility(View.GONE);
                         }
                     }
                     break;
@@ -393,12 +404,12 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                         ll_infomal.setVisibility(View.VISIBLE);
                         type = 1;//正式客户
                         getSupportActionBar().setTitle("正式客户");
-                        CommonUtil.getCommonId(ct, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
+                        CommonUtil.getCommonId(ct, "CUSTOMER_SEQ", mHandler, GET_CU_ID);
                     } else {
                         ll_infomal.setVisibility(View.GONE);
                         type = 0;//客户预录入
                         getSupportActionBar().setTitle("客户预录入");
-                        CommonUtil.getCommonId(ct, "CUSTOMER_SEQ", mHandler, GET_CU_ID);
+                        CommonUtil.getCommonId(ct, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
                         bt_commit.setVisibility(View.GONE);
                        // bt_save.setVisibility(View.GONE);
                         bt_uncommit.setVisibility(View.GONE);

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

@@ -108,7 +108,7 @@ public class SubsActivity extends BaseActivity {
                 JSONArray arrays = array.getJSONArray(i);
                 holder.subs.setVisibility(View.GONE);
                 holder.custs.setVisibility(View.VISIBLE);
-                holder.name_tv.setText(getValues(arrays, 0));
+                holder.name_tv.setText("客戶："+getValues(arrays, 0));
                 String time = getValues(arrays, 1);
                 holder.time.setText(time);
                 if (time.length() > 5)//容cuo

WeiChat/src/main/res/menu/main_btn_submit.xml

@@ -3,6 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/btn_save"
-        android:title="确定"
+        android:title="更新"
         app:showAsAction="ifRoom" />
 </menu>