提交 9d2c533d authored 作者: lgd's avatar lgd

1.订单条件下拉刷新

2.//TODO ,退件详情,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,编辑任务担当无法修改.支数参数
上级 a3693db7
......@@ -4,6 +4,7 @@ import android.os.Bundle;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
......@@ -37,6 +38,8 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
......@@ -44,6 +47,7 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
private ProOutAdapter orderAdapter;
private int page = 1;
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
......@@ -61,7 +65,7 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
param = WorkUtils.pageKey();
param.put("orderStatus", state);
param.put("current", page);
param.put("identity", identity);
param.put("identity", identity);
page = 1;
param.put("current", page);
saleSalePresenter.getOutOrder(param);
......@@ -70,6 +74,11 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
saleSalePresenter.getOrder(param);
});
orderAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
......@@ -81,7 +90,7 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(OutOrderDetailActivity.class,
"identity",identity,
"identity", identity,
"id", orderList.get(position).getId() + "",
"status", orderList.get(position).getStatus() + "");
}
......@@ -111,6 +120,7 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
public void outList(List<OrderBean> dataList) {
if (page == 1) {
srlRefresh.finishRefresh();
orderList.clear();
orderList.addAll(dataList);
orderAdapter.notifyDataSetChanged();
......
......@@ -4,6 +4,7 @@ import android.os.Bundle;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
......@@ -38,6 +39,8 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
......@@ -45,6 +48,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
private ProSaleAdapter orderAdapter;
private int page = 1;
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
......@@ -62,7 +66,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
param = WorkUtils.pageKey();
param.put("orderStatus", state);
param.put("current", page);
param.put("identity", identity);
param.put("identity", identity);
page = 1;
param.put("current", page);
saleSalePresenter.getOrder(param);
......@@ -71,6 +75,11 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
saleSalePresenter.getOrder(param);
});
orderAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
......@@ -81,12 +90,12 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())){
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class,
"identity",identity,
"identity", identity,
"id", orderList.get(position).getId() + "",
"status", orderList.get(position).getStatus() + "");
}
......@@ -111,6 +120,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
public void saleList(List<OrderBean> dataList) {
if (page == 1) {
srlRefresh.finishRefresh();
orderList.clear();
orderList.addAll(dataList);
orderAdapter.notifyDataSetChanged();
......@@ -141,6 +151,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
public void supplierList(List<OrderBean> dataList) {
}
@Override
public void onStart() {
super.onStart();
......
......@@ -4,6 +4,7 @@ import android.os.Bundle;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
......@@ -38,6 +39,8 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
......@@ -45,6 +48,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
private ProSupplierAdapter orderAdapter;
private int page = 1;
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
......@@ -62,7 +66,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
param = WorkUtils.pageKey();
param.put("orderStatus", state);
param.put("current", page);
param.put("identity", identity);
param.put("identity", identity);
page = 1;
param.put("current", page);
saleSalePresenter.getSupplierOrder(param);
......@@ -71,6 +75,11 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
saleSalePresenter.getOrder(param);
});
orderAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
......@@ -81,12 +90,12 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class,
"identity",identity,
"identity", identity,
"id", orderList.get(position).getId() + "",
"status", orderList.get(position).getStatus() + "");
}
......@@ -126,6 +135,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
@Override
public void supplierList(List<OrderBean> dataList) {
if (page == 1) {
srlRefresh.finishRefresh();
orderList.clear();
orderList.addAll(dataList);
orderAdapter.notifyDataSetChanged();
......@@ -141,6 +151,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
page++;
}
}
@Override
public void onStart() {
super.onStart();
......
......@@ -4,6 +4,7 @@ import android.os.Bundle;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
......@@ -38,6 +39,8 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
......@@ -45,6 +48,7 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
private SaleOutAdapter orderAdapter;
private int page = 1;
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
......@@ -63,7 +67,7 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
param = WorkUtils.pageKey();
param.put("orderStatus", state);
param.put("current", page);
param.put("identity", identity);
param.put("identity", identity);
page = 1;
param.put("current", page);
saleSalePresenter.getOutOrder(param);
......@@ -72,6 +76,11 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
saleSalePresenter.getOrder(param);
});
orderAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
......@@ -82,12 +91,12 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class,
"identity",identity,
"identity", identity,
"id", orderList.get(position).getId() + "",
"status", orderList.get(position).getStatus() + "");
}
......@@ -117,6 +126,7 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
public void outList(List<OrderBean> dataList) {
if (page == 1) {
srlRefresh.finishRefresh();
orderList.clear();
orderList.addAll(dataList);
orderAdapter.notifyDataSetChanged();
......@@ -142,6 +152,7 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
public void supplierList(List<OrderBean> dataList) {
}
@Override
public void onStart() {
super.onStart();
......
......@@ -4,6 +4,7 @@ import android.os.Bundle;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
......@@ -38,6 +39,8 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
......@@ -45,6 +48,7 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
private SaleSupplierAdapter orderAdapter;
private int page = 1;
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
......@@ -63,7 +67,7 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
param = WorkUtils.pageKey();
param.put("orderStatus", state);
param.put("current", page);
param.put("identity", identity);
param.put("identity", identity);
page = 1;
param.put("current", page);
saleSalePresenter.getSupplierOrder(param);
......@@ -72,6 +76,11 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
saleSalePresenter.getOrder(param);
});
orderAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
......@@ -82,12 +91,12 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class,
"identity",identity,
"identity", identity,
"id", orderList.get(position).getId() + "",
"status", orderList.get(position).getStatus() + "");
}
......@@ -127,6 +136,7 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
@Override
public void supplierList(List<OrderBean> dataList) {
if (page == 1) {
srlRefresh.finishRefresh();
orderList.clear();
orderList.addAll(dataList);
orderAdapter.notifyDataSetChanged();
......@@ -142,6 +152,7 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
page++;
}
}
@Override
public void onStart() {
super.onStart();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论