|
|
@@ -101,6 +101,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
|
|
|
private String real_status;
|
|
|
private String emCode;
|
|
|
private View hide_above_af;
|
|
|
+ private String last_status;
|
|
|
|
|
|
|
|
|
@Override
|
|
|
@@ -180,7 +181,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
|
|
|
Log.i("mCaller", mCaller);
|
|
|
Log.isLoggable("keyValue", mkeyValue);
|
|
|
Log.i("real_status", real_status);
|
|
|
- SetComDocStatus(real_status);
|
|
|
+
|
|
|
//当获取到正确的单据caller和单据id时
|
|
|
if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
|
|
|
if ("Ask4Leave".equals(mCaller)) {
|
|
|
@@ -385,6 +386,18 @@ public class CommonDocDetailsActivity extends BaseActivity {
|
|
|
Log.i("em_number", 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"))) {
|
|
|
+ if (!fd_field.equals("null")) {
|
|
|
+ last_status = formdataArray.getJSONObject(0).getString(fd_field);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ SetComDocStatus(real_status); //显示单据提交状态
|
|
|
getapplypeomsg(em_number);
|
|
|
}
|
|
|
mCommonDocMainMsgAdapter.setmFormconfigsBean(mFormconfigsBean);
|
|
|
@@ -436,9 +449,17 @@ public class CommonDocDetailsActivity extends BaseActivity {
|
|
|
status_tv.setText("已审批");
|
|
|
resanddel_ll.setVisibility(View.GONE);
|
|
|
} else if (real_status.equals("已提交")) {
|
|
|
- status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
|
|
|
- status_tv.setText("待审批");
|
|
|
- resanddel_ll.setVisibility(View.VISIBLE);
|
|
|
+
|
|
|
+ if (!TextUtils.isEmpty(last_status) && last_status.equals("已审核")){
|
|
|
+ status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
|
|
|
+ status_tv.setText("已审批");
|
|
|
+ resanddel_ll.setVisibility(View.GONE);
|
|
|
+ }else {
|
|
|
+ status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
|
|
|
+ status_tv.setText("待审批");
|
|
|
+ resanddel_ll.setVisibility(View.VISIBLE);
|
|
|
+ }
|
|
|
+
|
|
|
} else if (real_status.equals("在录入")) {
|
|
|
status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.titleBlue));
|
|
|
status_tv.setText("未提交");
|