Skip to content

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

1.收回款管理，审核 

2.//TODO erp用户激活测试，忘记/重置密码测试，产品下单还差附件，mes，消息，刷新token
上级 2fde70bc
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 242 行增加 和 24 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 748feb58
......@@ -681,7 +681,7 @@
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkFinancialAddActivity"
android:name=".ui.activity.bat.work.WorkFinancialMoneyAddActivity"
android:configChanges="keyboardHidden|orientation"
android:label="新增申请"
android:launchMode="singleTop"
......
app/src/main/java/com/wd/workoffice/bean/event/CheckMoneytEvent.java 0 → 100644
浏览文件 @ 748feb58
package com.wd.workoffice.bean.event;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class CheckMoneytEvent {
public CheckMoneytEvent() {
}
}
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 748feb58
......@@ -764,7 +764,7 @@ public interface ApiService {
/**
* 审批开票申请
* 回款申请
* orderType
* applyAmount
* applyDept
......@@ -778,7 +778,7 @@ public interface ApiService {
Observable<BaseBean> moneyBackApply(@Body RequestBody requestBody);
/**
* 审批开票申请
* 付款申请
* orderType
* applyAmount
* applyDept
......@@ -791,6 +791,33 @@ public interface ApiService {
@POST("/moneyPayApply/apply")
Observable<BaseBean> moneyPayApply(@Body RequestBody requestBody);
/**
* 审批回款
* orderType
* applyAmount
* applyDept
* customerId
* process
* applyRemark
*
* @return
*/
@PUT("/moneyBackApply/exam")
Observable<BaseBean> checkMoneyBack(@Body RequestBody requestBody);
/**
* 付款回款
* orderType
* applyAmount
* applyDept
* customerId
* process
* applyRemark
*
* @return
*/
@PUT("/moneyPayApply/exam")
Observable<BaseBean> checkMoneyPay(@Body RequestBody requestBody);
/**
* 为开票查询的订单
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleClientActivity.java
浏览文件 @ 748feb58
......@@ -81,7 +81,7 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
observable = RtfUtils.getRtf().getClient(param);
} else {
// param.put("deptId", getIntent().getStringExtra("depId"));
param.put("deptId", getIntent().getStringExtra("depId"));
observable = RtfUtils.getRtf().getClientOut(param);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialDetailActivity.java
浏览文件 @ 748feb58
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.bean.event.CheckMoneytEvent;
import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.Map;
import androidx.appcompat.app.AlertDialog;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* 工作台 - 财务 - 详情
......@@ -42,7 +63,14 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
TextView tvRemark;
@BindView(R.id.tv_review_remark)
TextView tvReviewRemark;
@BindView(R.id.tv_refuse)
TextView tvRefuse;
@BindView(R.id.tv_agree)
TextView tvAgree;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
private MoneyOutBean.RecordsBean dataBean;
private Map<String, Object> param;
@Override
protected void initView() {
......@@ -60,6 +88,9 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
tvReviewTime.setText(dataBean.getUpdatedTime());
tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(dataBean.getStatus())));
tvTime.setText(dataBean.getCreatedTime());
param = WorkUtils.simpleParam();
param.put("id",dataBean.getId());
param.put("applyAmount",dataBean.getApplyAmount());
}
@Override
......@@ -76,4 +107,97 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
return R.layout.activity_work_financial_out_detail;
}
@OnClick({R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
checkDialog(2);
break;
case R.id.tv_agree:
checkDialog(1);
break;
}
}
private void checkDialog(int status) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
tvDesc.setText(status == 1 ? "通过" : "拒绝");
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
check(status, etRemark.getText().toString());
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void check(int status, String remark) {
param.put("status", status);
param.put("auditRemark", remark);
Observable<BaseBean> observable = RtfUtils.getRtf().checkMoneyBack(WorkUtils.convertMapToBody(param));
if (TextUtils.equals("1",getIntent().getStringExtra("type"))){
observable = RtfUtils.getRtf().checkMoneyBack(WorkUtils.convertMapToBody(param));
}else {
observable = RtfUtils.getRtf().checkMoneyPay(WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
toast("操作成功");
EventBus.getDefault().post(new CheckMoneytEvent());
finish();
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialAddActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialMoneyAddActivity.java
浏览文件 @ 748feb58
......@@ -17,6 +17,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.CheckMoneytEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
......@@ -24,6 +25,8 @@ import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.Map;
import androidx.annotation.Nullable;
......@@ -40,7 +43,7 @@ import io.reactivex.disposables.Disposable;
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkFinancialAddActivity extends WorkToolBarActivity {
public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.rl_client)
......@@ -130,6 +133,9 @@ public class WorkFinancialAddActivity extends WorkToolBarActivity {
toast(data.getMessage());
return;
}
finish();
toast("操作成功");
EventBus.getDefault().post(new CheckMoneytEvent());
}
});
}
......@@ -165,11 +171,11 @@ public class WorkFinancialAddActivity extends WorkToolBarActivity {
switch (view.getId()) {
case R.id.rl_client:
if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
startActivityForResult(StoreSaleClientActivity.class, 10001,
"code", "CUSTOMER", "flag", "1");
startActivityForResult(StoreSaleClientActivity.class, 10002,
"code", "SUPPLIER","supplier","选择供应商","depId",UserKeeper.getInstance().getUserDepId(), "flag", "1");
} else {
startActivityForResult(StoreSaleClientActivity.class, 10001,
"code", "SUPPLIER", "flag", "1");
"code", "CUSTOMER", "flag", "1");
}
break;
case R.id.rl_order:
......@@ -188,8 +194,6 @@ public class WorkFinancialAddActivity extends WorkToolBarActivity {
toast("请输入金额");
return;
}
// param.put("process", PermissionType.);
param.put("applyRemark", etRemark.getText().toString());
param.put("applyDept", UserKeeper.getInstance().getUserDepId());
param.put("orderType", chooseType);
......@@ -206,13 +210,11 @@ public class WorkFinancialAddActivity extends WorkToolBarActivity {
String clientName = data.getStringExtra("clientName");
clientId = data.getIntExtra("id", 0);
tvClient.setText(clientName);
} else if (requestCode == 10002 && resultCode == 10002) {
String depName = data.getStringExtra("clientName");
clientId = data.getIntExtra("id", 0);
tvClient.setText(depName);
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialOutActivity.java
浏览文件 @ 748feb58
......@@ -12,6 +12,8 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.bean.event.CheckMoneytEvent;
import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -20,6 +22,9 @@ import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.FinancialOutFilterData;
import com.wd.workoffice.widget.DropDownMenu;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -152,7 +157,8 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class,"detail",JSON.toJSONString(dataList.get(position)));
startActivity(WorkFinancialDetailActivity.class,
"type","1","detail",JSON.toJSONString(dataList.get(position)));
}
});
}
......@@ -173,9 +179,28 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
startActivity(WorkFinancialAddActivity.class);
startActivity(WorkFinancialMoneyAddActivity.class);
break;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(CheckMoneytEvent event) {
page = 1;
param.put("current", page);
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialPayActivity.java
浏览文件 @ 748feb58
......@@ -12,15 +12,19 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.bean.event.CheckMoneytEvent;
import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkFinancialOutAdapter;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.FinancialOutFilterData;
import com.wd.workoffice.util.ddmfilter.FinancialPayFilterData;
import com.wd.workoffice.widget.DropDownMenu;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -153,7 +157,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class, "detail", JSON.toJSONString(dataList.get(position)));
startActivity(WorkFinancialDetailActivity.class, "type","2","detail", JSON.toJSONString(dataList.get(position)));
}
});
......@@ -175,9 +179,28 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
startActivity(WorkFinancialAddActivity.class, "supplier", "1");
startActivity(WorkFinancialMoneyAddActivity.class, "supplier", "1");
break;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(CheckMoneytEvent event) {
page = 1;
param.put("current", page);
getData();
}
}
app/src/main/res/layout/activity_financial_money_add.xml
浏览文件 @ 748feb58
......@@ -31,10 +31,11 @@
<LinearLayout
android:layout_toRightOf="@id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
android:gravity="center_vertical|right">
<TextView
android:id="@+id/tv_client"
......@@ -42,7 +43,9 @@
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择客户"
android:textSize="16sp"
android:textSize="15sp"
android:maxLines="1"
android:ellipsize="end"
android:textStyle="bold" />
<ImageView
......@@ -126,7 +129,7 @@
android:background="@null"
android:gravity="right"
android:hint="输入金额"
android:inputType="numberDecimal"
android:textSize="16sp"
android:textStyle="bold" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论