11:45

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PlatDailyAdapter.java

@@ -104,7 +104,7 @@ public class PlatDailyAdapter extends BaseAdapter {
         }else if(!TextUtils.isEmpty(pdata.get(position).getWd_status()) &&
                 pdata.get(position).getWd_status().equals("在录入")){
             viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-            viewHolder.WorkDailyStatus.setText("未提交");
+            viewHolder.WorkDailyStatus.setText("在录入");
             viewHolder.WorkDailyDelete.setVisibility(View.VISIBLE);
         }
         int VERSION_CODES = android.os.Build.VERSION.SDK_INT;

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -109,7 +109,7 @@ public class WorkDailyAdapter extends BaseAdapter {
         }else if(!TextUtils.isEmpty(mWorkDailyBeanList.get(position).getWD_STATUS()) &&
                 mWorkDailyBeanList.get(position).getWD_STATUS().equals("在录入")){
             viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-            viewHolder.WorkDailyStatus.setText("未提交");
+            viewHolder.WorkDailyStatus.setText("在录入");
             viewHolder.WorkDailyDelete.setVisibility(View.VISIBLE);
         }
         int VERSION_CODES = android.os.Build.VERSION.SDK_INT;

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

@@ -159,6 +159,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     }
                     ToastMessage("数据刷新完毕");
                     progressDialog.dismiss();
+                    tv_process_already.setEnabled(true);
                     break;
                 case SUSSCESS_already:
                     itemArray = JSON.parseObject(result).getJSONArray("data");
@@ -214,6 +215,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
+                    tv_process_already.setEnabled(true);
                     break;
                 case 0x16:
                     try {
@@ -245,6 +247,8 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
 
     private void initData() {
         if (CommonUtil.isNetWorkConnected(mContext)) {
+            progressDialog.show();
+            tv_process_already.setEnabled(false);
             loadProcessToDo(page);
         } else {
             mEmptyLayout.setErrorMessage("网络未连接!");
@@ -254,6 +258,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
     }
 
     private void initView() {
+
         mEmptyLayout = new EmptyLayout(this, mList.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);

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

@@ -536,16 +536,22 @@ public class PlatWDdetailyActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         String r_for_s_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("r_for_s_result", r_for_s_result);
-                        ToastMessage("反提交成功");
-                        startActivity(new Intent(activity, WorkDailyAddActivity.class)
-                                .putExtra("caller", mCaller)
-                                .putExtra("id", mkeyValue)
-                                .putExtra("rs_summary", summary)
-                                .putExtra("rs_plan", plan)
-                                .putExtra("rs_experience", experience)
-                                .putExtra("resubmit", "resubmit"));
-                        Log.i("doresubmit_id", mkeyValue + "");
-                        finish();
+                        if (JSON.parseObject(r_for_s_result).containsKey("success") && JSON.parseObject(r_for_s_result).getBoolean("success")){
+                            ToastMessage("反提交成功");
+                            startActivity(new Intent(activity, WorkDailyAddActivity.class)
+                                    .putExtra("caller", mCaller)
+                                    .putExtra("id", mkeyValue)
+                                    .putExtra("rs_summary", summary)
+                                    .putExtra("rs_plan", plan)
+                                    .putExtra("rs_experience", experience)
+                                    .putExtra("resubmit", "resubmit"));
+                            Log.i("doresubmit_id", mkeyValue + "");
+                            finish();
+                        }else {
+                            String error = JSON.parseObject(r_for_s_result).getString("error");
+                            ToastMessage(error == null ? "反提交失败" : error);
+                        }
+
                     }
                     break;
                 case DELETE_OF_DELETEAPPFL:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -596,10 +596,10 @@ public class FormDetailActivity extends BaseActivity {
                         doc_detail_key.add("加班明细" + num);doc_detail_value.add("");
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[0].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[0].toString());
-                        doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[2].toString());
-                        doc_detail_value.add(array.getJSONObject(i).values().toArray()[2].toString());
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[1].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[1].toString());
+                        doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[2].toString());
+                        doc_detail_value.add(array.getJSONObject(i).values().toArray()[2].toString());
                     }
                 }
             }

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepActivity.java

@@ -13,6 +13,8 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.Display;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
@@ -22,6 +24,7 @@ import com.baidu.android.pushservice.PushManager;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.me.SettingActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.newpedo.bean.StepEntity;
 import com.xzjmyk.pm.newpedo.calendar.BeforeOrAfterCalendarView;
@@ -282,4 +285,23 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         //记得解绑Service，不然多次绑定Service会异常
         if (isBind) this.unbindService(conn);
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home){
+            startActivity(new Intent(getApplicationContext(), SettingActivity.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        startActivity(new Intent(getApplicationContext(), SettingActivity.class));
+        super.onBackPressed();
+    }
 }