Skip to content

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

1.修改财税问题

上级 17918a14
隐藏空白字符变更
内嵌 并排
正在显示 包含 180 行增加 和 21 行删除
app/src/main/java/com/wd/workoffice/bean/FinancialBean.java
浏览文件 @ 1a32836f
...@@ -45,7 +45,7 @@ public class FinancialBean { ...@@ -45,7 +45,7 @@ public class FinancialBean {
*/ */
private int createdBy; private int createdBy;
private Object createdByName; private String createdByName;
private String createdTime; private String createdTime;
private Object updatedBy; private Object updatedBy;
private Object updatedByName; private Object updatedByName;
...@@ -56,7 +56,7 @@ public class FinancialBean { ...@@ -56,7 +56,7 @@ public class FinancialBean {
private double totalMoney; private double totalMoney;
private String status; private String status;
private String applyRemark; private String applyRemark;
private Object auditRemark; private String auditRemark;
private int applierId; private int applierId;
private Object auditorId; private Object auditorId;
private String applierName; private String applierName;
...@@ -73,11 +73,11 @@ public class FinancialBean { ...@@ -73,11 +73,11 @@ public class FinancialBean {
this.createdBy = createdBy; this.createdBy = createdBy;
} }
public Object getCreatedByName() { public String getCreatedByName() {
return createdByName; return createdByName;
} }
public void setCreatedByName(Object createdByName) { public void setCreatedByName(String createdByName) {
this.createdByName = createdByName; this.createdByName = createdByName;
} }
...@@ -161,11 +161,11 @@ public class FinancialBean { ...@@ -161,11 +161,11 @@ public class FinancialBean {
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;
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreFinancialDetailActivity.java
浏览文件 @ 1a32836f
package com.wd.workoffice.ui.activity.bat.store; package com.wd.workoffice.ui.activity.bat.store;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
...@@ -17,14 +15,11 @@ import com.wd.workoffice.app.BaseBean; ...@@ -17,14 +15,11 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.FinancailDetailBean; import com.wd.workoffice.bean.FinancailDetailBean;
import com.wd.workoffice.bean.FinancialBean; import com.wd.workoffice.bean.FinancialBean;
import com.wd.workoffice.bean.LogisticDetailBean;
import com.wd.workoffice.bean.event.CheckFinancialEvent; import com.wd.workoffice.bean.event.CheckFinancialEvent;
import com.wd.workoffice.bean.event.CheckLogisticEvent;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.FinancialDetailAdapter; import com.wd.workoffice.ui.adapter.FinancialDetailAdapter;
import com.wd.workoffice.ui.adapter.WorkLogisticDetailAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -65,6 +60,16 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity { ...@@ -65,6 +60,16 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity {
TextView tvRemark; TextView tvRemark;
@BindView(R.id.rv_data) @BindView(R.id.rv_data)
RecyclerView rvData; RecyclerView rvData;
@BindView(R.id.tv_people)
TextView tvPeople;
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.tv_check_desc)
TextView tvCheckDesc;
@BindView(R.id.tv_check_remark)
TextView tvCheckRemark;
@BindView(R.id.ll_check_remark)
LinearLayout llCheckRemark;
private List<FinancailDetailBean> dataList; private List<FinancailDetailBean> dataList;
private FinancialDetailAdapter dataAdapter; private FinancialDetailAdapter dataAdapter;
private Map<String, Object> param; private Map<String, Object> param;
...@@ -81,12 +86,17 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity { ...@@ -81,12 +86,17 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity {
getData(info.getId() + ""); getData(info.getId() + "");
tvTime.setText(info.getPayDate() + ""); tvTime.setText(info.getPayDate() + "");
tvRemark.setText(info.getApplyRemark()); tvRemark.setText(info.getApplyRemark());
tvPeople.setText(info.getApplierName());
tvDep.setText(info.getPayDeptName());
tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(info.getStatus()))); tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(info.getStatus())));
tvCheckRemark.setText(info.getAuditRemark());
if (TextUtils.equals(info.getStatus(), "0") || TextUtils.equals(info.getStatus(), "3")) { if (TextUtils.equals(info.getStatus(), "0") || TextUtils.equals(info.getStatus(), "3")) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llCheckRemark.setVisibility(View.GONE);
changePermission(); changePermission();
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
tvCheckDesc.setText(TextUtils.equals(info.getStatus(), "1") ? "通过备注" : "驳回备注");
} }
dataList = new ArrayList<>(); dataList = new ArrayList<>();
dataAdapter = new FinancialDetailAdapter(R.layout.item_financial_detail, dataList, info.getStatus()); dataAdapter = new FinancialDetailAdapter(R.layout.item_financial_detail, dataList, info.getStatus());
...@@ -174,7 +184,7 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity { ...@@ -174,7 +184,7 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity {
tvOk.setOnClickListener(new View.OnClickListener() { tvOk.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (status != 1&&TextUtils.isEmpty(etRemark.getText().toString())) { if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注"); toast("请填写备注");
return; return;
} }
...@@ -228,6 +238,10 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity { ...@@ -228,6 +238,10 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity {
toast("请标记错误并填写错误原因"); toast("请标记错误并填写错误原因");
return false; return false;
} }
if (entries.size() > 0 && status == 1) {
toast("标记错误的单据不允许通过");
return false;
}
List<JSONObject> financeTaxItems = new ArrayList<>(); List<JSONObject> financeTaxItems = new ArrayList<>();
for (int i = 0; i < dataList.size(); i++) { for (int i = 0; i < dataList.size(); i++) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreFinancialModifyActivity.java
浏览文件 @ 1a32836f
...@@ -106,9 +106,12 @@ public class StoreFinancialModifyActivity extends WorkToolBarActivity { ...@@ -106,9 +106,12 @@ public class StoreFinancialModifyActivity extends WorkToolBarActivity {
toast(data.getMessage()); toast(data.getMessage());
return; return;
} }
List<FinancailDetailBean> dataBean = JSON.parseArray(data.getData().toString(), FinancailDetailBean.class); JSONObject dataJson = JSON.parseObject(data.getData().toString());
dataList.addAll(dataBean); if (dataJson!=null){
dataAdapter.notifyDataSetChanged(); List<FinancailDetailBean> dataBean = dataJson.getJSONArray("financeTaxItems").toJavaList(FinancailDetailBean.class);
dataList.addAll(dataBean);
dataAdapter.notifyDataSetChanged();
}
} }
}); });
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/FinancialAdapter.java
浏览文件 @ 1a32836f
...@@ -26,9 +26,12 @@ public class FinancialAdapter extends BaseQuickAdapter<FinancialBean.RecordsBean ...@@ -26,9 +26,12 @@ public class FinancialAdapter extends BaseQuickAdapter<FinancialBean.RecordsBean
@Override @Override
protected void convert(BaseViewHolder helper, FinancialBean.RecordsBean item) { protected void convert(BaseViewHolder helper, FinancialBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getSerialNumber());
helper.setText(R.id.tv_price, MathUtils.converData(item.getTotalMoney(),3)); helper.setText(R.id.tv_price, MathUtils.converData(item.getTotalMoney(),3));
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus()))); helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
helper.setText(R.id.tv_time, item.getPayDate() + ""); helper.setText(R.id.tv_time, item.getPayDate() + "");
helper.setText(R.id.tv_people, item.getApplierName() );
helper.setText(R.id.tv_dep, item.getPayDeptName() );
if (TextUtils.equals("2", item.getStatus())) { if (TextUtils.equals("2", item.getStatus())) {
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.addOnClickListener(R.id.tv_modify, R.id.tv_delete); helper.addOnClickListener(R.id.tv_modify, R.id.tv_delete);
......
app/src/main/java/com/wd/workoffice/ui/adapter/FinancialAddAdapter.java
浏览文件 @ 1a32836f
...@@ -68,9 +68,12 @@ public class FinancialAddAdapter extends BaseQuickAdapter<FinancialTypeBean, Bas ...@@ -68,9 +68,12 @@ public class FinancialAddAdapter extends BaseQuickAdapter<FinancialTypeBean, Bas
@Override @Override
public void onFocusChange(View v, boolean hasFocus) { public void onFocusChange(View v, boolean hasFocus) {
if (hasFocus) { if (hasFocus) {
if (TextUtils.equals("0", etNum.getText().toString())) { // if (TextUtils.equals("0", etNum.getText().toString())) {
etNum.setText(""); // etNum.setText("");
} // etNum.setFocusable(true);
// etNum.setFocusableInTouchMode(true);
// etNum.requestFocus();
// }
}else { }else {
if (TextUtils.isEmpty( etNum.getText().toString())) { if (TextUtils.isEmpty( etNum.getText().toString())) {
etNum.setText("0"); etNum.setText("0");
......
app/src/main/java/com/wd/workoffice/ui/adapter/FinancialDetailAdapter.java
浏览文件 @ 1a32836f
...@@ -57,7 +57,7 @@ public class FinancialDetailAdapter extends BaseQuickAdapter<FinancailDetailBean ...@@ -57,7 +57,7 @@ public class FinancialDetailAdapter extends BaseQuickAdapter<FinancailDetailBean
} else { } else {
helper.setText(R.id.tv_status, WorkUtils.getFinancialTypeStatus(item.getStatus())); helper.setText(R.id.tv_status, WorkUtils.getFinancialTypeStatus(item.getStatus()));
} }
switch (item.getStatus()) { switch (status) {
case "0": case "0":
// helper.setText(R.id.tv_status, WorkUtils.getFinancialTypeStatus("1")); // helper.setText(R.id.tv_status, WorkUtils.getFinancialTypeStatus("1"));
break; break;
...@@ -69,6 +69,10 @@ public class FinancialDetailAdapter extends BaseQuickAdapter<FinancailDetailBean ...@@ -69,6 +69,10 @@ public class FinancialDetailAdapter extends BaseQuickAdapter<FinancailDetailBean
case "2": case "2":
helper.setGone(R.id.tv_error, false); helper.setGone(R.id.tv_error, false);
break; break;
case "9":
helper.setGone(R.id.tv_error, false);
// helper.setText(R.id.tv_status, WorkUtils.getFinancialTypeStatus("1"));
break;
} }
EditText remark = helper.getView(R.id.et_remark); EditText remark = helper.getView(R.id.et_remark);
remark.addTextChangedListener(new TextWatcher() { remark.addTextChangedListener(new TextWatcher() {
......
app/src/main/res/layout/activity_financial_detail.xml
浏览文件 @ 1a32836f
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
android:background="@drawable/shape_red_btn" android:background="@drawable/shape_red_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:text="拒绝" android:text="驳回"
android:textColor="@color/white" /> android:textColor="@color/white" />
<TextView <TextView
...@@ -104,6 +104,58 @@ ...@@ -104,6 +104,58 @@
<View style="@style/dividerX" /> <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_people"
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_dep"
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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -128,13 +180,41 @@ ...@@ -128,13 +180,41 @@
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
<View style="@style/dividerX" />
<LinearLayout
android:id="@+id/ll_check_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:id="@+id/tv_check_desc"
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_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</LinearLayout>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/flexible_background" android:background="@color/flexible_background"
android:paddingVertical="10mm" android:paddingVertical="10mm"
android:paddingLeft="10mm" android:paddingLeft="10mm"
android:text="开票来源" android:text="财税子项"
android:textSize="15sp" /> android:textSize="15sp" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
......
app/src/main/res/layout/item_financial.xml
浏览文件 @ 1a32836f
...@@ -91,6 +91,58 @@ ...@@ -91,6 +91,58 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="申请人"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_people"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="申请部门"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论