百度自动更新 忽略此版本按钮隐藏 09

！

WeiChat/build.gradle

@@ -94,4 +94,5 @@ dependencies {
     compile 'me.gujun.android.taggroup:library:1.4@aar'
     compile 'com.umeng.analytics:analytics:latest.integration'
     compile 'com.android.support:multidex:1.0.1'
+  
 }

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

@@ -355,15 +355,17 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 		et_extra_time.setKeyListener(null);
 		et_extra_resaon.setKeyListener(null);
 		et_extra_encode.setKeyListener(null);
-		
-		et_extra_encode.setText(CommonUtil.getSharedPreferences(this, "erp_emname"));
 		et_leader_no.setKeyListener(null);
 		et_extra_deparment.setKeyListener(null);
-		
+		et_extra_date.setFocusable(false);
+		et_extra_time.setFocusable(false);
+		et_extra_resaon.setFocusable(false);
+		et_extra_encode.setFocusable(false);
+		et_leader_no.setFocusable(false);
+		et_extra_deparment.setFocusable(false);
+		et_extra_encode.setText(CommonUtil.getSharedPreferences(this, "erp_emname"));
 		et_extra_encode.setOnClickListener(this);
-
 		et_leader_no.setOnClickListener(this);
-
 		et_extra_date.setOnClickListener(this);
 		et_extra_resaon.setOnClickListener(this);
 		et_extra_time.setOnClickListener(this);

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

@@ -545,6 +545,14 @@ public class LeaveActivity extends BaseActivity implements OnClickListener {
         et_leave_category.setKeyListener(null);
         et_leave_man.setKeyListener(null);
         et_leave_mankind.setKeyListener(null);
+
+        tv_start_time.setFocusable(false);
+        tv_end_time.setFocusable(false);
+        et_leave_type.setFocusable(false);
+        et_leave_category.setFocusable(false);
+        et_leave_man.setFocusable(false);
+        et_leave_mankind.setFocusable(false);
+        
         et_leave_man.setText(CommonUtil.getSharedPreferences(this, "erp_emname"));
 
 

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

@@ -292,29 +292,33 @@ public class TravelActivity extends BaseActivity implements OnClickListener {
 		ct=this;
         progressDialog=CustomProgressDialog.createDialog(this);
 		getSupportActionBar().setTitle("出差申请");
-		et_trave_type.setOnClickListener(this);
-		et_extra_sign.setOnClickListener(this);
+	
 		et_trave_type.setKeyListener(null);
 		et_extra_sign.setKeyListener(null);
 		et_extra_deparment.setKeyListener(null);
-
+		et_trave_linkman.setKeyListener(null);
 		et_extra_endtime.setKeyListener(null);
 		et_extra_starttime.setKeyListener(null);
 
+		et_trave_type.setFocusable(false);
+		et_extra_sign.setFocusable(false);
+		et_extra_deparment.setFocusable(false);
+		et_trave_linkman.setFocusable(false);
+		et_extra_endtime.setFocusable(false);
+		et_extra_starttime.setFocusable(false);
+		
+
 		et_extra_endtime.setOnClickListener(this);
 		et_extra_starttime.setOnClickListener(this);
-		et_trave_linkman.setKeyListener(null);
 		et_trave_linkman.setOnClickListener(this);
-
 		bt_save.setOnClickListener(this);
 		bt_commit.setOnClickListener(this);
 		bt_add.setOnClickListener(this);
 		bt_update.setOnClickListener(this);
 		bt_uncommit.setOnClickListener(this);
-
-
+		et_trave_type.setOnClickListener(this);
+		et_extra_sign.setOnClickListener(this);
 		et_trave_linkman.setText(CommonUtil.getSharedPreferences(this, "erp_emname"));
-
 	}
 
 	protected void initDataFromServer(List<TravelEntity> leaveEntities,

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

@@ -198,7 +198,8 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
                             bt_commit.setChecked(false);
                             bt_update.setTextColor(getResources().getColor(
                                     R.color.black));
-                            bt_update.setEnabled(true);          bt_update.setChecked(false);
+                            bt_update.setEnabled(true);
+                            bt_update.setChecked(false);
                             bt_uncommit.setTextColor(getResources().getColor(
                                     R.color.gray));
                             bt_uncommit.setEnabled(false);
@@ -359,6 +360,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         setContentView(R.layout.act_extra_work);
         ViewUtils.inject(this);
         ct = this;
+        getSupportActionBar().setTitle("加班申请");
         progressDialog = new CustomProgressDialog(ct).createDialog(this);
         et_extra_type.setKeyListener(null);
         et_extra_no.setKeyListener(null);
@@ -367,6 +369,16 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         et_extra_starttime.setKeyListener(null);
         et_extra_isallday.setKeyListener(null);
         et_extra_type.setKeyListener(null);
+        et_extra_mankind.setKeyListener(null);
+
+        et_extra_type.setFocusable(false);
+        et_extra_no.setFocusable(false);
+        et_extra_company.setFocusable(false);
+        et_extra_endtime.setFocusable(false);
+        et_extra_starttime.setFocusable(false);
+        et_extra_isallday.setFocusable(false);
+        et_extra_type.setFocusable(false);
+        et_extra_mankind.setFocusable(false);
 
         et_extra_company.setOnClickListener(this);
         et_extra_company.setText(CommonUtil.getSharedPreferences(this, "erp_emname"));
@@ -382,8 +394,8 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         bt_uncommit.setOnClickListener(this);
         bt_update.setOnClickListener(this);
         et_extra_type.setOnClickListener(this);
-        getSupportActionBar().setTitle("加班申请");
-        et_extra_mankind.setOnKeyListener(null);
+
+
         et_extra_mankind.setOnClickListener(this);
     }
 
@@ -444,11 +456,11 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
                 break;
             case R.id.bt_add:   //新增
                 httpAdd();
-            if (bt_add.isEnabled()){
+                if (bt_add.isEnabled()) {
 
-            }else {
+                } else {
 
-            }
+                }
                 break;
             case R.id.bt_commit://提交
                 httpCommit();
@@ -760,6 +772,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         bt_update.setEnabled(false);
         bt_update.setChecked(true);
     }
+
     public void editnoclik() {
         et_extra_company.setEnabled(false);
         et_extra_type.setEnabled(false);
@@ -770,6 +783,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         et_extra_starttime.setEnabled(false);
         et_extra_remark.setEnabled(false);
     }
+
     public void editclik() {
         et_extra_company.setEnabled(true);
         et_extra_type.setEnabled(true);
@@ -780,6 +794,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         et_extra_starttime.setEnabled(true);
         et_extra_remark.setEnabled(true);
     }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
@@ -795,6 +810,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
+
     public void loadDataForServer(String field, int what) {
         Log.i("leave", "what=" + what);
         String url = Constants.getAppBaseUrl(ct) + "mobile/common/getCombo.action";

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

@@ -22,6 +22,7 @@ import android.widget.TextView;
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -57,8 +58,8 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     private Button bt_manage_date;
     @ViewInject(R.id.bt_zhuanyi)
     private Button bt_zhuanyi;
- 
-    
+
+
     @ViewInject(R.id.bt_manage_go)
     private Button bt_manage_go;
     @ViewInject(R.id.crm_ll_followup)
@@ -80,27 +81,27 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     @ViewInject(R.id.bc_code)
     private TextView bc_code;
     @ViewInject(R.id.bc_description)
-    private TextView  bc_description;
+    private TextView bc_description;
     @ViewInject(R.id.bc_nichehouse)
     private TextView bc_nichehouse;
     @ViewInject(R.id.bc_type)
-    private TextView  bc_type;
+    private TextView bc_type;
     @ViewInject(R.id.bc_currentprocess)
-    private TextView  bc_currentprocess;
+    private TextView bc_currentprocess;
     @ViewInject(R.id.bc_lastdate)
-    private TextView  bc_lastdate;
+    private TextView bc_lastdate;
     @ViewInject(R.id.bc_doman)
-    private TextView  bc_doman;
+    private TextView bc_doman;
     @ViewInject(R.id.bc_custname)
-    private TextView  bc_custname;
+    private TextView bc_custname;
     @ViewInject(R.id.bc_address)
-    private TextView        bc_address;
+    private TextView bc_address;
     @ViewInject(R.id.bc_contact)
     private TextView bc_contact;
     @ViewInject(R.id.bc_position)
-    private TextView       bc_position;
+    private TextView bc_position;
     @ViewInject(R.id.bt_tel)
-    private TextView  bt_tel;
+    private TextView bt_tel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -168,16 +169,13 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 showPopupWindow(v.findViewById(R.id.bt_manage_go));
                 break;
             case R.id.bt_manage_date:
-                Intent intent = new Intent(ct, TaskAddActivity.class);
-                intent.putExtra("type", 1);
-                intent.putExtra("data", bt_code);
-                startActivityForResult(intent, 0x11);
+                isEnableClick(bt_code,5);
                 break;
             case R.id.bt_qiang:
                 progressDialog.show();
                 String url = Constants.getAppBaseUrl(ct) + "mobile/crm/ifoverrecv.action";
-                Map<String,Object> stringMap = new HashMap<String, Object>();
-                stringMap.put("emcode",CommonUtil.getSharedPreferences(ct, "erp_username"));
+                Map<String, Object> stringMap = new HashMap<String, Object>();
+                stringMap.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
 
                 LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
                 headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -338,7 +336,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         bc_lastdate.setText(root.getString("bc_lastdate"));
                         bc_recorder.setText(root.getString("bc_recorder"));
                         bc_remark.setText(root.getString("bc_remark"));
-                        
+
                         bc_doman.setText(root.getString("bc_doman"));
                         bc_code.setText(root.getString("bc_code"));
                         bc_address.setText(root.getString("bc_address"));
@@ -348,7 +346,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         bc_description.setText(root.getString("bc_description"));
                         bc_currentprocess.setText(root.getString("bc_currentprocess"));
                         bc_type.setText(root.getString("bc_type"));
-                        
+
                         bt_doman = root.getString("bc_doman");
                         bt_code = root.getString("bc_code");
                         bt_process = root.getString("bc_currentprocess");
@@ -377,15 +375,28 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 case CAN_QIANG_NOT:
                     JSONObject result = JSON.parseObject(msg.getData().getString("result"));
                     String isok = result.getString("isok");
-                    if ("0".equals(isok)){
+                    if ("0".equals(isok)) {
                         Log.i("qiang", isok);
                         sendHttpBusinessQiang(BUSINESS_QIANG, bt_code, bt_doman);
-                    }else if ("1".equals(isok)){
-                        Log.i("qiang",isok);
+                    } else if ("1".equals(isok)) {
+                        Log.i("qiang", isok);
                         progressDialog.dismiss();
                         Crouton.makeText(BusinessDetailInfoActivity.this, "您已超出最大获取商机数！", 0xffff4444, 2000).show();
                     }
-
+                case 5:
+                     result = JSON.parseObject(msg.getData().getString("result"));
+                    JSONArray items=result.getJSONArray("result");
+                    if (items!=null){
+                        if (items.size()>0){
+                            Crouton.makeText(BusinessDetailInfoActivity.this, "不能重复添加到日程！", 0xffff4444, 2000).show();
+                        }else{
+                            Intent intent = new Intent(ct, TaskAddActivity.class);
+                            intent.putExtra("type", 1);
+                            intent.putExtra("data", bt_code);
+                            startActivityForResult(intent, 0x11);
+                        }
+                    }
+                    break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
@@ -397,7 +408,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     private void jumpToStateActivity() {
         Intent intent = new Intent();
-        intent.setClass(BusinessDetailInfoActivity.this,BusinessStateActivity.class);
+        intent.setClass(BusinessDetailInfoActivity.this, BusinessStateActivity.class);
         startActivity(intent);
     }
 
@@ -406,7 +417,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         String url = Constants.getAppBaseUrl(ct) + "mobile/common/getPanel.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", "BusinessChance");
-        if (type==0)formCondition="bc_id"+formCondition;
+        if (type == 0) formCondition = "bc_id" + formCondition;
         params.put("formCondition", formCondition);
         params.put("gridCondition", gridCondition);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -442,6 +453,17 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     }
 
+    public void isEnableClick(String bt_code,int what){
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getSchedule.action";
+        progressDialog.show();
+        Map<String, Object> params = new HashMap<>();
+        params.put("bccode", bt_code);
+        params.put("emname", MyApplication.getInstance().mLoginUser.getNickName());
+        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) {
         switch (requestCode) {

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

@@ -180,7 +180,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
 
-    private void sendHttpResquest(int what, String type) {
+    private void sendHttpResquest(int what, String typeStr) {
         progressDialog.show();
         String remark = et_remark.getText().toString();
         String gridSore = "{\n" +
@@ -189,13 +189,18 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 "\"bcd_leader\":\"" + tv_leader.getText().toString() + "\",\n" +
                 "\"bcd_date\":\"" + tv_date.getText().toString() + "\",\n" +
                 "\"bcd_bsname\":\"" + process + "\",\n" +
-                "\"bcd_type\":\"" + type + "\",\n" +
+                "\"bcd_type\":\"" + typeStr + "\",\n" +
                 "\"bcd_man\":\"" + MyApplication.getInstance().mLoginUser.getNickName()+ "\"" + (this.type == 1 ? ",\n\"bcd_code\":\"" + bcd_code + "\"\n" : "") +
                 "}";
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/updatebusinessChanceData.action";
         Map<String, Object> params = new HashMap<>();
         params.put("gridStore", gridSore);
-        params.put("caller", "BusinessChance");
+        if (type==1){
+            params.put("caller", "BusinessChanceData");//BusinessChance
+        }else{
+            params.put("caller", "BusinessChanceData");
+        }
+       
         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");