测试版本5.2.5 9-9

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -260,7 +260,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                     if (!jsons.isEmpty()) {
                         for (int i = 0; i < jsons.size(); i++) {
                             //TODO 没有数据，不知道字段是什么  已实际情况修改字段
-                            lists.add(jsons.getJSONObject(i).getString("BS_NAME"));
+                            lists.add(jsons.getJSONObject(i).getString("DLC_VALUE"));
                         }
                     }
                     if (lists.isEmpty()) {
@@ -441,25 +441,37 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                 new SingleDialog.PickDialogListener() {
                     @Override
                     public void onListItemClick(int position, String value) {
-                        et.setText(value);
-                        for (int i = 0; i < jsons.size(); i++) {
-                            if (jsons.getJSONObject(i).getString("BD_NAME").equals(value)) {
-                                String bd_prop = jsons.getJSONObject(i).getString("BD_PROP");
-                                if (bd_prop.equals("公有")) {
-                                    //跟进人不可编辑，不可点击
-                                    et_business_enterMan.setClickable(false);
-                                    et_business_enterMan.setEnabled(false);
-                                    et_business_enterMan.setText("");
-                                    et_business_enterCode = 0;
-                                } else {
-                                    //跟进人可编辑
-                                    et_business_enterCode = 1;
-                                    et_business_enterMan.setEnabled(true);
-                                    et_business_enterMan.setClickable(true);
-                                    et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
+                        switch (et.getId()){
+                            case R.id.et_business_source:
+                                et.setText(value);
+                                break;
+                            case R.id.et_business:
+                                et.setText(value);
+                                for (int i = 0; i < jsons.size(); i++) {
+                                    if (jsons.getJSONObject(i).getString("BD_NAME").equals(value)) {
+                                        String bd_prop = jsons.getJSONObject(i).getString("BD_PROP");
+                                        if (bd_prop.equals("公有")) {
+                                            //跟进人不可编辑，不可点击
+                                            et_business_enterMan.setClickable(false);
+                                            et_business_enterMan.setEnabled(false);
+                                            et_business_enterMan.setText("");
+                                            et_business_enterCode = 0;
+                                        } else {
+                                            //跟进人可编辑
+                                            et_business_enterCode = 1;
+                                            et_business_enterMan.setEnabled(true);
+                                            et_business_enterMan.setClickable(true);
+                                            et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
+                                        }
+                                    }
                                 }
-                            }
+                                break;
+                            default:
+                                et.setText(value);
+                                break;
                         }
+                      
+                      
                     }
                 });
         singleDialog.show();

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

@@ -155,17 +155,23 @@ public class BusinessDetailActivty extends BaseActivity {
         if (type == 0) {
             getSupportActionBar().setTitle("商机跟进");
             ll_top_state.setVisibility(View.VISIBLE);
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         } else if (type == 1) {
             getSupportActionBar().setTitle("抢占商机");
             ll_top_state.setVisibility(View.GONE);
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         } else if (type == 2) {
             getSupportActionBar().setTitle("商机分配");
             ll_top_state.setVisibility(View.GONE);
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         } else if (type == 3) {
             getSupportActionBar().setTitle("商机");
             ll_top_state.setVisibility(View.GONE);
+            isAdminer(12);
+        }else{
+            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         }
-        sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
+        
     }
 
 
@@ -333,6 +339,7 @@ public class BusinessDetailActivty extends BaseActivity {
     }
 
 
+    private int isAdmin;
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -409,6 +416,20 @@ public class BusinessDetailActivty extends BaseActivity {
                         progressDialog.dismiss();
                         Crouton.makeText(BusinessDetailActivty.this, "您已超出最大获取商机数！", 0xffff4444, 2000).show();
                     }
+                case 12://admin ?
+                   result = JSON.parseObject(msg.getData().getString("result"));
+                    String admin=result.getString("result");
+                    if (!StringUtils.isEmpty(admin)){
+                        if ("admin".equals(admin)){
+                           isAdmin=1; 
+                        }else{
+                            isAdmin=0;
+                        }
+                    }else{
+                        isAdmin=0;
+                    }
+                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT,1);
+                    break;
             }
         }
     };
@@ -430,8 +451,13 @@ public class BusinessDetailActivty extends BaseActivity {
                 params.put("condition", "nvl(bc_status,' ')<>'已失效' and nvl(bc_doman,' ')=' ' and bc_nichehouse in (select bd_name from BusinessDataBase where bd_admincode=" +
                         "'" + CommonUtil.getSharedPreferences(ct, "erp_username") + "')");
             } else if (type == 3) {//商机列表
-                params.put("condition", "bc_currentprocess='" + business_steps + "' and bc_domancode='" +
-                        CommonUtil.getSharedPreferences(ct, "erp_username") + "'");
+                if (isAdmin==1){
+                    params.put("condition", "bc_currentprocess='" + business_steps + "' ");
+                }else{
+                    params.put("condition", "bc_currentprocess='" + business_steps + "' and bc_domancode='" +
+                            CommonUtil.getSharedPreferences(ct, "erp_username") + "'");
+                }
+                
             } else {//跟进
                 params.put("condition", "(bc_type='公有' or nvl(bc_type,' ')=' ')");
             }
@@ -474,4 +500,15 @@ public class BusinessDetailActivty extends BaseActivity {
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
+    
+    public void isAdminer(int what){
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/isSysAdmin.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("em_code", CommonUtil.getSharedPreferences(ct,"erp_username"));
+  
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+        
+    }
 }

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

@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -22,13 +23,17 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
+import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -71,6 +76,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     private void initListener() {
         tv_date.setOnClickListener(this);
         tv_leader.setOnClickListener(this);
+        tv_business_state.setOnClickListener(this);
     }
 
     int type = 1;
@@ -79,6 +85,8 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     private String doman;
 
     private void initData() {
+        loadLeader(2);
+        tv_date.setText(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd"));
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 1);
@@ -171,6 +179,22 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                             .getJSONObject("data").getString("em_name");
                     tv_leader.setText(leader);
                     break;
+                case 5:
+                    progressDialog.dismiss();
+                    lists.clear();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    String json = msg.getData().getString("result");
+                    JSONArray array = JSON.parseObject(json).getJSONArray("stages");
+                    if (!array.isEmpty()) {
+                        for (int i = 0; i < array.size(); i++) {
+                            lists.add(array.getJSONObject(i).getString("BS_NAME"));
+                        }
+                    }
+                    if (lists.isEmpty()) {
+                        lists.add("无");
+                    }
+                    showSimpleDialog(tv_business_state, "商机阶段");
+                    break;
             }
         }
     };
@@ -216,6 +240,8 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
 
+    
+    
     private void loadLeader(int what) {
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getheadmanmsg.action";
         Map<String, Object> params = new HashMap<>();
@@ -237,7 +263,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
             public void onDatePicked(String year, String month, String day) {
                 switch (resId) {
                     case R.id.tv_date://排名
-                        ToastUtil.showToast(ct, year + "-" + month);
+
                         tv_date.setText(year + "-" + month + "-" + day);
                         break;
                 }
@@ -247,6 +273,22 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     }
 
 
+
+    /**
+     * @desc:加载阶段
+     * @author：Arison on 2016/7/20
+     */
+    public void loadJieDuan(int what) {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/getBusinessChanceStage.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("condition", "1=1");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -256,6 +298,32 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
             case R.id.tv_date:
                 showDateWheel(R.id.tv_date);
                 break;
+            case R.id.tv_business_state:
+                loadJieDuan(5);
+                break;
         }
     }
+    private List<String> lists = new ArrayList<String>();
+
+    private SingleDialog singleDialog;
+
+    public void showSimpleDialog(final TextView et, final String title) {
+        if (singleDialog != null) {
+            if (singleDialog.isShowing())
+                return;
+        }
+        singleDialog = new SingleDialog(ct, title,
+                new SingleDialog.PickDialogListener() {
+                    @Override
+                    public void onListItemClick(int position, String value) {
+                        et.setText(value);
+                    }
+                });
+        singleDialog.show();
+        singleDialog.initViewData(lists);
+       /* } else {
+            singleDialog.show();
+            singleDialog.initViewData(lists);
+        }*/
+    }
 }

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

@@ -64,6 +64,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
    private String cu_code;
     private String cu_name;
     private void initListener() {
+        mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
@@ -81,21 +82,20 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                 BusinessSelectCustomerActivity.BussinessDetailAdapter.ViewHolder holder= (BussinessDetailAdapter.ViewHolder) view.getTag();
                 cu_code= holder.code;
                 cu_name=holder.tv_business_name.getText().toString();
-                for (int i=0;i<mData.size();i++){
-                    if (position-1!=i){
-                        mData.get(i).setIsChecked(false);
-                    }
+                final  boolean flag = !mData.get(position-1).isChecked;
+                Log.i(TAG, "onClick:" + position + " check:" + !flag);
+                for (Business model : mData) {
+                    model.setIsChecked(false);
                 }
-                mAdapter.notifyDataSetChanged();
-                new Handler().postDelayed(new Runnable() {
+
+                mData.get(position-1).setIsChecked(flag);
+                mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        Business bean = (Business) parent.getAdapter().getItem(position);
-                        bean.isChecked = !bean.isChecked;
-                        SmoothCheckBox checkBox = (SmoothCheckBox) view.findViewById(R.id.cb_left);
-                        checkBox.setChecked(bean.isChecked, true);
+                        mAdapter.notifyDataSetChanged();
                     }
-                },100);
+                }, 90);
+
             }
         });
         ;
@@ -170,15 +170,29 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             } else {
                 holder = (ViewHolder) convertView.getTag();
             }
-            holder.cb_left.setOnCheckedChangeListener(new SmoothCheckBox.OnCheckedChangeListener() {
-                @Override
-                public void onCheckedChanged(SmoothCheckBox checkBox, boolean isChecked) {
-                    mdata.get(position).setIsChecked(isChecked);
-                }
-            });
+            
+//           holder.cb_left.setOnCheckedChangeListener(new SmoothCheckBox.OnCheckedChangeListener() {
+//                @Override
+//                public void onCheckedChanged(SmoothCheckBox checkBox, boolean isChecked) {
+//                    cu_code= mdata.get(position).getCode();
+//                    cu_name=mdata.get(position).getName();
+//                    final  boolean flag = !mdata.get(position).isChecked;
+//                    Log.i(TAG, "onClick:" + position + " check:" + !flag);
+//                    for (Business model : mdata) {
+//                        model.setIsChecked(false);
+//                    }
+//
+//                    mdata.get(position-1).setIsChecked(flag);
+//                    mAdapter.notifyDataSetChanged();
+//                }
+//
+//            });
+            holder.cb_left.setFocusable(false);
+            holder.cb_left.setEnabled(false);
+            holder.cb_left.setClickable(false);
             holder.code=mdata.get(position).getCode();
             holder.tv_business_name.setText(mdata.get(position).getName());
-            holder.cb_left.setChecked(mdata.get(position).isChecked());
+            holder.cb_left.setChecked(mdata.get(position).isChecked(), mdata.get(position).isChecked());
             return convertView;
         }
 

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

@@ -29,6 +29,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 
 import java.util.ArrayList;
@@ -64,6 +65,7 @@ public class BusinessTransferActivity extends BaseActivity {
     }
 
     private void initListener() {
+        mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
@@ -81,15 +83,18 @@ public class BusinessTransferActivity extends BaseActivity {
 
                 final  boolean flag = !mData.get(position-1).isChecked;
                          Log.i(TAG, "onClick:" + position + " check:" + !flag);
-
+                         nicehouse=mData.get(position-1).getName();
                          for (Business model : mData) {
                              model.setIsChecked(false);
                          }
-
-                        
                       
                          mData.get(position-1).setIsChecked(flag);
-                         mAdapter.notifyDataSetChanged();
+                         mHandler.postDelayed(new Runnable() {
+                             @Override
+                             public void run() {
+                                 mAdapter.notifyDataSetChanged();
+                             }
+                         },90);
                         
                 
                 
@@ -131,7 +136,12 @@ public class BusinessTransferActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                sendHttpResquestTransfer(BUSSINE_TRANSFER,code,nicehouse);
+                if (StringUtils.isEmpty(nicehouse)){
+                    ToastMessage("请选择一种商机库");
+                }else{
+                    sendHttpResquestTransfer(BUSSINE_TRANSFER,code,nicehouse);
+                }
+               
                 break;
             case android.R.id.home:
                 onBackPressed();
@@ -185,8 +195,16 @@ public class BusinessTransferActivity extends BaseActivity {
 //            holder.cb_left.setOnCheckedChangeListener(new SmoothCheckBox.OnCheckedChangeListener() {
 //                @Override
 //                public void onCheckedChanged(SmoothCheckBox checkBox, boolean isChecked) {
-//                    
-//                    mdata.get(position).setIsChecked(isChecked);
+//
+//                    final  boolean flag = !mdata.get(position).isChecked;
+//                    Log.i(TAG, "onClick:" + position + " check:" + !flag);
+//                    nicehouse=mdata.get(position).getName();
+//                    for (Business model : mdata) {
+//                        model.setIsChecked(false);
+//                    }
+//
+//                    mdata.get(position).setIsChecked(flag);
+//                    mAdapter.notifyDataSetChanged();
 //                }
 //            });
 //            holder.view.setOnClickListener(new View.OnClickListener() {
@@ -203,9 +221,10 @@ public class BusinessTransferActivity extends BaseActivity {
 //                    notifyDataSetChanged();
 //                }
 //            });
-
+            holder.cb_left.setFocusable(false);
+            holder.cb_left.setEnabled(false);
+            holder.cb_left.setClickable(false);
             holder.tv_business_name.setText(mdata.get(position).getName());
-          
             holder.cb_left.setChecked(mdata.get(position).isChecked(), mdata.get(position).isChecked());
             return convertView;
         }

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

@@ -325,9 +325,9 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                             startActivityForResult(intent, 0x11);
                             popupWindow.dismiss();
                             break;
-                        case 2:
+                     /*   case 2:
                             popupWindow.dismiss();
-                            break;
+                            break;*/
 
                     }
                 }
@@ -363,9 +363,9 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
         map.put("item_name", "我下属");
         list.add(map);
 
-        map = new HashMap<String, Object>();
+   /*     map = new HashMap<String, Object>();
         map.put("item_name", "取消");
-        list.add(map);
+        list.add(map);*/
 
 
         return list;

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

@@ -335,6 +335,10 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "mobile/crm/updateVistPlan.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("vp_id", vp_id);
+        //cu_nichestep商机阶段
+        //cu_code客户编号
+        param.put("cu_nichestep",tv_visit_steps.getText().toString());
+        param.put("cu_code",vp_code);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
         com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.httpSendRequest(this, url, param, mHandler, headers, 0x16, null, null, "post");

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

@@ -6,9 +6,11 @@
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessSelectCustomerActivity">
 
     <RelativeLayout
+        android:id="@+id/rl_search"
         android:background="@drawable/bg_bar"
         android:layout_width="match_parent"
         android:layout_height="48dp"
+        android:visibility="gone"
         android:orientation="horizontal"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"
@@ -30,6 +32,7 @@
     </RelativeLayout>
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
+        android:layout_below="@+id/rl_search"
         android:dividerHeight="5dp"
         style="@style/ListViewBasic"></com.handmark.pulltorefresh.library.PullToRefreshListView>
 </RelativeLayout>

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

@@ -15,7 +15,6 @@
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_gravity="center_vertical|left"
-        android:clickable="false"
         android:layout_margin="5dp"
         app:color_checked="#149A45" />