Skip to content

W
workoffice
提交 53c5224f authored 作者: lgd's avatar lgd
浏览文件
操作

1.添加提前结束审核信息

上级 20e9c9b6
隐藏空白字符变更
内嵌 并排
正在显示 包含 142 行增加 和 30 行删除
app/src/main/java/com/wd/workoffice/bean/EndApplyBean.java
浏览文件 @ 53c5224f
...@@ -119,7 +119,7 @@ public class EndApplyBean { ...@@ -119,7 +119,7 @@ public class EndApplyBean {
private String createdTime; private String createdTime;
private Object updatedBy; private Object updatedBy;
private Object updatedByName; private Object updatedByName;
private Object updatedTime; private String updatedTime;
private Object commenceFromId; private Object commenceFromId;
private Object createdType; private Object createdType;
private int id; private int id;
...@@ -127,7 +127,7 @@ public class EndApplyBean { ...@@ -127,7 +127,7 @@ public class EndApplyBean {
private String orderType; private String orderType;
private String status; private String status;
private String applyRemark; private String applyRemark;
private Object auditRemark; private String auditRemark;
private String serialNumber; private String serialNumber;
private Object deptIdList; private Object deptIdList;
private Object ownId; private Object ownId;
...@@ -139,7 +139,7 @@ public class EndApplyBean { ...@@ -139,7 +139,7 @@ public class EndApplyBean {
private String applyDeptName; private String applyDeptName;
private String applyUserName; private String applyUserName;
private Object auditDeptName; private Object auditDeptName;
private Object auditUserName; private String auditUserName;
private int canAuditDeptId; private int canAuditDeptId;
public int getCreatedBy() { public int getCreatedBy() {
...@@ -182,11 +182,11 @@ public class EndApplyBean { ...@@ -182,11 +182,11 @@ public class EndApplyBean {
this.updatedByName = updatedByName; this.updatedByName = updatedByName;
} }
public Object getUpdatedTime() { public String getUpdatedTime() {
return updatedTime; return updatedTime;
} }
public void setUpdatedTime(Object updatedTime) { public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime; this.updatedTime = updatedTime;
} }
...@@ -246,11 +246,11 @@ public class EndApplyBean { ...@@ -246,11 +246,11 @@ public class EndApplyBean {
this.applyRemark = applyRemark; this.applyRemark = applyRemark;
} }
public Object getAuditRemark() { public String getAuditRemark() {
return auditRemark; return auditRemark;
} }
public void setAuditRemark(Object auditRemark) { public void setAuditRemark(String auditRemark) {
this.auditRemark = auditRemark; this.auditRemark = auditRemark;
} }
...@@ -342,11 +342,11 @@ public class EndApplyBean { ...@@ -342,11 +342,11 @@ public class EndApplyBean {
this.auditDeptName = auditDeptName; this.auditDeptName = auditDeptName;
} }
public Object getAuditUserName() { public String getAuditUserName() {
return auditUserName; return auditUserName;
} }
public void setAuditUserName(Object auditUserName) { public void setAuditUserName(String auditUserName) {
this.auditUserName = auditUserName; this.auditUserName = auditUserName;
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/EndApplyDetailActivity.java
浏览文件 @ 53c5224f
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -53,6 +54,16 @@ public class EndApplyDetailActivity extends WorkToolBarActivity { ...@@ -53,6 +54,16 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
TextView tvTime; TextView tvTime;
@BindView(R.id.tv_remark) @BindView(R.id.tv_remark)
TextView tvRemark; TextView tvRemark;
@BindView(R.id.tv_check_person)
TextView tvCheckPerson;
@BindView(R.id.tv_check_time)
TextView tvCheckTime;
@BindView(R.id.tv_check_remark)
TextView tvCheckRemark;
@BindView(R.id.tv_check_status)
TextView tvCheckStatus;
@BindView(R.id.ll_check)
LinearLayout llCheck;
private Map<String, Object> param; private Map<String, Object> param;
private EndApplyBean.RecordsBean info; private EndApplyBean.RecordsBean info;
...@@ -73,6 +84,11 @@ public class EndApplyDetailActivity extends WorkToolBarActivity { ...@@ -73,6 +84,11 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
} }
llCheck.setVisibility(TextUtils.equals(info.getStatus(), "0") ? View.GONE : View.VISIBLE);
tvCheckTime.setText(info.getUpdatedTime());
tvCheckPerson.setText(info.getAuditUserName());
tvCheckRemark.setText(info.getAuditRemark());
tvCheckStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(info.getStatus())));
param = new HashMap<>(); param = new HashMap<>();
param.put("id", info.getId()); param.put("id", info.getId());
changePermission(); changePermission();
...@@ -187,4 +203,10 @@ public class EndApplyDetailActivity extends WorkToolBarActivity { ...@@ -187,4 +203,10 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
}); });
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
} }
app/src/main/res/layout/activity_end_apply_detail.xml
浏览文件 @ 53c5224f
...@@ -52,24 +52,6 @@ ...@@ -52,24 +52,6 @@
<View style="@style/ViewX" /> <View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="发货信息"
android:textSize="15sp" />
</LinearLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -116,12 +98,10 @@ ...@@ -116,12 +98,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="15sp" /> android:textSize="15sp" />
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<LinearLayout <LinearLayout
...@@ -137,7 +117,7 @@ ...@@ -137,7 +117,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="备注" android:text="申请备注"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
...@@ -148,7 +128,117 @@ ...@@ -148,7 +128,117 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_check"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核人"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_check_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核时间"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_check_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核备注"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_check_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</LinearLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核状态"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_check_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论