Skip to content

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

1.修改bug 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 5c50b4e1
隐藏空白字符变更
内嵌 并排
正在显示 包含 91 行增加 和 79 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialDetailActivity.java
浏览文件 @ 177039f5
package com.wd.workoffice.ui.activity.bat.work;
import android.text.Editable;
import android.os.Bundle;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
......@@ -68,6 +67,8 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
TextView tvAgree;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.ll_check)
LinearLayout llCheck;
private MoneyOutBean.RecordsBean dataBean;
private Map<String, Object> param;
......@@ -80,16 +81,19 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
tvCode.setText(dataBean.getSerialNumber());
// tvDesc.setText();
tvPerson.setText(dataBean.getApplierName());
tvRemark.setText(dataBean.getAuditRemark());
tvReviewRemark.setText(dataBean.getApplyRemark());
tvRemark.setText(dataBean.getApplyRemark());
tvReviewRemark.setText(dataBean.getAuditRemark());
tvPrice.setText(MathUtils.converData(String.valueOf(dataBean.getApplyAmount()), 3));
tvProcess.setText(dataBean.getProcessName());
tvReview.setText(dataBean.getUpdatedByName());
tvReviewTime.setText(dataBean.getUpdatedTime());
tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(dataBean.getStatus())));
tvTime.setText(dataBean.getCreatedTime());
if (!TextUtils.equals(dataBean.getStatus(),"0")){
if (!TextUtils.equals(dataBean.getStatus(), "0")) {
llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.VISIBLE);
} else {
llCheck.setVisibility(View.GONE);
}
param = WorkUtils.simpleParam();
param.put("id", dataBean.getId());
......@@ -147,7 +151,7 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -204,4 +208,5 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialPayActivity.java
浏览文件 @ 177039f5
......@@ -77,7 +77,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
//0未审核 1已通过 2不通过
if (TextUtils.equals(value, "全部类型")) {
param.put("status", "");
} else if (TextUtils.equals(value, "未审核")) {
} else if (TextUtils.equals(value, "待审核")) {
param.put("status", "0");
} else if (TextUtils.equals(value, "已通过")) {
param.put("status", "1");
......
app/src/main/res/layout/activity_work_financial_out_detail.xml
浏览文件 @ 177039f5
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_bottom"
......@@ -38,8 +37,8 @@
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_above="@id/ll_bottom"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom">
<LinearLayout
android:layout_width="match_parent"
......@@ -245,7 +244,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="备注"
android:text="申请备注"
android:textSize="14sp" />
<TextView
......@@ -261,83 +260,90 @@
<View style="@style/dividerX" />
<RelativeLayout
<LinearLayout
android:id="@+id/ll_check"
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">
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="审核人"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_review"
android:layout_width="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="14sp" />
<TextView
android:id="@+id/tv_review"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_sup"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_sup"
android:textSize="14sp" />
</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_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="14sp" />
<TextView
android:id="@+id/tv_review_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_sup"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="审核时间"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_review_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_sup"
android:textSize="14sp" />
</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">
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="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核备注"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_review_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_review_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>
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/fg_pro_stock.xml
浏览文件 @ 177039f5
......@@ -114,13 +114,14 @@
android:orientation="vertical">
<TextView
android:id="@+id/tv_stock4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textSize="22sp" />
<TextView
android:id="@+id/tv_stock4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5mm"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论