cqp页面跳转bug

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

@@ -377,20 +377,9 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                 if (!fd_field.equals("null")){
                                     em_number = formdataArray.getJSONObject(0).getString(fd_field);
                                     Log.i("em_number",em_number);
-
                                 }
-
                             }
                             getapplypeomsg(em_number);
-
-                            //申请单据的审批，提交，录入状态获取
-//                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_status")) ||
-//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_status")) ||
-//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_status")) ||
-//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("fp_status"))){
-//                                real_status = formdataArray.getJSONObject(0).getString(fd_field);
-//                                SetComDocStatus(real_status);
-//                            }
                         }
                         mCommonDocMainMsgAdapter.setmFormconfigsBean(mFormconfigsBean);
                         main_msg_lv.setAdapter(mCommonDocMainMsgAdapter);

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

@@ -153,7 +153,7 @@ public class DailydetailsActivity extends BaseActivity {
                                     Intent intent = new Intent();
                                     intent.putExtra("delete_succeed","");
                                     setResult(DELETE_SUCCEED,intent);
-                                    DailydetailsActivity.this.finish();
+                                    finish();
                                 }
                             }
                         }

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

@@ -233,8 +233,8 @@ public class WorkDailyAddActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
-            startActivity(new Intent(activity, WorkDailyShowActivity.class));
-//            .putExtra("fromwhere","submitdaily"));
+            startActivity(new Intent(activity, WorkDailyShowActivity.class)
+            .putExtra("fromwhere","nosubmitdaily"));
         }
 
         if (item.getItemId() == android.R.id.home) {
@@ -249,7 +249,11 @@ public class WorkDailyAddActivity extends BaseActivity {
                         .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                               startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                                if (!TextUtils.isEmpty(resubmit) && "unsub_tosub".equals(resubmit)){
+                                    startActivity(new Intent(WorkDailyAddActivity.this,WorkDailyShowActivity.class));
+                                }else {
+                                    startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                                }
                                 finish();
                             }
                         }).show();
@@ -276,6 +280,11 @@ public class WorkDailyAddActivity extends BaseActivity {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                            if (!TextUtils.isEmpty(resubmit) && "unsub_tosub".equals(resubmit)){
+                                startActivity(new Intent(WorkDailyAddActivity.this,WorkDailyShowActivity.class));
+                            }else {
+                                startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                            }
                             finish();
                         }
                     }).show();

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

@@ -123,7 +123,7 @@ public class WorkDailyShowActivity extends BaseActivity {
         });
         mPullToRefreshListView.setMode(PullToRefreshBase.Mode.BOTH);
 
-        //长按item弹出删除未提交对话框
+        //长按item弹出未提交单据删除对话框
        /* mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
@@ -259,29 +259,22 @@ public class WorkDailyShowActivity extends BaseActivity {
             putDownInput();
             final  Intent intent = getIntent();
             if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere"))
-                    && ((intent.getStringExtra("fromwhere").equals("submitdaily") ||
-                    intent.getStringExtra("fromwhere").equals("dodaily")) ||
-                    intent.getStringExtra("fromwhere").equals("delete_succeed"))){
-                startActivity(new Intent(activity,OAActivity.class));
+                    && intent.getStringExtra("fromwhere").equals("nosubmitdaily")){
                 finish();
             }else {
+                startActivity(new Intent(activity, OAActivity.class));
                 finish();
             }
-        }else{
-            return super.onOptionsItemSelected(item);
-
-        }return  true;
+        }return true;
     }
     @Override
     public void onBackPressed() {
         final  Intent intent = getIntent();
-        if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere")) &&
-              (intent.getStringExtra("fromwhere").equals("submitdaily") ||
-                    intent.getStringExtra("fromwhere").equals("dodaily")||
-                    intent.getStringExtra("fromwhere").equals("delete_succeed"))){
-                startActivity(new Intent(activity,OAActivity.class));
-                finish();
+        if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere"))
+                && intent.getStringExtra("fromwhere").equals("nosubmitdaily")){
+            finish();
         }else {
+            startActivity(new Intent(activity, OAActivity.class));
             finish();
         }
         super.onBackPressed();