Skip to content

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

1.权限名称错误修改 

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