提交 12a00f9c authored 作者: lgd's avatar lgd

1.权限名称错误修改

2.//TODO erp用户是否选择新部门为空,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes,刷新token
上级 95893a86
...@@ -7,7 +7,8 @@ package com.wd.workoffice.bean.workEnum; ...@@ -7,7 +7,8 @@ package com.wd.workoffice.bean.workEnum;
**/ **/
public enum PagePermissionType { public enum PagePermissionType {
//财税上缴 //财税上缴
FINANCE("finance:finance-tax:page:list", "财税上缴"), FINANCE_DETAIL("finance:finance-tax:page:detail", "获取财税明细"), FINANCE("finance:finance-tax:page:list", "财税上缴"),
FINANCE_DETAIL("finance:finance-tax:page:detail", "获取财税明细"),
FINANCE_TAX("finance:finance-tax:page:add", "申请提交财税数据"), FINANCE_TAX("finance:finance-tax:page:add", "申请提交财税数据"),
//产品 //产品
PRODUCT("base:product:page:list", "产品"), MODIFY_PRICE("base:product:price:update", "修改产品价格"), SHELF("base:product:shelf", "上下架"), PRODUCT_TRANSIT("base:product:transit:log;", "往来单位"), PRODUCT("base:product:page:list", "产品"), MODIFY_PRICE("base:product:price:update", "修改产品价格"), SHELF("base:product:shelf", "上下架"), PRODUCT_TRANSIT("base:product:transit:log;", "往来单位"),
...@@ -164,19 +165,19 @@ public enum PagePermissionType { ...@@ -164,19 +165,19 @@ public enum PagePermissionType {
//派遣服务 //派遣服务
//请购单 //请购单
private String code; private String permission;
private String name; private String desc;
public String getName() { public String getPermission() {
return name; return permission;
} }
public String getCode() { public String getDesc() {
return code; return desc;
} }
PagePermissionType(String code, String name) { PagePermissionType(String permission,String desc) {
this.code = code; this.permission = permission;
this.name = name; this.desc = desc;
} }
} }
...@@ -10,10 +10,8 @@ import com.wd.workoffice.R; ...@@ -10,10 +10,8 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.AddStockApplyFragment; import com.wd.workoffice.ui.fg.AddStockApplyFragment;
import com.wd.workoffice.ui.fg.UseApplyFragment;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -86,23 +84,23 @@ public class AddStockApplyActivity extends WorkToolBarActivity { ...@@ -86,23 +84,23 @@ public class AddStockApplyActivity extends WorkToolBarActivity {
String orderType = getIntent().getStringExtra("orderType"); String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(getIntent().getStringExtra("status"), "300")) { if (TextUtils.equals(getIntent().getStringExtra("status"), "300")) {
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {//销售权限判断 if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {//销售权限判断
if (WorkUtils.hasPermission(PagePermissionType.SO_ENTER_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.SO_ENTER_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_ENTER_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.PO_ENTER_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.FO_ENTER_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.FO_ENTER_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.CO_ENTER_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.CO_ENTER_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) { } else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.IO_ENTER_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.IO_ENTER_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else { } else {
......
...@@ -12,18 +12,10 @@ import com.wd.workoffice.app.BaseBean; ...@@ -12,18 +12,10 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseActivity; import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
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.activity.bat.work.WorkLogisticsDetailActivity;
import com.wd.workoffice.ui.adapter.ProCruibleAdapter; import com.wd.workoffice.ui.adapter.ProCruibleAdapter;
import com.wd.workoffice.ui.adapter.ProOutAdapter;
import com.wd.workoffice.ui.adapter.ProSupplierAdapter;
import com.wd.workoffice.ui.adapter.SaleCruibleAdapter; import com.wd.workoffice.ui.adapter.SaleCruibleAdapter;
import com.wd.workoffice.ui.adapter.SaleOutAdapter;
import com.wd.workoffice.ui.adapter.SaleProductAdapter;
import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -98,7 +90,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity { ...@@ -98,7 +90,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
} }
...@@ -135,7 +127,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity { ...@@ -135,7 +127,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
proAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { proAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_DETAILS.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_DETAILS.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -158,7 +150,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity { ...@@ -158,7 +150,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
@OnClick(R.id.iv_search) @OnClick(R.id.iv_search)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -19,19 +19,13 @@ import com.wd.workoffice.R; ...@@ -19,19 +19,13 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.EndApplyBean; import com.wd.workoffice.bean.EndApplyBean;
import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
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.EndApplyAdapter; import com.wd.workoffice.ui.adapter.EndApplyAdapter;
import com.wd.workoffice.ui.adapter.SendApplyAdapter;
import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -146,11 +140,11 @@ public class EndApplyActivity extends WorkToolBarActivity { ...@@ -146,11 +140,11 @@ public class EndApplyActivity extends WorkToolBarActivity {
if (TextUtils.equals("status", getIntent().getStringExtra("300"))) { if (TextUtils.equals("status", getIntent().getStringExtra("300"))) {
String orderType = getIntent().getStringExtra("orderType"); String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.SO_ADVANCE_SAVE.getName())){ if (WorkUtils.hasPermission(PagePermissionType.SO_ADVANCE_SAVE.getPermission())){
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_ADVANCE_SAVE.getName())){ if (WorkUtils.hasPermission(PagePermissionType.PO_ADVANCE_SAVE.getPermission())){
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
......
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
...@@ -15,26 +14,19 @@ import com.wd.workoffice.R; ...@@ -15,26 +14,19 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.EndApplyBean; import com.wd.workoffice.bean.EndApplyBean;
import com.wd.workoffice.bean.SendApplyBean;
import com.wd.workoffice.bean.SendApplyDetailBean;
import com.wd.workoffice.bean.event.CheckSendEvent; import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
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.SendApplyDetailAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
...@@ -88,9 +80,9 @@ public class EndApplyDetailActivity extends WorkToolBarActivity { ...@@ -88,9 +80,9 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
String orderType =getIntent().getStringExtra("orderType"); String orderType =getIntent().getStringExtra("orderType");
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_ADVANCE_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_ADVANCE_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_ADVANCE_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_ADVANCE_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
} }
if (!hasPermission) { if (!hasPermission) {
...@@ -98,33 +90,6 @@ public class EndApplyDetailActivity extends WorkToolBarActivity { ...@@ -98,33 +90,6 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
tvAgree.setVisibility(View.GONE); tvAgree.setVisibility(View.GONE);
} }
} }
private void getData(String id) {
// RtfUtils.getRtf().sendApplyDetail(id).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;
// }
// List<SendApplyDetailBean> dataBean = JSON.parseArray(data.getData().toString(), SendApplyDetailBean.class);
// dataList.addAll(dataBean);
// dataAdapter.notifyDataSetChanged();
// }
// });
}
@Override @Override
protected void initEvent() { protected void initEvent() {
......
...@@ -77,7 +77,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS ...@@ -77,7 +77,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
} }
...@@ -94,7 +94,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS ...@@ -94,7 +94,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -114,7 +114,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS ...@@ -114,7 +114,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
@OnClick(R.id.iv_search) @OnClick(R.id.iv_search)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -311,7 +311,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -311,7 +311,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.rl_set: case R.id.rl_set:
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_ENTER_STOCK.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_ENTER_STOCK.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -86,7 +86,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -86,7 +86,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
} }
...@@ -104,7 +104,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -104,7 +104,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
saleAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { saleAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -125,7 +125,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -125,7 +125,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
proAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { proAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -147,7 +147,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -147,7 +147,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
@OnClick(R.id.iv_search) @OnClick(R.id.iv_search)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -17,13 +17,11 @@ import com.wd.workoffice.bean.OrderBean; ...@@ -17,13 +17,11 @@ import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.ProAddBean; import com.wd.workoffice.bean.ProAddBean;
import com.wd.workoffice.bean.ProductBean; import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.event.CheckProApplyEvent; import com.wd.workoffice.bean.event.CheckProApplyEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
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.ProApplyDetailAdapter; import com.wd.workoffice.ui.adapter.ProApplyDetailAdapter;
import com.wd.workoffice.ui.adapter.ProApplyTargetAddAdapter; import com.wd.workoffice.ui.adapter.ProApplyTargetAddAdapter;
import com.wd.workoffice.ui.adapter.ProTargetAddAdapter;
import com.wd.workoffice.util.MathUtils; import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -164,7 +162,7 @@ public class ProductOrderApplyDetailActivity extends WorkToolBarActivity { ...@@ -164,7 +162,7 @@ public class ProductOrderApplyDetailActivity extends WorkToolBarActivity {
} }
private void changePermission() { private void changePermission() {
boolean hasPermission = WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_AUDIT.getName()); boolean hasPermission = WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_AUDIT.getPermission());
if (!hasPermission){ if (!hasPermission){
tvRefuse.setVisibility(View.GONE); tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE); tvAgree.setVisibility(View.GONE);
......
...@@ -12,12 +12,8 @@ import com.wd.workoffice.app.BaseBean; ...@@ -12,12 +12,8 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseActivity; import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
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.activity.bat.work.WorkLogisticsDetailActivity;
import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
import com.wd.workoffice.ui.adapter.SaleProductAdapter; import com.wd.workoffice.ui.adapter.SaleProductAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -150,7 +146,7 @@ public class ProductOrderSearchActivity extends WorkBaseActivity { ...@@ -150,7 +146,7 @@ public class ProductOrderSearchActivity extends WorkBaseActivity {
@OnClick(R.id.iv_search) @OnClick(R.id.iv_search)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -14,7 +14,6 @@ import com.wd.workoffice.R; ...@@ -14,7 +14,6 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AddStockBean; import com.wd.workoffice.bean.AddStockBean;
import com.wd.workoffice.bean.UseApplyBean;
import com.wd.workoffice.bean.event.CheckAddStockEvent; import com.wd.workoffice.bean.event.CheckAddStockEvent;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
...@@ -124,11 +123,11 @@ public class QualityApplyDetailActivity extends WorkToolBarActivity { ...@@ -124,11 +123,11 @@ public class QualityApplyDetailActivity extends WorkToolBarActivity {
private void changePermission() { private void changePermission() {
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getPermission());
} }
if (!hasPermission) { if (!hasPermission) {
tvRefuse.setVisibility(View.GONE); tvRefuse.setVisibility(View.GONE);
......
...@@ -87,7 +87,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal ...@@ -87,7 +87,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
} }
...@@ -140,7 +140,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal ...@@ -140,7 +140,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
@OnClick(R.id.iv_search) @OnClick(R.id.iv_search)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -10,7 +10,6 @@ import com.wd.workoffice.R; ...@@ -10,7 +10,6 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SendApplyFragment; import com.wd.workoffice.ui.fg.SendApplyFragment;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -82,15 +81,15 @@ public class SendApplyActivity extends WorkToolBarActivity { ...@@ -82,15 +81,15 @@ public class SendApplyActivity extends WorkToolBarActivity {
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
String orderType = getIntent().getStringExtra("orderType"); String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.SO_OUT_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.SO_OUT_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_OUT_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.PO_OUT_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.CO_OUT_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.CO_OUT_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} }
......
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
...@@ -92,11 +91,11 @@ public class SendApplyDetailActivity extends WorkToolBarActivity { ...@@ -92,11 +91,11 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
private void changePermission() { private void changePermission() {
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getName()); hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getName()); hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getPermission());
} }
if (!hasPermission) { if (!hasPermission) {
tvRefuse.setVisibility(View.GONE); tvRefuse.setVisibility(View.GONE);
......
...@@ -86,7 +86,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal ...@@ -86,7 +86,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
} }
...@@ -138,7 +138,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal ...@@ -138,7 +138,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
@OnClick(R.id.iv_search) @OnClick(R.id.iv_search)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -4,16 +4,13 @@ import android.os.Bundle; ...@@ -4,16 +4,13 @@ import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SendApplyFragment;
import com.wd.workoffice.ui.fg.UseApplyFragment; import com.wd.workoffice.ui.fg.UseApplyFragment;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -86,12 +83,12 @@ public class UseApplyActivity extends WorkToolBarActivity { ...@@ -86,12 +83,12 @@ public class UseApplyActivity extends WorkToolBarActivity {
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
String orderType = getIntent().getStringExtra("orderType"); String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (!WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_SAVE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) { } else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
if (TextUtils.equals(getIntent().getStringExtra("status"), "600")) { if (TextUtils.equals(getIntent().getStringExtra("status"), "600")) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_SAVE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} }
......
...@@ -15,7 +15,6 @@ import com.wd.workoffice.R; ...@@ -15,7 +15,6 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.UseApplyBean; import com.wd.workoffice.bean.UseApplyBean;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.event.CheckUseEvent; import com.wd.workoffice.bean.event.CheckUseEvent;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
...@@ -99,9 +98,9 @@ public class UseApplyDetailActivity extends WorkToolBarActivity { ...@@ -99,9 +98,9 @@ public class UseApplyDetailActivity extends WorkToolBarActivity {
private void changePermission() { private void changePermission() {
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) { } else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_AUDIT.getPermission());
} }
if (!hasPermission) { if (!hasPermission) {
tvAgree.setVisibility(View.GONE); tvAgree.setVisibility(View.GONE);
......
...@@ -49,7 +49,7 @@ public class ProductInsideOrderActivity extends WorkToolBarActivity { ...@@ -49,7 +49,7 @@ public class ProductInsideOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -51,7 +51,7 @@ public class ProductOutOrderActivity extends WorkToolBarActivity { ...@@ -51,7 +51,7 @@ public class ProductOutOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -48,7 +48,7 @@ public class ProductSaleOrderActivity extends WorkToolBarActivity { ...@@ -48,7 +48,7 @@ public class ProductSaleOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -48,7 +48,7 @@ public class ProductSupplierOrderActivity extends WorkToolBarActivity { ...@@ -48,7 +48,7 @@ public class ProductSupplierOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -49,7 +49,7 @@ public class SaleCrucibleOrderActivity extends WorkToolBarActivity { ...@@ -49,7 +49,7 @@ public class SaleCrucibleOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -47,7 +47,7 @@ public class SaleInsideOrderActivity extends WorkToolBarActivity { ...@@ -47,7 +47,7 @@ public class SaleInsideOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -49,7 +49,7 @@ public class SaleOutOrderActivity extends WorkToolBarActivity { ...@@ -49,7 +49,7 @@ public class SaleOutOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -78,7 +78,7 @@ public class SaleProductOrderActivity extends WorkToolBarActivity { ...@@ -78,7 +78,7 @@ public class SaleProductOrderActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_SAVE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add_and_search, menu); getMenuInflater().inflate(R.menu.menu_add_and_search, menu);
}else { }else {
getMenuInflater().inflate(R.menu.menu_search, menu); getMenuInflater().inflate(R.menu.menu_search, menu);
......
...@@ -48,7 +48,7 @@ public class SaleSaleOrderActivity extends WorkToolBarActivity { ...@@ -48,7 +48,7 @@ public class SaleSaleOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -46,7 +46,7 @@ public class SaleSupplierOrderActivity extends WorkToolBarActivity { ...@@ -46,7 +46,7 @@ public class SaleSupplierOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
package com.wd.workoffice.ui.activity.bat.store; package com.wd.workoffice.ui.activity.bat.store;
import android.content.Intent; import android.content.Intent;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
...@@ -64,7 +63,7 @@ public class StoreClientFactoryActivity extends WorkToolBarActivity { ...@@ -64,7 +63,7 @@ public class StoreClientFactoryActivity extends WorkToolBarActivity {
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient); clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("customerId", getIntent().getStringExtra("customerId")); param.put("customerId", getIntent().getStringExtra("customerId"));
if (!WorkUtils.hasPermission(PagePermissionType.CUSTOMER_FACTORY.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.CUSTOMER_FACTORY.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
getData(); getData();
...@@ -140,7 +139,7 @@ public class StoreClientFactoryActivity extends WorkToolBarActivity { ...@@ -140,7 +139,7 @@ public class StoreClientFactoryActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search) @OnClick(R.id.btn_search)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.CUSTOMER_FACTORY.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.CUSTOMER_FACTORY.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -51,7 +51,7 @@ public class StoreFinancialActivity extends WorkToolBarActivity { ...@@ -51,7 +51,7 @@ public class StoreFinancialActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.FINANCE.getCode())) { if (!WorkUtils.hasPermission(PagePermissionType.FINANCE.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -17,7 +17,6 @@ import com.wd.workoffice.bean.workEnum.PermissionType; ...@@ -17,7 +17,6 @@ import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.contract.BatSaleContract; import com.wd.workoffice.contract.BatSaleContract;
import com.wd.workoffice.presenter.BatSalePresenter; import com.wd.workoffice.presenter.BatSalePresenter;
import com.wd.workoffice.util.DialogUtils; import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -114,7 +113,7 @@ public class StoreOutsourcingActivity extends WorkToolBarActivity implements Bat ...@@ -114,7 +113,7 @@ public class StoreOutsourcingActivity extends WorkToolBarActivity implements Bat
"depId", chooseDep.getId() + "", "flag", "1", "code", "SUPPLIER", "supplier", "选择供应商"); "depId", chooseDep.getId() + "", "flag", "1", "code", "SUPPLIER", "supplier", "选择供应商");
break; break;
case R.id.rl_process: case R.id.rl_process:
if (!WorkUtils.hasPermission(PagePermissionType.SUB_PROCESS.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SUB_PROCESS.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -207,7 +206,6 @@ public class StoreOutsourcingActivity extends WorkToolBarActivity implements Bat ...@@ -207,7 +206,6 @@ public class StoreOutsourcingActivity extends WorkToolBarActivity implements Bat
String clientName = data.getStringExtra("clientName"); String clientName = data.getStringExtra("clientName");
supplierId = data.getIntExtra("id", 0); supplierId = data.getIntExtra("id", 0);
tvSupplier.setText(clientName); tvSupplier.setText(clientName);
// batSalePresenter.getProcess(PermissionType.PROCESS_SALE.getCode(), clientId);
} }
} }
......
...@@ -96,7 +96,7 @@ public class StoreSaleActivity extends WorkToolBarActivity implements BatSaleCon ...@@ -96,7 +96,7 @@ public class StoreSaleActivity extends WorkToolBarActivity implements BatSaleCon
depDialog.show(); depDialog.show();
break; break;
case R.id.rl_process: case R.id.rl_process:
if (!WorkUtils.hasPermission(PagePermissionType.SUB_PROCESS.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SUB_PROCESS.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -13,11 +13,9 @@ import com.wd.workoffice.app.BaseBean; ...@@ -13,11 +13,9 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ClientBean; import com.wd.workoffice.bean.ClientBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.ApiService;
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.StoreClientAdapter; import com.wd.workoffice.ui.adapter.StoreClientAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -79,7 +77,7 @@ public class StoreSaleClientActivity extends WorkToolBarActivity { ...@@ -79,7 +77,7 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
if (!TextUtils.isEmpty(depId)) { if (!TextUtils.isEmpty(depId)) {
param.put("deptId", depId); param.put("deptId", depId);
} }
if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
getData(); getData();
...@@ -186,7 +184,7 @@ public class StoreSaleClientActivity extends WorkToolBarActivity { ...@@ -186,7 +184,7 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search) @OnClick(R.id.btn_search)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -124,15 +124,6 @@ public class StoreSaleProductActivity extends WorkToolBarActivity { ...@@ -124,15 +124,6 @@ public class StoreSaleProductActivity extends WorkToolBarActivity {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_add_cart, null); View view = LayoutInflater.from(this).inflate(R.layout.view_add_cart, null);
LinearLayout llPrice = view.findViewById(R.id.ll_price); LinearLayout llPrice = view.findViewById(R.id.ll_price);
// if (TextUtils.equals(code, PermissionType.PROCESS_PURCHASE.getCode())) {
// } else if (TextUtils.equals(code, PermissionType.PROCESS_SALE.getCode())) {
// } else if (TextUtils.equals(code, PermissionType.PROCESS_INSIDE.getCode())) {
// } else if (TextUtils.equals(code, PermissionType.PROCESS_SUPPLY.getCode())) {
// llPrice.setVisibility(View.GONE);
// } else if (TextUtils.equals(code, PermissionType.PROCESS_CRUCIBLE.getCode())) {
// } else {
// }
TextView tvOk = view.findViewById(R.id.tv_ok); TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvCancel = view.findViewById(R.id.tv_cancel); TextView tvCancel = view.findViewById(R.id.tv_cancel);
AddAndReduceView num = view.findViewById(R.id.ar_num); AddAndReduceView num = view.findViewById(R.id.ar_num);
......
package com.wd.workoffice.ui.activity.bat.work; package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.util.Log;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -9,17 +7,12 @@ import com.wd.workoffice.R; ...@@ -9,17 +7,12 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean; import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.ProPriceBean;
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.util.MathUtils; import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.math.BigDecimal;
import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
...@@ -52,7 +45,7 @@ public class WorkAccountActivity extends WorkToolBarActivity { ...@@ -52,7 +45,7 @@ public class WorkAccountActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.BALANCE_DETAILS.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.BALANCE_DETAILS.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
getData(); getData();
...@@ -101,7 +94,7 @@ public class WorkAccountActivity extends WorkToolBarActivity { ...@@ -101,7 +94,7 @@ public class WorkAccountActivity extends WorkToolBarActivity {
@OnClick(R.id.tv_see_flow) @OnClick(R.id.tv_see_flow)
public void onViewClicked() { public void onViewClicked() {
if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_SHELF_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_SHELF_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -10,7 +10,6 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -10,7 +10,6 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.WorkContactsFragment; import com.wd.workoffice.ui.fg.WorkContactsFragment;
import com.wd.workoffice.ui.fg.WorkProFragment;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -46,7 +45,7 @@ public class WorkContactsActivity extends WorkToolBarActivity { ...@@ -46,7 +45,7 @@ public class WorkContactsActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -77,7 +77,7 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity { ...@@ -77,7 +77,7 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity {
startActivity(WorkContactsInfoActivity.class, "id", getIntent().getStringExtra("id")); startActivity(WorkContactsInfoActivity.class, "id", getIntent().getStringExtra("id"));
break; break;
case R.id.ll_receive: case R.id.ll_receive:
if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_PAGE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_PAGE.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -85,7 +85,7 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity { ...@@ -85,7 +85,7 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity {
break; break;
case R.id.ll_pay: case R.id.ll_pay:
if (TextUtils.equals("物流公司", getIntent().getStringExtra("partTypeNames"))) { if (TextUtils.equals("物流公司", getIntent().getStringExtra("partTypeNames"))) {
if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_PAGE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_PAGE.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
package com.wd.workoffice.ui.activity.bat.work; package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
...@@ -166,7 +165,7 @@ public class WorkContactsMoneyActivity extends WorkToolBarActivity { ...@@ -166,7 +165,7 @@ public class WorkContactsMoneyActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_FLOW_PAGE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_FLOW_PAGE.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -123,7 +123,7 @@ public class WorkDepActivity extends WorkToolBarActivity { ...@@ -123,7 +123,7 @@ public class WorkDepActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.SYS_DETAIL.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SYS_DETAIL.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -11,13 +11,11 @@ import com.wd.workoffice.R; ...@@ -11,13 +11,11 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AllAccountBean; import com.wd.workoffice.bean.AllAccountBean;
import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.event.FreezeEvent; import com.wd.workoffice.bean.event.FreezeEvent;
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.WorkFinancialAccountAdapter; import com.wd.workoffice.ui.adapter.WorkFinancialAccountAdapter;
import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -66,7 +64,7 @@ public class WorkFinancialAccountActivity extends WorkToolBarActivity { ...@@ -66,7 +64,7 @@ public class WorkFinancialAccountActivity extends WorkToolBarActivity {
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_DEPT_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_DEPT_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
getData(); getData();
......
package com.wd.workoffice.ui.activity.bat.work; package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
...@@ -16,8 +15,6 @@ import com.wd.workoffice.app.BaseBean; ...@@ -16,8 +15,6 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean; import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.bean.event.CheckMoneytEvent; import com.wd.workoffice.bean.event.CheckMoneytEvent;
import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
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;
...@@ -126,9 +123,9 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity { ...@@ -126,9 +123,9 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
private void changePermission() { private void changePermission() {
boolean hasPermission; boolean hasPermission;
if (TextUtils.equals("1", getIntent().getStringExtra("type"))) { if (TextUtils.equals("1", getIntent().getStringExtra("type"))) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_EXAM.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_EXAM.getPermission());
} else { } else {
hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_EXAM.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_EXAM.getPermission());
} }
if (!hasPermission) { if (!hasPermission) {
tvRefuse.setVisibility(View.GONE); tvRefuse.setVisibility(View.GONE);
......
...@@ -13,7 +13,6 @@ import com.wd.workoffice.app.BaseBean; ...@@ -13,7 +13,6 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean; import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.bean.event.CheckMoneytEvent; 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.bean.listener.ThreeMenuClickListener;
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;
...@@ -101,7 +100,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity { ...@@ -101,7 +100,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("orderType", "SO"); param.put("orderType", "SO");
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
getData(); getData();
...@@ -151,7 +150,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity { ...@@ -151,7 +150,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override @Override
protected void initEvent() { protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> { srlRefresh.setOnRefreshListener(refreshLayout -> {
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
page = 1; page = 1;
...@@ -180,7 +179,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity { ...@@ -180,7 +179,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_APPLY.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_APPLY.getPermission())){
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
}else { }else {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
......
...@@ -13,7 +13,6 @@ import com.wd.workoffice.app.BaseBean; ...@@ -13,7 +13,6 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean; import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.bean.event.CheckMoneytEvent; 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.bean.listener.ThreeMenuClickListener;
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;
...@@ -101,7 +100,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -101,7 +100,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("orderType", "PO"); param.put("orderType", "PO");
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
getData(); getData();
...@@ -151,7 +150,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -151,7 +150,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
@Override @Override
protected void initEvent() { protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> { srlRefresh.setOnRefreshListener(refreshLayout -> {
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
page = 1; page = 1;
...@@ -180,7 +179,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -180,7 +179,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_APPLY.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_APPLY.getPermission())) {
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} else { } else {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
......
...@@ -18,11 +18,8 @@ import com.wd.workoffice.bean.workEnum.PagePermissionType; ...@@ -18,11 +18,8 @@ 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.WorkFinancialReceiveTicketAdapter; import com.wd.workoffice.ui.adapter.WorkFinancialReceiveTicketAdapter;
import com.wd.workoffice.ui.adapter.WorkFinancialTicketAdapter;
import com.wd.workoffice.ui.adapter.WorkTicketAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.FinancialReceiveTicketFilterData; import com.wd.workoffice.util.ddmfilter.FinancialReceiveTicketFilterData;
import com.wd.workoffice.util.ddmfilter.FinancialTicketFilterData;
import com.wd.workoffice.widget.DropDownMenu; import com.wd.workoffice.widget.DropDownMenu;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -222,11 +219,11 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity { ...@@ -222,11 +219,11 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
private boolean hasPermission() { private boolean hasPermission() {
boolean hasPermission = false; boolean hasPermission = false;
if (TextUtils.equals(orderType, "供应订单")) { if (TextUtils.equals(orderType, "供应订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_LIST.getPermission())) {
hasPermission = true; hasPermission = true;
} }
} else if (TextUtils.equals(orderType, "外采购订单")) { } else if (TextUtils.equals(orderType, "外采购订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_LIST.getPermission())) {
hasPermission = true; hasPermission = true;
} }
} }
......
...@@ -5,7 +5,6 @@ import android.content.Intent; ...@@ -5,7 +5,6 @@ import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
...@@ -159,11 +158,11 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity { ...@@ -159,11 +158,11 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
private boolean hasAddPermission() { private boolean hasAddPermission() {
boolean hasPermission = false; boolean hasPermission = false;
if (TextUtils.equals(chooseType, "供应订单")) { if (TextUtils.equals(chooseType, "供应订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_SAVE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_SAVE.getPermission())) {
hasPermission = true; hasPermission = true;
} }
} else if (TextUtils.equals(chooseType, "外采购订单")) { } else if (TextUtils.equals(chooseType, "外采购订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_SAVE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_SAVE.getPermission())) {
hasPermission = true; hasPermission = true;
} }
} }
......
package com.wd.workoffice.ui.activity.bat.work; package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
...@@ -236,9 +235,9 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit ...@@ -236,9 +235,9 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit
private void changePermission() { private void changePermission() {
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, "供应订单")) { if (TextUtils.equals(orderType, "供应订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, "外采购订单")) { } else if (TextUtils.equals(orderType, "外采购订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_AUDIT.getPermission());
} }
if (!hasPermission) { if (!hasPermission) {
tvRefuse.setVisibility(View.GONE); tvRefuse.setVisibility(View.GONE);
......
...@@ -14,7 +14,6 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -14,7 +14,6 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.TicketBean; import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.bean.event.CheckTicketEvent; import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.bean.listener.ThreeMenuClickListener; import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.bean.workEnum.OrderType;
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;
...@@ -223,11 +222,11 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -223,11 +222,11 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
private boolean hasPermission() { private boolean hasPermission() {
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, "销售订单")) { if (TextUtils.equals(orderType, "销售订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_LIST.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_LIST.getPermission());
} else if (TextUtils.equals(orderType, "外采购订单")) { } else if (TextUtils.equals(orderType, "外采购订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_LIST.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_LIST.getPermission());
} else if (TextUtils.equals(orderType, "坩埚订单")) { } else if (TextUtils.equals(orderType, "坩埚订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_LIST.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_LIST.getPermission());
} }
return hasPermission; return hasPermission;
} }
...@@ -236,11 +235,11 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -236,11 +235,11 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
// private void changePermission() { // private void changePermission() {
// boolean hasPermission = true; // boolean hasPermission = true;
// if (TextUtils.equals(orderType, "销售订单")) { // if (TextUtils.equals(orderType, "销售订单")) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_AUDIT.getName()); // hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_AUDIT.getPermission());
// } else if (TextUtils.equals(orderType, "外采购订单")) { // } else if (TextUtils.equals(orderType, "外采购订单")) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.PRODUCT.getName()); // hasPermission = WorkUtils.hasPermission(PagePermissionType.PRODUCT.getPermission());
// } else if (TextUtils.equals(orderType, "坩埚订单")) { // } else if (TextUtils.equals(orderType, "坩埚订单")) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.PRODUCT.getName()); // hasPermission = WorkUtils.hasPermission(PagePermissionType.PRODUCT.getPermission());
// } // }
// dataAdapter.setHasPermission(hasPermission); // dataAdapter.setHasPermission(hasPermission);
// dataAdapter.notifyDataSetChanged(); // dataAdapter.notifyDataSetChanged();
......
...@@ -5,14 +5,12 @@ import android.content.Intent; ...@@ -5,14 +5,12 @@ import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.CheckTicketEvent; import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity; import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
import com.wd.workoffice.util.DialogUtils; import com.wd.workoffice.util.DialogUtils;
...@@ -161,19 +159,19 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity { ...@@ -161,19 +159,19 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
private boolean hasAddPermission() { private boolean hasAddPermission() {
boolean hasPermission = false; boolean hasPermission = false;
if (TextUtils.equals(chooseType, "销售订单")) { if (TextUtils.equals(chooseType, "销售订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_SAVE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_SAVE.getPermission())) {
hasPermission = true; hasPermission = true;
} }
} else if (TextUtils.equals(chooseType, "组装订单")) { } else if (TextUtils.equals(chooseType, "组装订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_SAVE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_SAVE.getPermission())) {
hasPermission = true; hasPermission = true;
} }
}else if (TextUtils.equals(chooseType, "外采购订单")) { }else if (TextUtils.equals(chooseType, "外采购订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_SAVE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_SAVE.getPermission())) {
hasPermission = true; hasPermission = true;
} }
} else if (TextUtils.equals(chooseType, "坩埚订单")) { } else if (TextUtils.equals(chooseType, "坩埚订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_SAVE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_SAVE.getPermission())) {
hasPermission = true; hasPermission = true;
} }
} }
......
package com.wd.workoffice.ui.activity.bat.work; package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
...@@ -14,12 +13,9 @@ import com.alibaba.fastjson.JSON; ...@@ -14,12 +13,9 @@ import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.TicketBean; import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.bean.TicketDetailBean; import com.wd.workoffice.bean.TicketDetailBean;
import com.wd.workoffice.bean.event.CheckLogisticEvent;
import com.wd.workoffice.bean.event.CheckTicketEvent; import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
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;
...@@ -241,11 +237,11 @@ public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity { ...@@ -241,11 +237,11 @@ public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity {
private void changePermission() { private void changePermission() {
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, "销售订单")) { if (TextUtils.equals(orderType, "销售订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, "外采购订单")) { } else if (TextUtils.equals(orderType, "外采购订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, "坩埚订单")) { } else if (TextUtils.equals(orderType, "坩埚订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_AUDIT.getPermission());
} }
if (!hasPermission) { if (!hasPermission) {
tvRefuse.setVisibility(View.GONE); tvRefuse.setVisibility(View.GONE);
......
...@@ -48,7 +48,7 @@ public class WorkLogisticActivity extends WorkToolBarActivity { ...@@ -48,7 +48,7 @@ public class WorkLogisticActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_APPLY_PAGE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_APPLY_PAGE.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -80,7 +80,7 @@ public class WorkLogisticActivity extends WorkToolBarActivity { ...@@ -80,7 +80,7 @@ public class WorkLogisticActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (WorkUtils.hasPermission(PagePermissionType.LOGISTICS_SAVE.getName())){ if (WorkUtils.hasPermission(PagePermissionType.LOGISTICS_SAVE.getPermission())){
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
......
package com.wd.workoffice.ui.activity.bat.work; package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
...@@ -16,14 +15,10 @@ import com.wd.workoffice.app.BaseBean; ...@@ -16,14 +15,10 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.LogisticBean; import com.wd.workoffice.bean.LogisticBean;
import com.wd.workoffice.bean.LogisticDetailBean; import com.wd.workoffice.bean.LogisticDetailBean;
import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.TicketDetailBean;
import com.wd.workoffice.bean.event.CheckLogisticEvent; import com.wd.workoffice.bean.event.CheckLogisticEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
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.WorkFinancialTicketDetailAdapter;
import com.wd.workoffice.ui.adapter.WorkLogisticDetailAdapter; import com.wd.workoffice.ui.adapter.WorkLogisticDetailAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -41,7 +36,6 @@ import butterknife.BindView; ...@@ -41,7 +36,6 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
/** /**
...@@ -116,7 +110,7 @@ public class WorkLogisticsDetailActivity extends WorkToolBarActivity { ...@@ -116,7 +110,7 @@ public class WorkLogisticsDetailActivity extends WorkToolBarActivity {
} }
private void changePermission() { private void changePermission() {
boolean hasPermission = WorkUtils.hasPermission(PagePermissionType.LOGISTICS_UPDATE.getName()); boolean hasPermission = WorkUtils.hasPermission(PagePermissionType.LOGISTICS_UPDATE.getPermission());
if (!hasPermission) { if (!hasPermission) {
tvRefuse.setVisibility(View.GONE); tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE); tvAgree.setVisibility(View.GONE);
......
...@@ -72,7 +72,7 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity { ...@@ -72,7 +72,7 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity {
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("sqdId", getIntent().getStringExtra("id")); param.put("sqdId", getIntent().getStringExtra("id"));
param.put("current", page); param.put("current", page);
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL_FLOW.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL_FLOW.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
getData(); getData();
...@@ -126,7 +126,7 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity { ...@@ -126,7 +126,7 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity {
srlRefresh.setOnRefreshListener(new OnRefreshListener() { srlRefresh.setOnRefreshListener(new OnRefreshListener() {
@Override @Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) { public void onRefresh(@NonNull RefreshLayout refreshLayout) {
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL_FLOW.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL_FLOW.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
} else { } else {
page = 1; page = 1;
......
...@@ -70,7 +70,7 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -70,7 +70,7 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
case 600: case 600:
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.CO_ENTER_PAGE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.CO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.tv_add, false);
} }
} }
......
...@@ -71,7 +71,7 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai ...@@ -71,7 +71,7 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai
case 600: case 600:
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.IO_ENTER_PAGE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.IO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.tv_add, false);
} }
} }
......
package com.wd.workoffice.ui.adapter; package com.wd.workoffice.ui.adapter;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -69,17 +66,17 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -69,17 +66,17 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
break; break;
} }
if (WorkUtils.hasPermission(PagePermissionType.SO_ENTER_PAGE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.SO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, true); helper.setGone(R.id.tv_add, true);
} else { } else {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.tv_add, false);
} }
if (WorkUtils.hasPermission(PagePermissionType.SO_RETURN_APPLY_LIST.getName())) { if (WorkUtils.hasPermission(PagePermissionType.SO_RETURN_APPLY_LIST.getPermission())) {
helper.setGone(R.id.tv_return, true); helper.setGone(R.id.tv_return, true);
} else { } else {
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
} }
if (WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_LIST.getName())) { if (WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_LIST.getPermission())) {
helper.setGone(R.id.tv_get, true); helper.setGone(R.id.tv_get, true);
} else { } else {
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.tv_get, false);
......
...@@ -66,12 +66,12 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O ...@@ -66,12 +66,12 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
break; break;
} }
if (WorkUtils.hasPermission(PagePermissionType.PO_ENTER_PAGE.getName())) { if (WorkUtils.hasPermission(PagePermissionType.PO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, true); helper.setGone(R.id.tv_add, true);
} else { } else {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.tv_add, false);
} }
if (WorkUtils.hasPermission(PagePermissionType.PO_RETURN_APPLY_LIST.getName())) { if (WorkUtils.hasPermission(PagePermissionType.PO_RETURN_APPLY_LIST.getPermission())) {
helper.setGone(R.id.tv_return, true); helper.setGone(R.id.tv_return, true);
} else { } else {
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
......
...@@ -44,7 +44,7 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -44,7 +44,7 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.tv_add, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
if (WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_LIST.getName())) { if (WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_LIST.getPermission())) {
helper.setGone(R.id.tv_get, true); helper.setGone(R.id.tv_get, true);
} else { } else {
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.tv_get, false);
......
...@@ -67,10 +67,10 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet ...@@ -67,10 +67,10 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.tv_get, false);
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_PAGE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_PAGE.getPermission())) {
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.tv_quality, false);
} }
if (!WorkUtils.hasPermission(PagePermissionType.FO_ENTER_PAGE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.FO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.tv_add, false);
} }
} }
......
...@@ -2,16 +2,12 @@ package com.wd.workoffice.ui.adapter; ...@@ -2,16 +2,12 @@ package com.wd.workoffice.ui.adapter;
import android.graphics.Color; import android.graphics.Color;
import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.AllAccountBean; import com.wd.workoffice.bean.AllAccountBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.MathUtils; import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -43,11 +39,11 @@ public class WorkFinancialAccountAdapter extends BaseQuickAdapter<AllAccountBean ...@@ -43,11 +39,11 @@ public class WorkFinancialAccountAdapter extends BaseQuickAdapter<AllAccountBean
helper.addOnClickListener(R.id.tv_freeze); helper.addOnClickListener(R.id.tv_freeze);
helper.addOnClickListener(R.id.tv_thaw); helper.addOnClickListener(R.id.tv_thaw);
helper.addOnClickListener(R.id.tv_see_flow); helper.addOnClickListener(R.id.tv_see_flow);
if (!WorkUtils.hasPermission(PagePermissionType.BALANCE_UPDATE.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.BALANCE_UPDATE.getPermission())) {
helper.setGone(R.id.tv_freeze, true); helper.setGone(R.id.tv_freeze, true);
helper.setGone(R.id.tv_thaw, true); helper.setGone(R.id.tv_thaw, true);
} }
if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_FLOW_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_FLOW_LIST.getPermission())) {
helper.setGone(R.id.tv_see_flow, true); helper.setGone(R.id.tv_see_flow, true);
} }
......
...@@ -34,10 +34,10 @@ public class WorkProductAdapter extends BaseQuickAdapter<ProductBean.RecordsBean ...@@ -34,10 +34,10 @@ public class WorkProductAdapter extends BaseQuickAdapter<ProductBean.RecordsBean
} else { } else {
helper.setText(R.id.btn_on_sale, "下架"); helper.setText(R.id.btn_on_sale, "下架");
} }
if (!WorkUtils.hasPermission(PagePermissionType.MODIFY_PRICE.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.MODIFY_PRICE.getPermission())){
helper.setGone(R.id.btn_modify,false); helper.setGone(R.id.btn_modify,false);
} }
if (!WorkUtils.hasPermission(PagePermissionType.SHELF.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SHELF.getPermission())){
helper.setGone(R.id.btn_on_sale,false); helper.setGone(R.id.btn_on_sale,false);
} }
} }
......
...@@ -29,7 +29,7 @@ public class WorkStockDetailAdapter extends BaseQuickAdapter<StockDetailBean.Rec ...@@ -29,7 +29,7 @@ public class WorkStockDetailAdapter extends BaseQuickAdapter<StockDetailBean.Rec
helper.setText(R.id.tv_out, String.valueOf(item.getApplyOut())); helper.setText(R.id.tv_out, String.valueOf(item.getApplyOut()));
helper.setText(R.id.tv_time, item.getCreatedTime()); helper.setText(R.id.tv_time, item.getCreatedTime());
helper.addOnClickListener(R.id.tv_flow); helper.addOnClickListener(R.id.tv_flow);
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL_FLOW.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL_FLOW.getPermission())) {
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
} }
......
...@@ -30,10 +30,10 @@ public class WorkWarhosutStockAdapter extends BaseQuickAdapter<WarehouseStockBea ...@@ -30,10 +30,10 @@ public class WorkWarhosutStockAdapter extends BaseQuickAdapter<WarehouseStockBea
helper.addOnClickListener(R.id.ll_num); helper.addOnClickListener(R.id.ll_num);
helper.addOnClickListener(R.id.tv_detail); helper.addOnClickListener(R.id.tv_detail);
helper.addOnClickListener(R.id.tv_flow); helper.addOnClickListener(R.id.tv_flow);
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL.getPermission())) {
helper.setGone(R.id.tv_detail, false); helper.setGone(R.id.tv_detail, false);
} }
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_FLOW.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_FLOW.getPermission())) {
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
} }
} }
......
...@@ -16,17 +16,13 @@ import com.wd.workoffice.R; ...@@ -16,17 +16,13 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.AddStockBean; import com.wd.workoffice.bean.AddStockBean;
import com.wd.workoffice.bean.SendApplyBean;
import com.wd.workoffice.bean.event.CheckAddStockEvent; import com.wd.workoffice.bean.event.CheckAddStockEvent;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.bean.workEnum.PermissionType;
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.activity.bat.order.AddStockApplyDetailActivity; import com.wd.workoffice.ui.activity.bat.order.AddStockApplyDetailActivity;
import com.wd.workoffice.ui.adapter.AddStockSendApplyAdapter; import com.wd.workoffice.ui.adapter.AddStockSendApplyAdapter;
import com.wd.workoffice.ui.adapter.SendApplyAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -194,15 +190,15 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -194,15 +190,15 @@ public class AddStockApplyFragment extends WorkBaseFg {
private void changePermission() { private void changePermission() {
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_ENTER_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_ENTER_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_ENTER_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_ENTER_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_ENTER_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_ENTER_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_ENTER_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_ENTER_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) { } else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.IO_ENTER_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.IO_ENTER_AUDIT.getPermission());
} }
dataAdapter.setHasPermission(hasPermission); dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged(); dataAdapter.notifyDataSetChanged();
......
...@@ -11,6 +11,7 @@ import com.wd.workoffice.app.BaseBean; ...@@ -11,6 +11,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.MsgBean; import com.wd.workoffice.bean.MsgBean;
import com.wd.workoffice.bean.vo.BatLayoutVo; import com.wd.workoffice.bean.vo.BatLayoutVo;
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.activity.NoticeActivity; import com.wd.workoffice.ui.activity.NoticeActivity;
...@@ -238,23 +239,44 @@ public class MainFragment extends WorkBaseFg { ...@@ -238,23 +239,44 @@ public class MainFragment extends WorkBaseFg {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch (position) { switch (position) {
case 0: case 0:
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_START.getPermission())){
toast(R.string.permission);
return;
}
startActivity(StoreSaleActivity.class); startActivity(StoreSaleActivity.class);
break; break;
case 1: case 1:
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_START.getPermission())){
toast(R.string.permission);
return;
}
startActivity(StoreOutsourcingActivity.class); startActivity(StoreOutsourcingActivity.class);
break; break;
case 2: case 2:
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_START.getPermission())){
toast(R.string.permission);
return;
}
startActivity(StoreSupplierActivity.class); startActivity(StoreSupplierActivity.class);
break; break;
case 3: case 3:
toast("暂无数据");
break; break;
case 4: case 4:
startActivity(StoreFinancialActivity.class); startActivity(StoreFinancialActivity.class);
break; break;
case 5: case 5:
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_START.getPermission())){
toast(R.string.permission);
return;
}
startActivity(StoreCrucibleActivity.class); startActivity(StoreCrucibleActivity.class);
break; break;
case 6: case 6:
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_START.getPermission())){
toast(R.string.permission);
return;
}
startActivity(StoreTradingActivity.class); startActivity(StoreTradingActivity.class);
break; break;
......
...@@ -81,7 +81,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View ...@@ -81,7 +81,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -77,7 +77,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract. ...@@ -77,7 +77,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -46,7 +46,7 @@ public class ProductOrderApplyFragment extends WorkBaseFg { ...@@ -46,7 +46,7 @@ public class ProductOrderApplyFragment extends WorkBaseFg {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -9,18 +9,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout; ...@@ -9,18 +9,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.LogisticBean;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.event.CheckLogisticEvent;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
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.activity.bat.order.ProductOrderDetailActivity; import com.wd.workoffice.ui.activity.bat.order.ProductOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
import com.wd.workoffice.ui.adapter.SaleProductAdapter; import com.wd.workoffice.ui.adapter.SaleProductAdapter;
import com.wd.workoffice.ui.adapter.WorkLogisticAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -74,7 +69,7 @@ public class ProductOrderFragment extends WorkBaseFg { ...@@ -74,7 +69,7 @@ public class ProductOrderFragment extends WorkBaseFg {
dataAdapter = new SaleProductAdapter(R.layout.item_sale_product, dataList); dataAdapter = new SaleProductAdapter(R.layout.item_sale_product, dataList);
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
}else { }else {
...@@ -145,7 +140,7 @@ public class ProductOrderFragment extends WorkBaseFg { ...@@ -145,7 +140,7 @@ public class ProductOrderFragment extends WorkBaseFg {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_DETAILS.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_DETAILS.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -21,9 +21,7 @@ import com.wd.workoffice.bean.workEnum.OrderType; ...@@ -21,9 +21,7 @@ import com.wd.workoffice.bean.workEnum.OrderType;
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.activity.bat.order.AddStockApplyDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.QualityApplyDetailActivity; import com.wd.workoffice.ui.activity.bat.order.QualityApplyDetailActivity;
import com.wd.workoffice.ui.adapter.AddStockSendApplyAdapter;
import com.wd.workoffice.ui.adapter.QualitypplyAdapter; import com.wd.workoffice.ui.adapter.QualitypplyAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -296,11 +294,11 @@ public class QualityApplyFragment extends WorkBaseFg { ...@@ -296,11 +294,11 @@ public class QualityApplyFragment extends WorkBaseFg {
private void changePermission() { private void changePermission() {
boolean hasPermission = true; boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getName()); hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getPermission());
} }
dataAdapter.setHasPermission(hasPermission); dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged(); dataAdapter.notifyDataSetChanged();
......
...@@ -11,7 +11,6 @@ import com.wd.workoffice.bean.workEnum.PagePermissionType; ...@@ -11,7 +11,6 @@ import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.contract.SaleSaleContract; import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter; import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.activity.bat.order.InsideOrderDetailActivity; import com.wd.workoffice.ui.activity.bat.order.InsideOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.adapter.SaleInsideAdapter; import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -79,7 +78,7 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V ...@@ -79,7 +78,7 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_DETAILS.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -78,7 +78,7 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View ...@@ -78,7 +78,7 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -95,7 +95,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie ...@@ -95,7 +95,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_DETAIL.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -10,7 +10,6 @@ import com.wd.workoffice.bean.OrderBean; ...@@ -10,7 +10,6 @@ import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.contract.SaleSaleContract; import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter; import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.activity.bat.order.OutOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity; import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.adapter.SaleSupplierAdapter; import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -79,7 +78,7 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract ...@@ -79,7 +78,7 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -87,11 +87,11 @@ public class SendApplyFragment extends WorkBaseFg { ...@@ -87,11 +87,11 @@ public class SendApplyFragment extends WorkBaseFg {
private void changePermission() { private void changePermission() {
boolean hasPermission =true; boolean hasPermission =true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName()); hasPermission =WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getName()); hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getName()); hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getPermission());
} }
dataAdapter.setHasPermission(hasPermission); dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged(); dataAdapter.notifyDataSetChanged();
......
...@@ -137,7 +137,7 @@ public class StoreFinancialFragment extends WorkBaseFg { ...@@ -137,7 +137,7 @@ public class StoreFinancialFragment extends WorkBaseFg {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_DETAIL.getCode())) { if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_DETAIL.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -15,17 +15,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout; ...@@ -15,17 +15,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SendApplyBean;
import com.wd.workoffice.bean.UseApplyBean; import com.wd.workoffice.bean.UseApplyBean;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.event.CheckUseEvent; import com.wd.workoffice.bean.event.CheckUseEvent;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
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.activity.bat.order.SendApplyDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.UseApplyDetailActivity; import com.wd.workoffice.ui.activity.bat.order.UseApplyDetailActivity;
import com.wd.workoffice.ui.adapter.SendApplyAdapter;
import com.wd.workoffice.ui.adapter.UseApplyAdapter; import com.wd.workoffice.ui.adapter.UseApplyAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -105,9 +101,9 @@ public class UseApplyFragment extends WorkBaseFg { ...@@ -105,9 +101,9 @@ public class UseApplyFragment extends WorkBaseFg {
private void changePermission() { private void changePermission() {
boolean hasPermission =true; boolean hasPermission =true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_AUDIT.getName()); hasPermission =WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) { } else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_AUDIT.getName()); hasPermission =WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_AUDIT.getPermission());
} }
dataAdapter.setHasPermission(hasPermission); dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged(); dataAdapter.notifyDataSetChanged();
......
...@@ -8,7 +8,6 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout; ...@@ -8,7 +8,6 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.ContactsBean; import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.bean.ContactsList;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.contract.WorkContactsContract; import com.wd.workoffice.contract.WorkContactsContract;
import com.wd.workoffice.presenter.WorkContactsPresenter; import com.wd.workoffice.presenter.WorkContactsPresenter;
...@@ -90,7 +89,7 @@ public class WorkContactsFragment extends WorkBaseFg implements WorkContactsCont ...@@ -90,7 +89,7 @@ public class WorkContactsFragment extends WorkBaseFg implements WorkContactsCont
workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_DETAILS.getName())) { if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_DETAILS.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -115,7 +115,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View ...@@ -115,7 +115,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
workProductAdapter = new WorkProductAdapter(R.layout.item_work_product, dataList); workProductAdapter = new WorkProductAdapter(R.layout.item_work_product, dataList);
workProductAdapter.bindToRecyclerView(rvData); workProductAdapter.bindToRecyclerView(rvData);
workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData); workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData);
if (!WorkUtils.hasPermission(PagePermissionType.PRODUCT.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.PRODUCT.getPermission())){
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
......
...@@ -2,7 +2,6 @@ package com.wd.workoffice.ui.fg; ...@@ -2,7 +2,6 @@ package com.wd.workoffice.ui.fg;
import android.view.View; import android.view.View;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
...@@ -13,7 +12,6 @@ import com.wd.workoffice.bean.listener.WarehouseOrderFilterClickListener; ...@@ -13,7 +12,6 @@ import com.wd.workoffice.bean.listener.WarehouseOrderFilterClickListener;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.contract.WorkWarehouseContract; import com.wd.workoffice.contract.WorkWarehouseContract;
import com.wd.workoffice.presenter.WorkWarehousePresenter; import com.wd.workoffice.presenter.WorkWarehousePresenter;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseOrderDetailActivity; import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseOrderDetailActivity;
import com.wd.workoffice.ui.adapter.WorkWarehouseOrderAdapter; import com.wd.workoffice.ui.adapter.WorkWarehouseOrderAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -74,7 +72,7 @@ public class WorkWarehouse2Fragment extends WorkBaseFg implements WorkWarehouseC ...@@ -74,7 +72,7 @@ public class WorkWarehouse2Fragment extends WorkBaseFg implements WorkWarehouseC
workProductAdapter = new WorkWarehouseOrderAdapter(R.layout.item_work_warehouse_order, dataList); workProductAdapter = new WorkWarehouseOrderAdapter(R.layout.item_work_warehouse_order, dataList);
workProductAdapter.bindToRecyclerView(rvData); workProductAdapter.bindToRecyclerView(rvData);
workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData); workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData);
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_ORDER.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_ORDER.getPermission())){
toast(R.string.permission); toast(R.string.permission);
}else { }else {
workProPresenter.getOrder(param); workProPresenter.getOrder(param);
...@@ -86,7 +84,7 @@ public class WorkWarehouse2Fragment extends WorkBaseFg implements WorkWarehouseC ...@@ -86,7 +84,7 @@ public class WorkWarehouse2Fragment extends WorkBaseFg implements WorkWarehouseC
@Override @Override
protected void initEvent() { protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> { srlRefresh.setOnRefreshListener(refreshLayout -> {
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_ORDER.getName())){ if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_ORDER.getPermission())){
toast(R.string.permission); toast(R.string.permission);
}else { }else {
page = 1; page = 1;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论