bug

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

@@ -264,6 +264,11 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                             break;*/
                         case 4:
                             startActivity(new Intent(BusinessDetailInfoActivity.this, CustomerAddActivity.class)
+                                    .putExtra("companyname",bc_custname.getText().toString().trim())
+                                    .putExtra("companyaddress",bc_address.getText().toString().trim())
+                                    .putExtra("contact",bc_contact.getText().toString().trim())
+                                    .putExtra("position",bc_position.getText().toString().trim())
+                                    .putExtra("telephone",bt_tel.getText().toString().trim())
                             );
                             break;
                         case 5:

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

@@ -791,8 +791,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         ydata1[4] = root.getIntValue("salecount");
                         ydata1[3] = root.getIntValue("nichechangecount");
                         ydata1[2] = root.getIntValue("nichecount");
-                        ydata1[5] = root.getJSONArray("visit").getIntValue(0);
-                        ydata1[6] = root.getJSONArray("visit").getIntValue(1);
+                        ydata1[5] = root.getJSONArray("visit").getIntValue(1);
+                        ydata1[6] = root.getJSONArray("visit").getIntValue(0);
                         tv_chuhuo.setText("出货" + root.getFloatValue("saleamount") + "万元");
                         tv_huikuan.setText("回款" + root.getFloatValue("backamount") + "万元");
                         for (int i = 0; i < ydata1.length; i++) {

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

@@ -110,6 +110,9 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     private String cu_code;
     private String cu_status;
 
+    private String mCompanyName,mCompanyAddress,mContact,mPosition,mTelephone;
+
+    public final static int RESULT_CUSTOMER_LIST = 55;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -183,6 +186,18 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             type = intent.getIntExtra("type", 0);
             cu_code = intent.getStringExtra("code");
             cu_status = intent.getStringExtra("status");
+
+            mCompanyName = intent.getStringExtra("companyname");
+            mCompanyAddress = intent.getStringExtra("companyaddress");
+            mContact = intent.getStringExtra("contact");
+            mPosition = intent.getStringExtra("position");
+            mTelephone = intent.getStringExtra("telephone");
+
+            if ("已提交".equals(cu_status)){
+                disableEdit(false);
+            }else {
+                disableEdit(true);
+            }
             if (type == 1) {
                 ll_infomal.setVisibility(View.VISIBLE);
                 getSupportActionBar().setTitle("正式客户");
@@ -195,8 +210,22 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             } else {
                 ll_infomal.setVisibility(View.GONE);
                 getSupportActionBar().setTitle("客户预录入");
-              
-                
+            }
+
+            if (mCompanyName != null){
+                et_cu_name.setText(mCompanyName);
+            }
+            if (mCompanyAddress != null){
+                tv_cu_address.setText(mCompanyAddress);
+            }
+            if (mContact != null){
+                tv_cu_contact.setText(mContact);
+            }
+            if (mPosition != null){
+                tv_cu_degree.setText(mPosition);
+            }
+            if (mTelephone != null){
+                tv_cu_mobile.setText(mTelephone);
             }
         }
     }
@@ -208,7 +237,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         getMenuInflater().inflate(R.menu.main_btn_submit, menu);
         mMenu = menu;
         if (type == 1){
-            if (cu_code != null){
+            if (cu_code != null && !"已提交".equals(cu_status)){
                 menu.findItem(R.id.btn_save).setVisible(true);
 
             }else {
@@ -541,6 +570,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     mMenu.findItem(R.id.btn_save).setVisible(false);
                     //bt_save.setVisibility(View.GONE);
                     disableEdit(false);
+                    setResult(RESULT_CUSTOMER_LIST);
                     break;
                 case UNCOMMIT:
                     progressDialog.dismiss();
@@ -552,6 +582,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     mMenu.findItem(R.id.btn_save).setVisible(true);
                     //bt_save.setVisibility(View.GONE);
                     disableEdit(true);
+                    setResult(RESULT_CUSTOMER_LIST);
                     break;
             }
         }

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

@@ -86,6 +86,8 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
 
     private EmptyLayout mEmptyLayout;
     private DBManager dbManager;
+
+    private final static int FLAG_ADD_CUSTOMER = 44;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -138,12 +140,12 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                     startActivity(new Intent(ct, CustomerDetailActivity.class).putExtra("code", viewHolder.tv_code
                             .getText().toString()).putExtra("falg",falg));
                 }else{
-                    startActivity(new Intent(ct, CustomerAddActivity.class)
+                    startActivityForResult(new Intent(ct, CustomerAddActivity.class)
                             .putExtra("type", 1)
                             .putExtra("status", viewHolder.tv_auditstatus.getText().toString()).
                                     putExtra("code", viewHolder.tv_code
-                                    .getText().toString())
-                    );
+                                            .getText().toString())
+                    ,FLAG_ADD_CUSTOMER);
                 }
               
             }
@@ -499,8 +501,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (data == null) return;
-        if (requestCode == 0x11 && 0x11 == resultCode) {
+        if (requestCode == 0x11 && 0x11 == resultCode && data !=null) {
             Employees entity = data.getParcelableExtra("data");
             if (entity == null || entity.getEm_code() == null) return;
             isSelected = 1;
@@ -513,6 +514,10 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
             AvatarHelper.getInstance().displayAvatar(String.valueOf(entity.getEm_id()), iv_head, false);
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, isSelected, em_code);
         }
+
+        if (requestCode == FLAG_ADD_CUSTOMER && resultCode == CustomerAddActivity.RESULT_CUSTOMER_LIST){
+            initData();
+        }
     }
 
     private void loadParams(int what) {

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

@@ -311,11 +311,11 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     }
 
     private void initView() {
-        chaneTAG(false);
         mEmptyLayout = new EmptyLayout(this, listview);
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
+        chaneTAG(false);
         initData();
         setListener();
         selectDay = picker.getDownIndex();
@@ -530,6 +530,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
      */
     private void chaneTAG(boolean isMy) {
         if (isMy) {
+            mEmptyLayout.setEmptyMessage("多见一个客户就多一个机会哦");
             showOtherBeans = null;
             if (!my_client_log.getText().toString().trim().equals("下属工作日历")) {
                 my_client_log.setText("下属工作日历");
@@ -543,6 +544,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 setTaskDay(meBeans);
             }
         } else {
+            mEmptyLayout.setEmptyMessage("无拜访计划");
             tag = 2;
             ok_scale.setVisibility(View.VISIBLE);
             my_client_log_tag.setBackgroundResource(R.color.darkorange);

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -94,6 +95,7 @@ public class SelectListActivity extends BaseActivity {
                     break;
                 case VISIT_NICHECODES:
                     message = msg.getData().getString("result");
+                    Log.d("handlemessage:",message);
                     if (JSON.parseObject(message) != null ||
                             JSON.parseObject(message).containsKey("success") || JSON.parseObject(message).getBoolean("success")
                             && JSON.parseObject(message).containsKey("stages")) {

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

@@ -755,7 +755,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:gravity">center</item>
+        <item name="android:gravity">left</item>
     </style>
 
     <style name="TextView_Basic">