1、预录入客户：收款方式（完成）

2、录入客户：币别（完成），当前阶段（完成）
3、业务员(完成)

MPAndroidChart/build.gradle

@@ -1,3 +1,4 @@
+
 apply plugin: 'com.android.library'
 
 android {

WeiChat/build.gradle

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

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

@@ -12,23 +12,29 @@ import android.view.View;
 import android.widget.LinearLayout;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
 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.util.DateFormatUtil;
+import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 
-import java.util.Date;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
-public class CustomerAddActivity extends BaseActivity implements View.OnClickListener{
-    
+/**
+ * 预录入客户页面
+ */
+public class CustomerAddActivity extends BaseActivity implements View.OnClickListener {
+
     @ViewInject(R.id.et_cu_code)
     private FormEditText et_cu_code;
     @ViewInject(R.id.et_cu_name)
@@ -64,15 +70,17 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     private FormEditText tv_cu_taxrate;
     @ViewInject(R.id.tv_cu_nichestep)
     private FormEditText tv_cu_nichestep;
-    
+
     @ViewInject(R.id.ll_infomal)
     private LinearLayout ll_infomal;
 
     private String tv_code;
     private int type;//预录入客户，正式客户
 
-    PopupMenu popup=null;
-    
+    PopupMenu popup = null;
+
+    private List<String> mLists = new ArrayList<String>();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -85,34 +93,45 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     private void initListener() {
         et_cu_kind.setOnClickListener(this);
         et_cu_district.setOnClickListener(this);
-        
+        tv_cu_nichestep.setOnClickListener(this);
+        et_cu_payments.setOnClickListener(this);
+        tv_cu_currency.setOnClickListener(this);
+        et_cu_sellername.setOnClickListener(this);
+
         et_cu_kind.setFocusable(false);
         et_cu_district.setFocusable(false);
-        
+        tv_cu_nichestep.setFocusable(false);
+        et_cu_payments.setFocusable(false);
+        tv_cu_currency.setFocusable(false);
+        et_cu_sellername.setFocusable(false);
+
         et_cu_kind.setKeyListener(null);
         et_cu_district.setKeyListener(null);
-        
+        tv_cu_nichestep.setKeyListener(null);
+        et_cu_payments.setKeyListener(null);
+        tv_cu_currency.setKeyListener(null);
+        et_cu_sellername.setKeyListener(null);
     }
 
     private void initData() {
         getCodeByNet();
     }
-    
+
     private void initView() {
         ViewUtils.inject(this);
-        Intent intent=getIntent();
-        if (intent!=null){
-            type=intent.getIntExtra("type",0);
-            if (type==1){
+        Intent intent = getIntent();
+        if (intent != null) {
+            type = intent.getIntExtra("type", 0);
+            if (type == 1) {
                 ll_infomal.setVisibility(View.VISIBLE);
                 getSupportActionBar().setTitle("客户录入");
-            }else{
+            } else {
                 ll_infomal.setVisibility(View.GONE);
                 getSupportActionBar().setTitle("客户预录入");
             }
         }
     }
-    
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_btn_submit, menu);
@@ -135,67 +154,72 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
     private void saveData() {
         String formStore = "";
-        if (type==1){
-            if (et_cu_code.testValidity()||et_cu_name.testValidity()
-                    || tv_cu_address.testValidity()||et_cu_kind.testValidity()
-                    ||et_cu_district.testValidity() ||et_cu_kind.testValidity()
-                    ||et_cu_payments.testValidity()||et_cu_sellername.testValidity()
-                    ||tv_cu_contact.testValidity()||tv_cu_degree.testValidity()
-                    ||tv_cu_mobile.testValidity() ||tv_cu_email.testValidity()
-                    ||tv_cu_businesscode.testValidity()||tv_cu_currency.testValidity()
-                    ||tv_cu_taxrate.testValidity()||tv_cu_nichestep.testValidity()){
-                formStore= "{\n" +
-                        " \"cu_code\":\""+et_cu_code.getText().toString()+"\",\n" +
-                        " \"cu_name\":\""+et_cu_name.getText().toString()+"\",\n" +
-                        " \"cu_shortname\":\""+et_cu_shortname.getText().toString()+"\",\n" +
-                        " \"cu_add1\":\""+tv_cu_address.getText().toString()+"\",\n" +
-                        " \"cu_kind\":\""+et_cu_kind.getText().toString()+"\",\n" +
-                        " \"cu_district\":\""+et_cu_district.getText().toString()+"\",\n" +
-                        " \"cu_payments\":\""+et_cu_payments.getText().toString()+"\",\n" +
-                        " \"cu_sellername\":\""+et_cu_sellername.getText().toString()+"\",\n" +
-                        " \"cu_contact\":\""+tv_cu_contact.getText().toString()+"\",\n" +
-                        " \"cu_degree\":\""+tv_cu_degree.getText().toString()+"\",\n" +
-                        " \"cu_mobile\":\""+tv_cu_mobile.getText().toString()+"\",\n" +
-                        " \"cu_email\":\""+tv_cu_email.getText().toString()+"\",\n" +
-                        " \"cu_businesscode\":\""+tv_cu_businesscode.getText().toString()+"\",\n" +
-                        " \"cu_currency\":\""+tv_cu_currency.getText().toString()+"\",\n" +
-                        " \"cu_taxrate\":\""+tv_cu_taxrate.getText().toString()+"\",\n" +
-                        " \"cu_nichestep\":\""+tv_cu_nichestep.getText().toString()+"\",\n" +
-                        " \"cu_remark\":\""+tv_cu_remark.getText().toString()+"\"\n" +
+        if (type == 1) {
+            if (et_cu_code.testValidity() || et_cu_name.testValidity()
+                    || tv_cu_address.testValidity() || et_cu_kind.testValidity()
+                    || et_cu_district.testValidity() || et_cu_kind.testValidity()
+                    || et_cu_payments.testValidity() || et_cu_sellername.testValidity()
+                    || tv_cu_contact.testValidity() || tv_cu_degree.testValidity()
+                    || tv_cu_mobile.testValidity() || tv_cu_email.testValidity()
+                    || tv_cu_businesscode.testValidity() || tv_cu_currency.testValidity()
+                    || tv_cu_taxrate.testValidity() || tv_cu_nichestep.testValidity()) {
+                formStore = "{\n" +
+                        " \"cu_code\":\"" + et_cu_code.getText().toString() + "\",\n" +
+                        " \"cu_name\":\"" + et_cu_name.getText().toString() + "\",\n" +
+                        " \"cu_shortname\":\"" + et_cu_shortname.getText().toString() + "\",\n" +
+                        " \"cu_add1\":\"" + tv_cu_address.getText().toString() + "\",\n" +
+                        " \"cu_kind\":\"" + et_cu_kind.getText().toString() + "\",\n" +
+                        " \"cu_district\":\"" + et_cu_district.getText().toString() + "\",\n" +
+                        " \"cu_payments\":\"" + et_cu_payments.getText().toString() + "\",\n" +
+                        " \"cu_sellername\":\"" + et_cu_sellername.getText().toString() + "\",\n" +
+                        " \"cu_contact\":\"" + tv_cu_contact.getText().toString() + "\",\n" +
+                        " \"cu_degree\":\"" + tv_cu_degree.getText().toString() + "\",\n" +
+                        " \"cu_mobile\":\"" + tv_cu_mobile.getText().toString() + "\",\n" +
+                        " \"cu_email\":\"" + tv_cu_email.getText().toString() + "\",\n" +
+                        " \"cu_businesscode\":\"" + tv_cu_businesscode.getText().toString() + "\",\n" +
+                        " \"cu_currency\":\"" + tv_cu_currency.getText().toString() + "\",\n" +
+                        " \"cu_taxrate\":\"" + tv_cu_taxrate.getText().toString() + "\",\n" +
+                        " \"cu_nichestep\":\"" + tv_cu_nichestep.getText().toString() + "\",\n" +
+                        " \"cu_remark\":\"" + tv_cu_remark.getText().toString() + "\"\n" +
                         "}";
-            }else{
+            } else {
                 return;
             }
-        }else{
-            if (et_cu_code.testValidity()||et_cu_name.testValidity()
-                    || tv_cu_address.testValidity()||et_cu_kind.testValidity()
-                    ||et_cu_district.testValidity() ||et_cu_kind.testValidity()
-                    ||et_cu_payments.testValidity()||et_cu_sellername.testValidity()
-                    ||tv_cu_contact.testValidity()||tv_cu_degree.testValidity()
-                    ||tv_cu_mobile.testValidity() ||tv_cu_email.testValidity()){
-                formStore= "{\n" +
-                        " \"cu_code\":\""+et_cu_code.getText().toString()+"\",\n" +
-                        " \"cu_name\":\""+et_cu_name.getText().toString()+"\",\n" +
-                        " \"cu_shortname\":\""+et_cu_shortname.getText().toString()+"\",\n" +
-                        " \"cu_add1\":\""+tv_cu_address.getText().toString()+"\",\n" +
-                        " \"cu_kind\":\""+et_cu_kind.getText().toString()+"\",\n" +
-                        " \"cu_district\":\""+et_cu_district.getText().toString()+"\",\n" +
-                        " \"cu_payments\":\""+et_cu_payments.getText().toString()+"\",\n" +
-                        " \"cu_sellername\":\""+et_cu_sellername.getText().toString()+"\",\n" +
-                        " \"cu_contact\":\""+tv_cu_contact.getText().toString()+"\",\n" +
-                        " \"cu_degree\":\""+tv_cu_degree.getText().toString()+"\",\n" +
-                        " \"cu_mobile\":\""+tv_cu_mobile.getText().toString()+"\",\n" +
-                        " \"cu_email\":\""+tv_cu_email.getText().toString()+"\",\n" +
-                        " \"cu_remark\":\""+tv_cu_remark.getText().toString()+"\"\n" +
+        } else {
+            if (et_cu_code.testValidity() || et_cu_name.testValidity()
+                    || tv_cu_address.testValidity() || et_cu_kind.testValidity()
+                    || et_cu_district.testValidity() || et_cu_kind.testValidity()
+                    || et_cu_payments.testValidity() || et_cu_sellername.testValidity()
+                    || tv_cu_contact.testValidity() || tv_cu_degree.testValidity()
+                    || tv_cu_mobile.testValidity() || tv_cu_email.testValidity()) {
+                formStore = "{\n" +
+                        " \"cu_code\":\"" + et_cu_code.getText().toString() + "\",\n" +
+                        " \"cu_name\":\"" + et_cu_name.getText().toString() + "\",\n" +
+                        " \"cu_shortname\":\"" + et_cu_shortname.getText().toString() + "\",\n" +
+                        " \"cu_add1\":\"" + tv_cu_address.getText().toString() + "\",\n" +
+                        " \"cu_kind\":\"" + et_cu_kind.getText().toString() + "\",\n" +
+                        " \"cu_district\":\"" + et_cu_district.getText().toString() + "\",\n" +
+                        " \"cu_payments\":\"" + et_cu_payments.getText().toString() + "\",\n" +
+                        " \"cu_sellername\":\"" + et_cu_sellername.getText().toString() + "\",\n" +
+                        " \"cu_contact\":\"" + tv_cu_contact.getText().toString() + "\",\n" +
+                        " \"cu_degree\":\"" + tv_cu_degree.getText().toString() + "\",\n" +
+                        " \"cu_mobile\":\"" + tv_cu_mobile.getText().toString() + "\",\n" +
+                        " \"cu_email\":\"" + tv_cu_email.getText().toString() + "\",\n" +
+                        " \"cu_remark\":\"" + tv_cu_remark.getText().toString() + "\"\n" +
                         "}";
-            }else{
+            } else {
                 return;
             }
-           
+
         }
-        sendHttpResquest(Constants.HTTP_SUCCESS_INIT,formStore);
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT, formStore);
     }
 
+    private static final int CURRENT_STAGE = 21;
+    private static final int PAY_METHODS = 22;
+    private static final int GET_CURRENCY = 23;
+    private static final int GET_CLERK = 24;
+    private static final int REQUEST_CLERK = 1;
 
     private Handler mHandler = new Handler() {
         @Override
@@ -216,11 +240,83 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     tv_code = JSON.parseObject(msg.getData().getString("result")).getString("code");
                     et_cu_code.setText(tv_code);
                     break;
+                case CURRENT_STAGE://获取阶段列表
+                    progressDialog.dismiss();
+                    mLists.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++) {
+                            mLists.add(array.getJSONObject(i).getString("BS_NAME"));
+                        }
+                    }
+                    if (mLists.isEmpty()) {
+                        mLists.add("无");
+                    }
+                    showSimpleDialog(tv_cu_nichestep, "商机阶段");
+                    break;
+                case PAY_METHODS://获取收款方式列表
+                    progressDialog.dismiss();
+                    mLists.clear();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    json = msg.getData().getString("result");
+                    array = JSON.parseObject(json).getJSONArray("datas");
+                    if (!array.isEmpty()) {
+                        for (int i = 0; i < array.size(); i++) {
+                            mLists.add(array.getJSONObject(i).getString("pa_name"));
+                        }
+                    }
+
+                    if (mLists.isEmpty()) {
+                        mLists.add("无");
+                    }
+                    showSimpleDialog(et_cu_payments, "收款方式");
+                    break;
+                case GET_CURRENCY://获取币别列表
+                    progressDialog.dismiss();
+                    mLists.clear();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    json = msg.getData().getString("result");
+                    array = JSON.parseObject(json).getJSONArray("datas");
+                    if (!array.isEmpty()) {
+                        for (int i = 0; i < array.size(); i++) {
+                            mLists.add(array.getJSONObject(i).getString("cr_name"));
+                        }
+                    }
+
+                    if (mLists.isEmpty()) {
+                        mLists.add("无");
+                    }
+                    showSimpleDialog(tv_cu_currency, "币别");
+                    break;
             }
         }
     };
 
-    private void sendHttpResquest(int what,String formStore) {
+    private SingleDialog singleDialog;
+
+    public void showSimpleDialog(final FormEditText et, 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(mLists);
+       /* } else {
+            singleDialog.show();
+            singleDialog.initViewData(lists);
+        }*/
+    }
+
+    private void sendHttpResquest(int what, String formStore) {
         progressDialog.show();
         String url = Constants.getAppBaseUrl(ct) + "scm/sale/savePreCustomer.action";
         Map<String, Object> params = new HashMap<>();
@@ -233,14 +329,14 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
 
     private static final int codeWhat = 0x11;
-   
+
 
     private void getCodeByNet() {
         String url = Constants.getAppBaseUrl(ct) + "common/getCodeString.action";
         final Map<String, Object> param = new HashMap<>();
-       
+
         String caller = "PreCustomer";
-        if (type==1){
+        if (type == 1) {
             caller = "Customer";
         }
         param.put("caller", caller);
@@ -251,21 +347,21 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, codeWhat, null, null, "post");
     }
 
-    public void onPopupButtonClick(View button){
-        popup=new PopupMenu(this,button);
-        switch (button.getId()){
+    public void onPopupButtonClick(View button) {
+        popup = new PopupMenu(this, button);
+        switch (button.getId()) {
             case R.id.et_cu_kind:
                 getMenuInflater().inflate(R.menu.menu_cu_kind, popup.getMenu());
-            break;
+                break;
             case R.id.et_cu_district:
                 getMenuInflater().inflate(R.menu.menu_cu_district, popup.getMenu());
                 break;
         }
-      
+
         popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
-                switch (item.getItemId()){
+                switch (item.getItemId()) {
                     case R.id.cu_desgin:
                         et_cu_kind.setText(item.getTitle());
                         break;
@@ -280,7 +376,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                         break;
                     case R.id.cu_eastChina:
                         et_cu_district.setText(item.getTitle());
-                            break;
+                        break;
                     case R.id.cu_southChina:
                         et_cu_district.setText(item.getTitle());
                         break;
@@ -315,15 +411,84 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         popup.show(); //showing popup menu 
     }
 
+    /**
+     * @desc:加载阶段
+     */
+    public void loadJieDuan() {
+        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, CURRENT_STAGE, null, null, "post");
+    }
+
+    /**
+     * 加载收款方式
+     */
+    public void loadPayments() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/common/getDbfind.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("which", "form");
+        params.put("caller", "Customer!base");
+        params.put("field", "cu_paymentscode");
+
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, PAY_METHODS, null, null, "post");
+    }
+
+    /**
+     * 加载币别
+     */
+    public void loadCurrency() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/common/getDbfind.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("which", "form");
+        params.put("caller", "Customer!base");
+        params.put("field", "cu_currency");
+
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, GET_CURRENCY, null, null, "post");
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CLERK && resultCode == 2 && data != null){
+            et_cu_sellername.setText(data.getStringExtra("en_name"));
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
     @Override
     public void onClick(View v) {
-        switch (v.getId()){
+        switch (v.getId()) {
             case R.id.et_cu_kind:
                 onPopupButtonClick(v);
                 break;
             case R.id.et_cu_district:
                 onPopupButtonClick(v);
                 break;
+            case R.id.tv_cu_nichestep:
+                loadJieDuan();
+                break;
+            case R.id.et_cu_payments:
+                loadPayments();
+                break;
+            case R.id.tv_cu_currency:
+                loadCurrency();
+                break;
+            case R.id.et_cu_sellername:
+                Intent intent = new Intent();
+                intent.setClass(this, DbfindListActivity.class);
+                startActivityForResult(intent,REQUEST_CLERK);
+                break;
         }
     }
 }

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

@@ -445,7 +445,7 @@
                     android:textColor="@color/red" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/tv_cu_nichestep"
+                        android:id="@+id/tv_cu_nichestep"
                     style="@style/form_relative_right_text"
                     android:drawableRight="@drawable/nav_icon_search_default"
                     android:hint="请选择"