版本5.8.6

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="107"
-    android:versionName="5.8.5">
+    android:versionCode="108"
+    android:versionName="5.8.6">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -32,7 +32,6 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.AppWebViewActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ApprovalActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.setting.ComApprovalUtil;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -44,7 +43,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -359,15 +357,15 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 }
                 LogUtil.i("url="+url);
                 String master = model.master == null ? CommonUtil.getSharedPreferences(ct, "erp_master") : model.master;
-                if (CommonUtil.isReleaseVersion() && !PreferenceUtils.getBoolean("newapproval", true)) {
+                if (CommonUtil.isReleaseVersion()) {
                     CommonUtil.loadWebView(ct, url, title, master, null, null);
-                    Intent intent = new Intent(ct, AppWebViewActivity.class);
-                    intent.putExtra("url", url);
-                    intent.putExtra("p", title);
-                    intent.putExtra("master", master);
-                    intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(intent);
+//                    Intent intent = new Intent(ct, AppWebViewActivity.class);
+//                    intent.putExtra("url", url);
+//                    intent.putExtra("p", title);
+//                    intent.putExtra("master", master);
+//                    intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
+//                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//                    startActivity(intent);
                 } else {
                     Intent intent = new Intent(ct, ApprovalActivity.class);
                     intent.putExtra("imid", d_imids);

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

@@ -170,7 +170,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                 }
                 break;
             case R.id.company_add_rl://时段
-                if (!StringUtils.isEmpty(phone)) {
+                if (!StringUtils.isEmpty(tvBookObject.getText().toString())) {
                     startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                                     .putExtra("startDate", DateFormatUtil.getDateTimeStr())
                                     .putExtra("endDate", DateFormatUtil.getDateTimeStr())