Skip to content

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

1.修改审核跳转

上级 cba9b65b
隐藏空白字符变更
内嵌 并排
正在显示 包含 202 行增加 和 176 行删除
app/src/main/java/com/wd/workoffice/app/Config.java
浏览文件 @ 8d0a2132
......@@ -4,7 +4,7 @@ import java.util.Arrays;
import java.util.List;
public interface Config {
Boolean DEBUG = true;
Boolean DEBUG = false;
String REGEX_USERNAME = "^[\\w]{4,16}(?<!_)$";
String REGEX_PASSWORD = "^[\\w]{6,16}(?<!_)$";
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 8d0a2132
......@@ -21,9 +21,8 @@ import retrofit2.http.Query;
* github: https://github.com/FlexibleXd
**/
public interface MesApiService {
// String DOMAIN = Config.DEBUG ? "http://121.36.41.30:9001/" : "http://zwang.bat100.net.cn:8000/";
String DOMAIN = Config.DEBUG ? "http://114.116.55.221/" : "http://192.168.3.32/";
String DOMAIN = Config.DEBUG ? "http://192.168.3.32/" : "http://114.116.55.221/";
/**
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/approval/WorkApprovalActivity.java
浏览文件 @ 8d0a2132
......@@ -22,6 +22,8 @@ import com.wd.workoffice.ui.activity.bat.order.ProductOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkContactsOpenTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkFinancialReceiveTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkFinancialTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.adapter.ApprovalAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -144,66 +146,74 @@ public class WorkApprovalActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
ApprovalBean.RecordsBean approval = dataList.get(position);
if (TextUtils.equals("SO_INVOICE", approval.getFlowCode())) {
startActivity(WorkContactsOpenTicketActivity.class);
} else {
if (TextUtils.equals(OrderType.SALE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.BUILD.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getId() + "");
}
}
approvalGoNext(approval);
}
});
}
private void approvalGoNext(ApprovalBean.RecordsBean approval) {
if (TextUtils.equals("SO_INVOICE", approval.getFlowCode()) ||
TextUtils.equals("PO_INVOICE", approval.getFlowCode()) || TextUtils.equals("AO_INVOICE", approval.getFlowCode())) {
startActivity(WorkFinancialTicketActivity.class);
} else if (TextUtils.equals("PO_RECEIPT_INVOICE", approval.getFlowCode()) ||
TextUtils.equals("FO_RECEIPT_INVOICE", approval.getFlowCode())) {
startActivity(WorkFinancialReceiveTicketActivity.class);
} else {
if (TextUtils.equals(OrderType.SALE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.BUILD.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getId() + "");
}
}
}
@Override
protected int layoutId() {
......
app/src/main/java/com/wd/workoffice/ui/fg/ApprovalFromMeFragment.java
浏览文件 @ 8d0a2132
......@@ -23,6 +23,8 @@ import com.wd.workoffice.ui.activity.bat.order.ProductOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkContactsOpenTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkFinancialReceiveTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkFinancialTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.adapter.ApprovalAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -145,67 +147,73 @@ public class ApprovalFromMeFragment extends WorkBaseFg {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
ApprovalBean.RecordsBean approval = dataList.get(position);
if (TextUtils.equals("SO_INVOICE", approval.getFlowCode())) {
startActivity(WorkContactsOpenTicketActivity.class);
} else {
if (TextUtils.equals(OrderType.SALE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.BUILD.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getId() + "");
}
}
approvalGoNext(approval);
}
});
}
private void approvalGoNext(ApprovalBean.RecordsBean approval) {
if (TextUtils.equals("SO_INVOICE", approval.getFlowCode()) ||
TextUtils.equals("PO_INVOICE", approval.getFlowCode()) || TextUtils.equals("AO_INVOICE", approval.getFlowCode())) {
startActivity(WorkFinancialTicketActivity.class);
} else if (TextUtils.equals("PO_RECEIPT_INVOICE", approval.getFlowCode()) ||
TextUtils.equals("FO_RECEIPT_INVOICE", approval.getFlowCode())) {
startActivity(WorkFinancialReceiveTicketActivity.class);
} else {
if (TextUtils.equals(OrderType.SALE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.BUILD.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getId() + "");
}
}
}
@Override
protected int layoutId() {
return R.layout.fg_work_contacts;
......
app/src/main/java/com/wd/workoffice/ui/fg/ApprovalToMeFragment.java
浏览文件 @ 8d0a2132
......@@ -30,6 +30,8 @@ import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SendApplyDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkContactsOpenTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkFinancialReceiveTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkFinancialTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.adapter.ApprovalAdapter;
import com.wd.workoffice.ui.adapter.SendApplyAdapter;
......@@ -154,67 +156,73 @@ public class ApprovalToMeFragment extends WorkBaseFg {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
ApprovalBean.RecordsBean approval = dataList.get(position);
if (TextUtils.equals("SO_INVOICE", approval.getFlowCode())) {
startActivity(WorkContactsOpenTicketActivity.class);
} else {
if (TextUtils.equals(OrderType.SALE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.BUILD.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getId() + "");
}
}
approvalGoNext(approval);
}
});
}
private void approvalGoNext(ApprovalBean.RecordsBean approval) {
if (TextUtils.equals("SO_INVOICE", approval.getFlowCode()) ||
TextUtils.equals("PO_INVOICE", approval.getFlowCode()) || TextUtils.equals("AO_INVOICE", approval.getFlowCode())) {
startActivity(WorkFinancialTicketActivity.class);
} else if (TextUtils.equals("PO_RECEIPT_INVOICE", approval.getFlowCode()) ||
TextUtils.equals("FO_RECEIPT_INVOICE", approval.getFlowCode())) {
startActivity(WorkFinancialReceiveTicketActivity.class);
} else {
if (TextUtils.equals(OrderType.SALE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.BUILD.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getId() + "");
}
}
}
@Override
protected int layoutId() {
return R.layout.fg_work_contacts;
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkFragment.java
浏览文件 @ 8d0a2132
......@@ -11,6 +11,7 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.vo.BatLayoutVo;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils;
......@@ -244,13 +245,13 @@ public class WorkFragment extends WorkBaseFg {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_submit:
startActivity(WorkApprovalActivity.class, "type", "1", "status", "0", "title", "我发起的");
startActivity(WorkApprovalActivity.class, "type", "1", "status", "0", WorkToolBarActivity._TITLE, "我发起的");
break;
case R.id.ll_deal:
startActivity(ApprovalDealActivity.class);
startActivity(ApprovalDealActivity.class,WorkToolBarActivity._TITLE, "我处理的");
break;
case R.id.ll_not_deal:
startActivity(WorkApprovalActivity.class, "type", "2", "status", "0", "title", "待我审批");
startActivity(WorkApprovalActivity.class, "type", "2", "status", "0",WorkToolBarActivity._TITLE, "待我审批");
break;
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论