测试版本5.2.6 9-12

WeiChat/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     android:versionName="5.2">
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="22" />
+        android:targetSdkVersion="23" />
     <!-- 拨打电话 -->
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-feature android:name="android.hardware.camera" />

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

@@ -25,6 +25,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -299,7 +300,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
                 }
                 break;
             case R.id.iv_find:
-                Intent intent = new Intent(ct, DbfindListActivity.class);
+                Intent intent = new Intent(ct, DbfindListActivity.class).putExtra("listViewMode", ListView.CHOICE_MODE_MULTIPLE_MODAL);
                 startActivityForResult(intent, 2);
                 break;
             case R.id.bt_task_add:

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

@@ -26,6 +26,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -50,324 +51,335 @@ import java.util.Map;
  * @注释:查找
  */
 public class DbfindListActivity extends BaseActivity {
-	private EmptyLayout mEmptyLayout;
-
-	@ViewInject(R.id.lv_employee)
-	private PullToRefreshListView lv_employee;
-	private EmployeeAdatper adapter;
-	private List<Employees> lists;
-
-	@ViewInject(R.id.et_Search)
-	private  EditText et_Search;
-	ModeCallback mCallback;//多选模式
-
-	private  Context ct;
-	
-	private List<Employees> selectedItems=new ArrayList<>();
-
-	private final static int SUCCESS_LOADDATA = 1;
-	private Handler handler = new Handler() {
-		public void handleMessage(android.os.Message msg) {
-			switch (msg.what) {
-			case SUCCESS_LOADDATA:
-				progressDialog.dismiss();
-				Map<Object, Object> kMap = FlexJsonUtil.fromJson(msg.getData().getString("result"));
-				lists = FlexJsonUtil.fromJsonArray(kMap.get("data").toString(), Employees.class);
-				if (lists == null){
-					mEmptyLayout.showError();
-				}else if (lists.size() == 0){
-					mEmptyLayout.showEmpty();
-				}else {
-					System.out.println("data:" + kMap.get("data").toString());
-					adapter = new EmployeeAdatper(ct, lists);
-					lv_employee.setAdapter(adapter);
-
-				}
-				break;
-			case  LOAD_EMPLOYEES_SUCCESS:
-				progressDialog.dismiss();
-				String result=msg.getData().getString("result");
-				Log.i(TAG, result);
-				JSONObject object = JSON.parseObject(result);
-				JSONArray aJsonArray = object.getJSONArray("employees");
-				List<Employees> employees_query = new ArrayList<>();
-				for (int i = 0; i < aJsonArray.size(); i++) {
-					Employees em = new Employees();
-					em.setEm_id(aJsonArray.getJSONObject(i).getIntValue("em_id"));
-					em.setEm_code(aJsonArray.getJSONObject(i).getString("em_code"));
-					em.setEm_name(aJsonArray.getJSONObject(i).getString("em_name"));
-					employees_query.add(em);
-				}
-				adapter = new EmployeeAdatper(ct, employees_query);
-				lv_employee.setAdapter(adapter);
-				break;
-			default:
-				break;
-			}
-		};
-	};
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		initView();
-		initData();
-	}
-
-	public void initView() {
-		setContentView(R.layout.act_list_dbfind_employee);
-		ViewUtils.inject(this);
-		ct=this;
-		getSupportActionBar().setTitle("查找");
-				mCallback = new ModeCallback();
-		lv_employee.getRefreshableView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
-		lv_employee.getRefreshableView().setMultiChoiceModeListener(mCallback);
-		lv_employee.setOnItemClickListener(new OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				EmployeeAdatper.Store store = (EmployeeAdatper.Store) view.getTag();
-				Intent intent = new Intent();
-				intent.putExtra("en_name", store.en_name.getText().toString());
-				intent.putExtra("en_code", store.en_no.getText().toString());
+    private EmptyLayout mEmptyLayout;
+
+    @ViewInject(R.id.lv_employee)
+    private PullToRefreshListView lv_employee;
+    private EmployeeAdatper adapter;
+    private List<Employees> lists;
+
+    @ViewInject(R.id.et_Search)
+    private EditText et_Search;
+    private  ModeCallback mCallback;//多选模式
+
+    private Context ct;
+
+    private List<Employees> selectedItems = new ArrayList<>();
+
+    private final static int SUCCESS_LOADDATA = 1;
+    private Handler handler = new Handler() {
+        public void handleMessage(android.os.Message msg) {
+            switch (msg.what) {
+                case SUCCESS_LOADDATA:
+                    progressDialog.dismiss();
+                    Map<Object, Object> kMap = FlexJsonUtil.fromJson(msg.getData().getString("result"));
+                    lists = FlexJsonUtil.fromJsonArray(kMap.get("data").toString(), Employees.class);
+                    if (lists == null) {
+                        mEmptyLayout.showError();
+                    } else if (lists.size() == 0) {
+                        mEmptyLayout.showEmpty();
+                    } else {
+                        System.out.println("data:" + kMap.get("data").toString());
+                        adapter = new EmployeeAdatper(ct, lists);
+                        lv_employee.setAdapter(adapter);
+
+                    }
+                    break;
+                case LOAD_EMPLOYEES_SUCCESS:
+                    progressDialog.dismiss();
+                    String result = msg.getData().getString("result");
+                    Log.i(TAG, result);
+                    JSONObject object = JSON.parseObject(result);
+                    JSONArray aJsonArray = object.getJSONArray("employees");
+                    List<Employees> employees_query = new ArrayList<>();
+                    for (int i = 0; i < aJsonArray.size(); i++) {
+                        Employees em = new Employees();
+                        em.setEm_id(aJsonArray.getJSONObject(i).getIntValue("em_id"));
+                        em.setEm_code(aJsonArray.getJSONObject(i).getString("em_code"));
+                        em.setEm_name(aJsonArray.getJSONObject(i).getString("em_name"));
+                        employees_query.add(em);
+                    }
+                    adapter = new EmployeeAdatper(ct, employees_query);
+                    lv_employee.setAdapter(adapter);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        ;
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
+    }
+
+    public void initView() {
+        setContentView(R.layout.act_list_dbfind_employee);
+        ViewUtils.inject(this);
+        ct = this;
+        getSupportActionBar().setTitle("查找");
+        
+        Intent intent=getIntent();
+        int listViewMode=ListView.CHOICE_MODE_SINGLE;
+        if (intent!=null){
+            listViewMode= intent.getIntExtra("listViewMode",ListView.CHOICE_MODE_SINGLE);
+        }
+        mCallback = new ModeCallback();
+        lv_employee.setMode(PullToRefreshBase.Mode.DISABLED);
+        lv_employee.getRefreshableView().setChoiceMode(listViewMode);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            lv_employee.getRefreshableView().setMultiChoiceModeListener(mCallback);
+        }
+        lv_employee.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                EmployeeAdatper.Store store = (EmployeeAdatper.Store) view.getTag();
+                Intent intent = new Intent();
+                intent.putExtra("en_name", store.en_name.getText().toString());
+                intent.putExtra("en_code", store.en_no.getText().toString());
 //				intent.putExtra("en_depart", store.en_depart.getText().toString());
-				DbfindListActivity.this.setResult(2, intent);
-				DbfindListActivity.this.finish();
-			}
-		});
-		
-		et_Search.addTextChangedListener(new TextWatcher() {
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
-				if (s.length() != 0 && !StringUtils.isEmpty(s.toString())) {
-					loadEmployees(s.toString());
-				}
-			}
-
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-			}
-
-			@Override
-			public void afterTextChanged(Editable s) {
-
-			}
-		});
-
-		mEmptyLayout = new EmptyLayout(this,lv_employee.getRefreshableView());
-		mEmptyLayout.setShowLoadingButton(false);
-		mEmptyLayout.setShowEmptyButton(false);
-		mEmptyLayout.setShowErrorButton(false);
-
-	}
-
-	public void initData() {
-		progressDialog.show();
-		if (CommonUtil.isNetWorkConnected(this)){
-			String url = Constants.getAppBaseUrl(ct) + "common/dbfind.action";
-			Map<String, Object> params = new HashMap<String,  Object>();
-			params.put("caller", "Ask4leave");
-			params.put("which", "form");
-			params.put("field", "va_emcode");
-			params.put("condition", "1=1");
-			params.put("page", "1");
-			params.put("pageSize", "100");
-			params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-			LinkedHashMap<String, Object> headers=new LinkedHashMap<>();
-			headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-//		startHandlerThread(url, params, handler, SUCCESS_LOADDATA);
-			ViewUtil.httpSendRequest(
-					ct, url,
-					params,
-					handler, headers, SUCCESS_LOADDATA, null, null, "get");
-		}else {
-			progressDialog.dismiss();
-			mEmptyLayout.setErrorMessage("网络未连接！");
-			mEmptyLayout.showError();
-		}
-
-	}
-	
-	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-	private class ModeCallback implements ListView.MultiChoiceModeListener {
-		private View mMultiSelectActionBarView;
-	    private TextView mSelectedCount;
-		@Override
-		public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-			MenuInflater inflater = getMenuInflater();
-			inflater.inflate(R.menu.main_action_bar, menu);
-			if (mMultiSelectActionBarView==null) {
-			    mMultiSelectActionBarView = LayoutInflater.from(ct)
-	                    .inflate(R.layout.list_multi_select_actionbar, null);
-	                mSelectedCount =
-	                    (TextView)mMultiSelectActionBarView.findViewById(R.id.selected_conv_count);
-			}
-			mode.setCustomView(mMultiSelectActionBarView);
-			return true;
-		}
-
-		@Override
-		public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-			return false;
-		}
-
-		@Override
-		public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-			return false;
-		}
-
-		@Override
-		public void onDestroyActionMode(ActionMode mode) {
-            String values= getValuesSelect();
+                DbfindListActivity.this.setResult(2, intent);
+                DbfindListActivity.this.finish();
+            }
+        });
+
+        et_Search.addTextChangedListener(new TextWatcher() {
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() != 0 && !StringUtils.isEmpty(s.toString())) {
+                    loadEmployees(s.toString());
+                }
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+
+        mEmptyLayout = new EmptyLayout(this, lv_employee.getRefreshableView());
+        mEmptyLayout.setShowLoadingButton(false);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+
+    }
+
+    public void initData() {
+        progressDialog.show();
+        if (CommonUtil.isNetWorkConnected(this)) {
+            String url = Constants.getAppBaseUrl(ct) + "common/dbfind.action";
+            Map<String, Object> params = new HashMap<String, Object>();
+            params.put("caller", "Ask4leave");
+            params.put("which", "form");
+            params.put("field", "va_emcode");
+            params.put("condition", "1=1");
+            params.put("page", "1");
+            params.put("pageSize", "100");
+            params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            ViewUtil.httpSendRequest(
+                    ct, url,
+                    params,
+                    handler, headers, SUCCESS_LOADDATA, null, null, "get");
+        } else {
+            progressDialog.dismiss();
+            mEmptyLayout.setErrorMessage("网络未连接！");
+            mEmptyLayout.showError();
+        }
+
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    private class ModeCallback implements ListView.MultiChoiceModeListener {
+        private View mMultiSelectActionBarView;
+        private TextView mSelectedCount;
+
+        @Override
+        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.main_action_bar, menu);
+            if (mMultiSelectActionBarView == null) {
+                mMultiSelectActionBarView = LayoutInflater.from(ct)
+                        .inflate(R.layout.list_multi_select_actionbar, null);
+                mSelectedCount =
+                        (TextView) mMultiSelectActionBarView.findViewById(R.id.selected_conv_count);
+            }
+            mode.setCustomView(mMultiSelectActionBarView);
+            return true;
+        }
+
+        @Override
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            return false;
+        }
+
+        @Override
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+            return false;
+        }
+
+        @Override
+        public void onDestroyActionMode(ActionMode mode) {
+            String values = getValuesSelect();
             selectedItems.clear();
-            if (values.length()>1) {
-            	 Log.i(TAG, values.substring(0, values.length()-1));
-            	 Intent intent=new Intent();
-            	 intent.putExtra("employees", values.substring(0, values.length()-1));
-			     DbfindListActivity.this.setResult(1, intent);
-			     DbfindListActivity.this.finish();
-            
+            if (values.length() > 1) {
+                Log.i(TAG, values.substring(0, values.length() - 1));
+                Intent intent = new Intent();
+                intent.putExtra("employees", values.substring(0, values.length() - 1));
+                DbfindListActivity.this.setResult(1, intent);
+                DbfindListActivity.this.finish();
+
+            }
+
+        }
+
+        @Override
+        public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
+            switch (lv_employee.getRefreshableView().getCheckedItemCount()) {
+                default:
+                    manageClickedVIew(position - 1, checked);
+                    break;
             }
-          
-		}
-
-		@Override
-		public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
-			switch (lv_employee.getRefreshableView().getCheckedItemCount()) {
-			default:
-				  manageClickedVIew(position-1, checked);
-				break;
-			}
-			updateSeletedCount();
+            updateSeletedCount();
             mode.invalidate();
-            adapter.notifyDataSetChanged();			
-		}
-		
-		 private void manageClickedVIew(int i, boolean checked) {
-	          if(checked) { 
-	        	  selectedItems.add((Employees) adapter.getItem(i));}
-	          else { 
-	        	  selectedItems.remove((Employees) adapter.getItem(i));
-	          }
-	        }
-		
-		public void updateSeletedCount(){
-        	mSelectedCount.setText(Integer.toString(lv_employee.getRefreshableView().getCheckedItemCount()));
+            adapter.notifyDataSetChanged();
+        }
+
+        private void manageClickedVIew(int i, boolean checked) {
+            if (checked) {
+                selectedItems.add((Employees) adapter.getItem(i));
+            } else {
+                selectedItems.remove((Employees) adapter.getItem(i));
+            }
         }
-		
-		
-		public String getValuesSelect(){
-			StringBuffer sb=new StringBuffer();
-			for (int i = 0; i < selectedItems.size(); i++) {
-			    String name=selectedItems.get(i).getEm_name();
-			    sb.append(name+",");
-			}
-			return sb.toString();
-		}
-		
-	}
-	
-	
-	private final static int LOAD_EMPLOYEES_SUCCESS=2;
-	public void loadEmployees(String em_name){
-		progressDialog.show();
-		if (CommonUtil.isNetWorkConnected(this)){
-			String url = Constants.getAppBaseUrl(ct) + "mobile/QueryEmployee.action";
-			Map<String, Object> param = new HashMap<String, Object>();
-			param.put("em_name", em_name);
-			String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
-			Log.i("sessionId", "sessionId:" + sessionId);
-			param.put("sessionId", sessionId);
-			LinkedHashMap<String, Object> headers=new LinkedHashMap<>();
-			headers.put("Cookie", "JSESSIONID="+CommonUtil.getSharedPreferences(ct, "sessionId"));
-			headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-			ViewUtil.httpSendRequest(
-					ct, url,
-					param,
-					handler, headers, LOAD_EMPLOYEES_SUCCESS, null, null, "get");
-		}else {
-			progressDialog.dismiss();
-			mEmptyLayout.setErrorMessage("网络未连接！");
-			mEmptyLayout.showError();
-		}
-
-	}
-
-	public class EmployeeAdatper extends BaseAdapter {
-		public List<Employees> lists;
-		private Context context;
-
-		public EmployeeAdatper(Context ct, List<Employees> lists) {
-			this.lists = lists;
-			this.context = ct;
-		}
-
-		@Override
-		public int getCount() {
-			return lists != null ? lists.size() : 0;
-		}
-
-		@Override
-		public Object getItem(int position) {
-			return lists.get(position);
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return position;
-		}
-
-		@Override
-		public View getView(int position, View view, ViewGroup parent) {
-			Store store = null;
-
-			if (view == null) {
-				store = new Store();
-				view = LayoutInflater.from(context).inflate(R.layout.item_dbfind_employee, null);
-				store.en_no = (TextView) view.findViewById(R.id.tv_em_code_value);
-				store.en_name = (TextView) view.findViewById(R.id.tv_employee_name_value);
+
+        public void updateSeletedCount() {
+            mSelectedCount.setText(Integer.toString(lv_employee.getRefreshableView().getCheckedItemCount()));
+        }
+
+
+        public String getValuesSelect() {
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i < selectedItems.size(); i++) {
+                String name = selectedItems.get(i).getEm_name();
+                sb.append(name + ",");
+            }
+            return sb.toString();
+        }
+
+    }
+
+
+    private final static int LOAD_EMPLOYEES_SUCCESS = 2;
+
+    public void loadEmployees(String em_name) {
+        progressDialog.show();
+        if (CommonUtil.isNetWorkConnected(this)) {
+            String url = Constants.getAppBaseUrl(ct) + "mobile/QueryEmployee.action";
+            Map<String, Object> param = new HashMap<String, Object>();
+            param.put("em_name", em_name);
+            String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
+            Log.i("sessionId", "sessionId:" + sessionId);
+            param.put("sessionId", sessionId);
+            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            ViewUtil.httpSendRequest(
+                    ct, url,
+                    param,
+                    handler, headers, LOAD_EMPLOYEES_SUCCESS, null, null, "get");
+        } else {
+            progressDialog.dismiss();
+            mEmptyLayout.setErrorMessage("网络未连接！");
+            mEmptyLayout.showError();
+        }
+
+    }
+
+    public class EmployeeAdatper extends BaseAdapter {
+        public List<Employees> lists;
+        private Context context;
+
+        public EmployeeAdatper(Context ct, List<Employees> lists) {
+            this.lists = lists;
+            this.context = ct;
+        }
+
+        @Override
+        public int getCount() {
+            return lists != null ? lists.size() : 0;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return lists.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View view, ViewGroup parent) {
+            Store store = null;
+
+            if (view == null) {
+                store = new Store();
+                view = LayoutInflater.from(context).inflate(R.layout.item_dbfind_employee, null);
+                store.en_no = (TextView) view.findViewById(R.id.tv_em_code_value);
+                store.en_name = (TextView) view.findViewById(R.id.tv_employee_name_value);
 //				store.en_defaultorname = (TextView) view.findViewById(R.id.tv_em_defaultorname_value);
 //				store.en_depart = (TextView) view.findViewById(R.id.tv_em_depart_value);
 //				store.en_defaultorid = (TextView) view.findViewById(R.id.tv_em_defaultorid_value);
-				view.setTag(store);
-			} else {
-				store = (Store) view.getTag();
-			}
-			store.en_no.setText(lists.get(position).getEm_code());
-			store.en_name.setText(lists.get(position).getEm_name());
+                view.setTag(store);
+            } else {
+                store = (Store) view.getTag();
+            }
+            store.en_no.setText(lists.get(position).getEm_code());
+            store.en_name.setText(lists.get(position).getEm_name());
 //			store.en_depart.setText(lists.get(position).getEm_depart());
 //			store.en_defaultorname.setText(lists.get(position).getEm_defaultorname());
-			// store.en_defaultorid.setText(lists.get(position).getEm_defaultorid()+"");
-			
-			
-			updateBackground(position+1, view);
-			return view;
-		}
-
-		
-
-		public void updateBackground(int position, View view) {
-			int backgroundId;
-			if (lv_employee.getRefreshableView().isItemChecked(position)) {
+            // store.en_defaultorid.setText(lists.get(position).getEm_defaultorid()+"");
+
+
+            updateBackground(position + 1, view);
+            return view;
+        }
+
+
+        public void updateBackground(int position, View view) {
+            int backgroundId;
+            if (lv_employee.getRefreshableView().isItemChecked(position)) {
 //				backgroundId = R.drawable.list_selected_holo_light;
 //				Drawable background = ct.getResources().getDrawable(backgroundId);
-				view.setBackgroundResource(R.drawable.list_selected_holo_light);
-			} else {
+                view.setBackgroundResource(R.drawable.list_selected_holo_light);
+            } else {
 //				backgroundId = R.drawable.conversation_item_background_read;
 //				Drawable background = ct.getResources().getDrawable(backgroundId);
-				view.setBackgroundColor(ct.getResources().getColor(R.color.Transpant));
-			}
-			
-		}
-	 
-		public class Store {
-			TextView en_no;// 职位
-			TextView en_name;// 人员名称
-			TextView en_depart;// 部门
-			TextView en_defaultorid;// id 组织
-			TextView en_defaultorname;// 组织名称
-		}
-	}
+                view.setBackgroundColor(ct.getResources().getColor(R.color.Transpant));
+            }
+
+        }
+
+        public class Store {
+            TextView en_no;// 职位
+            TextView en_name;// 人员名称
+            TextView en_depart;// 部门
+            TextView en_defaultorid;// id 组织
+            TextView en_defaultorname;// 组织名称
+        }
+    }
 
 }

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

@@ -535,20 +535,6 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-                case 27://是否启用预录入
-                    progressDialog.dismiss();
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                   int  falg = Integer.valueOf(JSON.parseObject(msg.getData().getString("result")).getString("isStart"));
-                   if (falg==0){
-                       startActivity(new Intent(activity,CustomerAddActivity.class).putExtra("type",1));
-                   }else{
-                       startActivity(new Intent(activity,CustomerAddActivity.class).putExtra("type",0));
-                   }
-                    break;
-              /*  case 100:
-                    progressDialog.dismiss();
-                    Log.i(TAG, "handleMessage:10 0:" + msg.getData().getString("result"));
-                    break;*/
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
@@ -909,9 +895,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
     private void sendHttpResquest() {
         sendInactionCusts();
-        sendPersonalRank(DateFormatUtil.getStrDate4Date(new Date(),"yyyyMM"));
-        sendSalesKit(DateFormatUtil.getStrDate4Date(new Date(),"yyyyMM"));
-        sendTargets(DateFormatUtil.getStrDate4Date(new Date(),"yyyyMM"));
+        sendPersonalRank(DateFormatUtil.getStrDate4Date(new Date(), "yyyyMM"));
+        sendSalesKit(DateFormatUtil.getStrDate4Date(new Date(), "yyyyMM"));
+        sendTargets(DateFormatUtil.getStrDate4Date(new Date(), "yyyyMM"));
     }
 
     private void sendInactionCusts() {
@@ -994,7 +980,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             startActivity(new Intent(ClientActivity.this, BusinessAddActivity.class));
                             break;
                         case 1:
-                            loadParams(27);
+                            startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class));
                             break;
                        /* case 2:
                             startActivity(new Intent(ClientActivity.this, TaskAddActivity.class).putExtra("type", 0));
@@ -1045,15 +1031,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         }
     }
 
-    private void loadParams(int what) {
-        progressDialog.show();
-        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/ifuseprecustomer.action";
-        Map<String, Object> params = new HashMap<>();
-        params.put("currentsystem=", CommonUtil.getSharedPreferences(ct, "erp_master"));
-        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");
-    }
+  
 
     private List<Map<String, Object>> getPopData() {
         List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();

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

@@ -121,6 +121,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
     private void initData() {
         getCodeByNet();
+        loadParams(26);
     }
 
     private void initView() {
@@ -232,12 +233,13 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, formStore);
     }
 
-    private static final int CURRENT_STAGE = 21;
+    private final int CURRENT_STAGE = 21;
     private final int CUSTOMTER_TYPE=24;
-    private static final int PAY_METHODS = 22;
-    private static final int GET_CURRENCY = 23;
-    private static final int REQUEST_CLERK = 1;
-    private static final int GET_CU_ID = 25;
+    private final int PAY_METHODS = 22;
+    private final int GET_CURRENCY = 23;
+    private final int REQUEST_CLERK = 1;
+    private final int GET_CU_ID = 25;
+    private final int FORM_TYPE = 26;
     
     private Handler mHandler = new Handler() {
         @Override
@@ -259,6 +261,22 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ToastMessage(msg.getData().getString("result"));
                     break;
+                case FORM_TYPE:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    int  falg = Integer.valueOf(JSON.parseObject(msg.getData().getString("result")).getString("isStart"));
+                    if (falg == 0) {
+                        ll_infomal.setVisibility(View.VISIBLE);
+                        type=1;//正式客户
+                        getSupportActionBar().setTitle("客户录入");
+                        CommonUtil.getCommonId(ct, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
+                    } else {
+                        ll_infomal.setVisibility(View.GONE);
+                        type=0;//客户预录入
+                        getSupportActionBar().setTitle("客户预录入");
+                        CommonUtil.getCommonId(ct, "CUSTOMER_SEQ", mHandler, GET_CU_ID);
+                    }
+                    break;
                 case codeWhat://获取编号
                     progressDialog.dismiss();
                     tv_code = JSON.parseObject(msg.getData().getString("result")).getString("code");
@@ -494,6 +512,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         params.put("which", "form");
         params.put("caller", "Customer!Base");
         params.put("field", "cu_kind");
+        params.put("pageSize",1000);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, CUSTOMTER_TYPE, null, null, "post");
@@ -532,6 +551,16 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, GET_CURRENCY, null, null, "post");
     }
 
+    private void loadParams(int what) {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/ifuseprecustomer.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("currentsystem=", CommonUtil.getSharedPreferences(ct, "erp_master"));
+        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
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == REQUEST_CLERK && resultCode == 2 && data != null){

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

@@ -58,7 +58,8 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textColor="@color/gray_light"
-        android:text="长按可以多选人员"/>
+        android:text="长按可以多选人员"
+        android:visibility="gone" />
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/lv_employee"
         android:layout_width="match_parent"