Skip to content

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

1.修改发货，外采购详情 

2.//TODO erp用户激活测试，忘记/重置密码测试，审核规则，领用申请列表/退件列表/参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，刷新token
上级 366ef0c7
隐藏空白字符变更
内嵌 并排
正在显示 包含 182 行增加 和 28 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ b1c6b0a7
......@@ -1117,19 +1117,38 @@ public interface ApiService {
Observable<BaseBean> productApplyList(@QueryMap Map<String, Object> param);
/**
* 获取产品去向(搜索置换产品)
*
* @return
*/
@GET("/saleOrder/oneInfo/{orderId}")
Observable<BaseBean> saleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
* @return
*/
@GET("/package-order/oneInfo/{orderId}")
Observable<BaseBean> productOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
* @return
*/
@GET("/purchaseOrder/oneInfo/{orderId}")
Observable<BaseBean> purchaseOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
* @return
*/
@GET("/insideOrder/oneInfo/{orderId}")
Observable<BaseBean> insideOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
* @return
*/
@GET("/crucibleOrder/oneInfo/{orderId}")
Observable<BaseBean> crucibleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
* @return
......@@ -1144,6 +1163,21 @@ public interface ApiService {
@GET("/send-out-store-apply/page/list")
Observable<BaseBean> sendApplyList(@QueryMap Map<String, Object> param);
/**
* 获取发货申请分页列表
*
* @return
*/
@GET("send-out-store-apply/po/page/list")
Observable<BaseBean> sendPoApplyList(@QueryMap Map<String, Object> param);
/**
* 获取发货申请分页列表
*
* @return
*/
@GET("send-out-store-apply/co/page/list")
Observable<BaseBean> sendCoApplyList(@QueryMap Map<String, Object> param);
/**
* 审批发货申请
*
......@@ -1151,6 +1185,20 @@ public interface ApiService {
*/
@PUT("/send-out-store-apply/status")
Observable<BaseBean> sendApplyCheck(@Body RequestBody requestBody);
/**
* 审批发货申请
*
* @return
*/
@PUT("/send-out-store-apply/co/status")
Observable<BaseBean> sendCoApplyCheck(@Body RequestBody requestBody);
/**
* 审批发货申请
*
* @return
*/
@PUT("/send-out-store-apply/po/status")
Observable<BaseBean> sendPoApplyCheck(@Body RequestBody requestBody);
/**
* _3获取发货申请详细信息列表
......@@ -1168,6 +1216,21 @@ public interface ApiService {
@POST("/procedureStart/so/applyOutStock/{orderId}")
Observable<BaseBean> sendApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
* _step6_1发起发货申请
*
* @return
*/
@POST("/procedureStart/co/applyOutStock/{orderId}")
Observable<BaseBean> sendCoApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
* _step6_1发起发货申请
*
* @return
*/
@POST("/procedureStart/po/applyOutStock/{orderId}")
Observable<BaseBean> sendPoApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
* _step5_1-发起提前结束申请
*
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ b1c6b0a7
......@@ -184,7 +184,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
}
private void getData() {
RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
RtfUtils.getRtf().crucibleOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ b1c6b0a7
......@@ -168,7 +168,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
}
private void getData() {
RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
......@@ -289,7 +289,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
}
@OnClick({ R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
@OnClick({R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
......@@ -309,7 +309,13 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
if (dataBean == null) {
toast("正在加载中，请稍后");
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ b1c6b0a7
package com.wd.workoffice.ui.activity.bat.order;
import android.content.DialogInterface;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
......@@ -23,7 +21,6 @@ import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.OrderDetailProductAdapter;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.ui.adapter.OutOrderDetailProductAdapter;
import com.wd.workoffice.util.DialogUtils;
......@@ -232,7 +229,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
tvOrderNo.setText(dataBean.getId());
tvTime.setText(dataBean.getCreatedTime());
tvSendTime.setText(dataBean.getRequireTime());
tvDesc.setText(dataBean.getAttrName());
tvOrderDesc.setText(dataBean.getAttrName());
tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
tvSupplier.setText(dataBean.getSupplierName());
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
......@@ -332,7 +329,13 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
if (dataBean == null) {
toast("正在加载中，请稍后");
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProFlowActivity.java
浏览文件 @ b1c6b0a7
......@@ -48,7 +48,7 @@ public class ProFlowActivity extends WorkToolBarActivity {
@Override
protected void initData() {
tvName.setText(getIntent().getStringExtra("product"));
tvName.setText(String.format("%s(%s)", getIntent().getStringExtra("product"), getIntent().getStringExtra("simpleCode")));
FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>();
ProFlowFragment proFlowFragment = new ProFlowFragment();
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @ b1c6b0a7
......@@ -99,7 +99,7 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
}
private void getData() {
RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
RtfUtils.getRtf().productOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ b1c6b0a7
......@@ -302,7 +302,13 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
if (dataBean == null) {
toast("正在加载中，请稍后");
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyActivity.java
浏览文件 @ b1c6b0a7
......@@ -35,6 +35,7 @@ public class SendApplyActivity extends WorkToolBarActivity {
"待审核", "已通过", "已驳回"};
private String order[] = {
"0", "1", "2"};
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -51,6 +52,7 @@ public class SendApplyActivity extends WorkToolBarActivity {
Bundle bundle = new Bundle();
bundle.putString("state", order[i]);
bundle.putString("orderId", getIntent().getStringExtra("orderId"));
bundle.putString("orderType", getIntent().getStringExtra("orderType"));
saleFragment.setArguments(bundle);
data.add(saleFragment);
......@@ -81,7 +83,9 @@ public class SendApplyActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
startActivity(SendApplyAddActivity.class, "id",getIntent().getStringExtra("orderId"));
startActivity(SendApplyAddActivity.class,
"orderType", getIntent().getStringExtra("orderType"),
"id", getIntent().getStringExtra("orderId"));
break;
}
return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyAddActivity.java
浏览文件 @ b1c6b0a7
......@@ -18,6 +18,7 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.event.SendWeightEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
......@@ -44,6 +45,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
......@@ -80,6 +82,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
private Map<String, Object> param;
private OrderDetail dataBean;
private int clientId;
private String orderType;
@Override
protected void initView() {
......@@ -89,12 +92,13 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
@Override
protected void initData() {
orderType = getIntent().getStringExtra("orderType");
dataList = new ArrayList<>();
dataAdapter = new WorkSendApplyAddAdapter(R.layout.item_send_apply_add, dataList);
dataAdapter.bindToRecyclerView(rvData);
param = new HashMap<>();
param.put("orderId", getIntent().getStringExtra("id"));
param.put("payer",2);
param.put("payer", 2);
getData();
}
......@@ -119,7 +123,23 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
}
private void getData() {
RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"), "3");
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().purchaseOrderDetail(getIntent().getStringExtra("id"), "3");
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"), "3");
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
observable = RtfUtils.getRtf().productOrderDetail(getIntent().getStringExtra("id"), "3");
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "3");
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().crucibleOrderDetail(getIntent().getStringExtra("id"), "3");
} else {
observable = RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"), "3");
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
......@@ -168,7 +188,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
if (entry.getValue()) {
OrderDetail.OrderItemsBean recordsBean = dataList.get(entry.getKey());
JSONObject returnData = new JSONObject();
if (TextUtils.isEmpty(recordsBean.getChooseNum())||Double.valueOf(recordsBean.getChooseNum()) == 0d) {
if (TextUtils.isEmpty(recordsBean.getChooseNum()) || Double.valueOf(recordsBean.getChooseNum()) == 0d) {
toast("请选择发货数量");
return false;
}
......@@ -205,7 +225,17 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
param.put("fareMoney", price);
param.put("applyRemark", remark);
param.put("logisticsId", clientId);
RtfUtils.getRtf().sendApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().sendApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().sendPoApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().sendCoApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().sendApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyDetailActivity.java
浏览文件 @ b1c6b0a7
......@@ -17,6 +17,7 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.SendApplyBean;
import com.wd.workoffice.bean.SendApplyDetailBean;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.SendApplyDetailAdapter;
......@@ -36,6 +37,7 @@ 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;
/**
......@@ -77,6 +79,7 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
private SendApplyDetailAdapter dataAdapter;
private Map<String, Object> param;
private SendApplyBean.RecordsBean info;
private String orderType;
@Override
protected void initView() {
......@@ -86,6 +89,7 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
@Override
protected void initData() {
orderType = getIntent().getStringExtra("orderType");
info = JSON.parseObject(getIntent().getStringExtra("info"), SendApplyBean.RecordsBean.class);
getData(info.getId() + "");
tvTime.setText(info.getCreatedTime());
......@@ -213,7 +217,17 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
param.put("status", status);
param.put("auditRemark", remark);
param.put("id", info.getId());
RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().sendPoApplyCheck(WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().sendCoApplyCheck(WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ b1c6b0a7
......@@ -318,7 +318,13 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
if (dataBean == null) {
toast("正在加载中，请稍后");
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/OrderProcessAdapter.java
浏览文件 @ b1c6b0a7
......@@ -43,7 +43,7 @@ public class OrderProcessAdapter extends BaseQuickAdapter<OrderDetail.OrderFlows
helper.setGone(R.id.iv_last, false);
helper.setGone(R.id.iv_simple, true);
}
helper.setText(R.id.tv_status, item.getEventCodeName());
helper.setText(R.id.tv_status, item.getOptUserName() + item.getEventCodeName());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_remark, "备注：" + item.getOptComment());
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java
浏览文件 @ b1c6b0a7
......@@ -62,6 +62,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
case 600:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/ProProcessAdapter.java
浏览文件 @ b1c6b0a7
......@@ -38,7 +38,7 @@ public class ProProcessAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBe
helper.setGone(R.id.iv_last, false);
helper.setGone(R.id.iv_simple, true);
}
helper.setText(R.id.tv_status, item.getEventCodeName());
helper.setText(R.id.tv_status, item.getOptUserName() + item.getEventCodeName());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_remark, "备注：" + item.getOptComment());
}
......
app/src/main/java/com/wd/workoffice/ui/fg/SendApplyFragment.java
浏览文件 @ b1c6b0a7
......@@ -94,7 +94,17 @@ public class SendApplyFragment extends WorkBaseFg {
}
private void getData() {
RtfUtils.getRtf().sendApplyList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().sendApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().sendPoApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().sendCoApplyList(param);
} else {
observable = RtfUtils.getRtf().addStockApplyList(param);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -147,7 +157,9 @@ public class SendApplyFragment extends WorkBaseFg {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(SendApplyDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
startActivity(SendApplyDetailActivity.class,
"orderType", orderType,
"info", JSON.toJSONString(dataList.get(position)));
}
});
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
......@@ -220,7 +232,17 @@ public class SendApplyFragment extends WorkBaseFg {
param.put("status", status);
param.put("auditRemark", remark);
param.put("id", id);
RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().sendPoApplyCheck(WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().sendCoApplyCheck(WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -239,9 +261,7 @@ public class SendApplyFragment extends WorkBaseFg {
return;
}
toast("操作成功");
page = 1;
param.put("current", page);
getData();
EventBus.getDefault().post(new CheckSendEvent());
}
});
}
......
app/src/main/res/layout/activity_out_order.xml
浏览文件 @ b1c6b0a7
......@@ -417,6 +417,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:visibility="gone"
android:paddingVertical="9mm">
<TextView
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论