提交 4f5ec45d authored 作者: lgd's avatar lgd

1.初版权限维护

2.//TODO erp用户是否选择新部门为空,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,权限,坩埚下单,mes,刷新token
上级 6dbbeef7
package com.wd.workoffice.app; package com.wd.workoffice.app;
import com.wd.workoffice.util.WorkUtils;
import flexible.xd.android_base.base.BaseActivity; import flexible.xd.android_base.base.BaseActivity;
import flexible.xd.android_base.mvpBase.IBaseView; import flexible.xd.android_base.mvpBase.IBaseView;
import me.jessyan.autosize.AutoSize; import me.jessyan.autosize.AutoSize;
...@@ -21,6 +23,7 @@ public abstract class WorkBaseActivity extends BaseActivity implements IBaseView ...@@ -21,6 +23,7 @@ public abstract class WorkBaseActivity extends BaseActivity implements IBaseView
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
AutoSize.autoConvertDensity(this, 375, true); AutoSize.autoConvertDensity(this, 375, true);
WorkUtils.addPermissionRule(getWindow().getDecorView());
} }
// private void networkListener() { // private void networkListener() {
......
package com.wd.workoffice.app; package com.wd.workoffice.app;
import com.wd.workoffice.util.WorkUtils;
import flexible.xd.android_base.base.BaseFragment; import flexible.xd.android_base.base.BaseFragment;
import flexible.xd.android_base.mvpBase.IBaseView; import flexible.xd.android_base.mvpBase.IBaseView;
import me.jessyan.autosize.AutoSize; import me.jessyan.autosize.AutoSize;
...@@ -15,6 +17,7 @@ public abstract class WorkBaseFg extends BaseFragment implements IBaseView { ...@@ -15,6 +17,7 @@ public abstract class WorkBaseFg extends BaseFragment implements IBaseView {
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
AutoSize.autoConvertDensity(getActivity(), 375, true); AutoSize.autoConvertDensity(getActivity(), 375, true);
WorkUtils.addPermissionRule(getActivity().getWindow().getDecorView());
} }
@Override @Override
public void showLoading() { public void showLoading() {
......
...@@ -2,6 +2,8 @@ package com.wd.workoffice.app; ...@@ -2,6 +2,8 @@ package com.wd.workoffice.app;
import android.os.Bundle; import android.os.Bundle;
import com.wd.workoffice.util.WorkUtils;
import flexible.xd.android_base.base.ToolBarActivity; import flexible.xd.android_base.base.ToolBarActivity;
import flexible.xd.android_base.mvpBase.BasePresenter; import flexible.xd.android_base.mvpBase.BasePresenter;
import flexible.xd.android_base.mvpBase.IBaseView; import flexible.xd.android_base.mvpBase.IBaseView;
...@@ -22,6 +24,7 @@ public abstract class WorkToolBarActivity extends ToolBarActivity implements IBa ...@@ -22,6 +24,7 @@ public abstract class WorkToolBarActivity extends ToolBarActivity implements IBa
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
AutoSize.autoConvertDensity(this, 375, true); AutoSize.autoConvertDensity(this, 375, true);
WorkUtils.addPermissionRule(getWindow().getDecorView());
} }
......
...@@ -8,9 +8,13 @@ import android.view.MenuItem; ...@@ -8,9 +8,13 @@ import android.view.MenuItem;
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.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.ui.fg.UseApplyFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -79,8 +83,30 @@ public class AddStockApplyActivity extends WorkToolBarActivity { ...@@ -79,8 +83,30 @@ public class AddStockApplyActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(getIntent().getStringExtra("status"), "300")) { if (TextUtils.equals(getIntent().getStringExtra("status"), "300")) {
getMenuInflater().inflate(R.menu.menu_add, menu); if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {//销售权限判断
if (WorkUtils.hasPermission(PagePermissionType.SO_ENTER_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_ENTER_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.FO_ENTER_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.CO_ENTER_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.IO_ENTER_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else {
}
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
...@@ -91,7 +117,7 @@ public class AddStockApplyActivity extends WorkToolBarActivity { ...@@ -91,7 +117,7 @@ public class AddStockApplyActivity extends WorkToolBarActivity {
case R.id.add: case R.id.add:
startActivity(AddStockApplyAddActivity.class, startActivity(AddStockApplyAddActivity.class,
"num", getIntent().getStringExtra("num"), "num", getIntent().getStringExtra("num"),
"orderType",getIntent().getStringExtra("orderType"), "orderType", getIntent().getStringExtra("orderType"),
"productId", getIntent().getStringExtra("productId"), "productId", getIntent().getStringExtra("productId"),
"orderItemId", getIntent().getStringExtra("orderItemId"), "orderItemId", getIntent().getStringExtra("orderItemId"),
"simpleCode", getIntent().getStringExtra("simpleCode"), "simpleCode", getIntent().getStringExtra("simpleCode"),
......
...@@ -11,6 +11,7 @@ import com.wd.workoffice.R; ...@@ -11,6 +11,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; 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.contract.SaleSaleContract; import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter; import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -97,6 +98,9 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity { ...@@ -97,6 +98,9 @@ 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())){
toast(R.string.permission);
}
} }
@Override @Override
...@@ -131,6 +135,10 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity { ...@@ -131,6 +135,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(CrucibleOrderDetailActivity.class, startActivity(CrucibleOrderDetailActivity.class,
"identity", identity, "identity", identity,
"type", "1", "type", "1",
...@@ -150,6 +158,10 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity { ...@@ -150,6 +158,10 @@ 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())){
toast(R.string.permission);
return;
}
String key = etKey.getText().toString(); String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) { if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字"); toast("请输入搜索关键字");
......
...@@ -21,6 +21,8 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -21,6 +21,8 @@ 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.ProPriceBean;
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.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;
...@@ -127,7 +129,9 @@ public class EndApplyActivity extends WorkToolBarActivity { ...@@ -127,7 +129,9 @@ public class EndApplyActivity 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) {
startActivity(EndApplyDetailActivity.class, "info", JSON.toJSONString(dataList.get(position))); startActivity(EndApplyDetailActivity.class,
"orderType", getIntent().getStringExtra("orderType"),
"info", JSON.toJSONString(dataList.get(position)));
} }
}); });
} }
...@@ -140,7 +144,18 @@ public class EndApplyActivity extends WorkToolBarActivity { ...@@ -140,7 +144,18 @@ public class EndApplyActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals("status", getIntent().getStringExtra("300"))) { if (TextUtils.equals("status", getIntent().getStringExtra("300"))) {
getMenuInflater().inflate(R.menu.menu_add, menu); String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.SO_ADVANCE_SAVE.getName())){
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_ADVANCE_SAVE.getName())){
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
} else {
}
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
......
...@@ -18,6 +18,8 @@ import com.wd.workoffice.bean.EndApplyBean; ...@@ -18,6 +18,8 @@ import com.wd.workoffice.bean.EndApplyBean;
import com.wd.workoffice.bean.SendApplyBean; import com.wd.workoffice.bean.SendApplyBean;
import com.wd.workoffice.bean.SendApplyDetailBean; 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.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.ui.adapter.SendApplyDetailAdapter;
...@@ -80,8 +82,22 @@ public class EndApplyDetailActivity extends WorkToolBarActivity { ...@@ -80,8 +82,22 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
param = new HashMap<>(); param = new HashMap<>();
param.put("id", info.getId()); param.put("id", info.getId());
changePermission();
}
private void changePermission() {
String orderType =getIntent().getStringExtra("orderType");
boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_ADVANCE_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_ADVANCE_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
}
if (!hasPermission) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
} }
private void getData(String id) { private void getData(String id) {
// RtfUtils.getRtf().sendApplyDetail(id).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { // RtfUtils.getRtf().sendApplyDetail(id).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
// //
......
...@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R; import com.wd.workoffice.R;
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.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.adapter.SaleInsideAdapter; import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
...@@ -76,6 +77,9 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS ...@@ -76,6 +77,9 @@ 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())){
toast(R.string.permission);
}
} }
@Override @Override
...@@ -90,6 +94,10 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS ...@@ -90,6 +94,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(InsideOrderDetailActivity.class, startActivity(InsideOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
...@@ -106,6 +114,10 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS ...@@ -106,6 +114,10 @@ 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())){
toast(R.string.permission);
return;
}
String key = etKey.getText().toString(); String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) { if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字"); toast("请输入搜索关键字");
......
...@@ -19,6 +19,7 @@ import com.wd.workoffice.app.BaseBean; ...@@ -19,6 +19,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
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.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.OrderProcessAdapter; import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
...@@ -266,7 +267,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -266,7 +267,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_add: case R.id.tv_add:
startActivity(AddStockApplyActivity.class, startActivity(AddStockApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType() , "orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanInStoreProductSum() + "", "num", proList.get(position).getCanInStoreProductSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -277,7 +278,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -277,7 +278,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_return: case R.id.tv_return:
startActivity(ReturnApplyActivity.class, startActivity(ReturnApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType() , "orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getStoreSum() + "", "num", proList.get(position).getStoreSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -310,6 +311,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -310,6 +311,10 @@ 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())) {
toast(R.string.permission);
return;
}
settingDialog.show(); settingDialog.show();
break; break;
case R.id.tv_refuse: case R.id.tv_refuse:
...@@ -334,7 +339,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -334,7 +339,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
return; return;
} }
startActivity(SendApplyActivity.class, startActivity(SendApplyActivity.class,
"orderType",dataBean.getExpandInfo().getOrderType(), "orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id")); "orderId", getIntent().getStringExtra("id"));
break; break;
} }
......
...@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R; import com.wd.workoffice.R;
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.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.adapter.ProOutAdapter; import com.wd.workoffice.ui.adapter.ProOutAdapter;
...@@ -85,6 +86,9 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -85,6 +86,9 @@ 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())){
toast(R.string.permission);
}
} }
@Override @Override
...@@ -100,6 +104,10 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -100,6 +104,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class, startActivity(OutOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
...@@ -117,6 +125,10 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -117,6 +125,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class, startActivity(OutOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
...@@ -135,6 +147,10 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -135,6 +147,10 @@ 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())){
toast(R.string.permission);
return;
}
String key = etKey.getText().toString(); String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) { if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字"); toast("请输入搜索关键字");
......
...@@ -17,6 +17,8 @@ import com.wd.workoffice.bean.OrderBean; ...@@ -17,6 +17,8 @@ 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.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;
...@@ -101,6 +103,7 @@ public class ProductOrderApplyDetailActivity extends WorkToolBarActivity { ...@@ -101,6 +103,7 @@ public class ProductOrderApplyDetailActivity extends WorkToolBarActivity {
changeNumAndPrice(); changeNumAndPrice();
if (TextUtils.equals(info.getStatus() + "", "0")) { if (TextUtils.equals(info.getStatus() + "", "0")) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
changePermission();
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
} }
...@@ -160,6 +163,13 @@ public class ProductOrderApplyDetailActivity extends WorkToolBarActivity { ...@@ -160,6 +163,13 @@ public class ProductOrderApplyDetailActivity extends WorkToolBarActivity {
}); });
} }
private void changePermission() {
boolean hasPermission = WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_AUDIT.getName());
if (!hasPermission){
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
}
private void changeNumAndPrice() { private void changeNumAndPrice() {
String allPrice = ""; String allPrice = "";
......
...@@ -11,6 +11,7 @@ import com.wd.workoffice.R; ...@@ -11,6 +11,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; 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.contract.SaleSaleContract; import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter; import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -149,6 +150,10 @@ public class ProductOrderSearchActivity extends WorkBaseActivity { ...@@ -149,6 +150,10 @@ 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())) {
toast(R.string.permission);
return;
}
String key = etKey.getText().toString(); String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) { if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字"); toast("请输入搜索关键字");
......
...@@ -17,6 +17,7 @@ import com.wd.workoffice.bean.AddStockBean; ...@@ -17,6 +17,7 @@ import com.wd.workoffice.bean.AddStockBean;
import com.wd.workoffice.bean.UseApplyBean; 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.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.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -86,6 +87,7 @@ public class QualityApplyDetailActivity extends WorkToolBarActivity { ...@@ -86,6 +87,7 @@ public class QualityApplyDetailActivity extends WorkToolBarActivity {
if (TextUtils.equals(info.getQualityInspectionStatus(), "0")) { if (TextUtils.equals(info.getQualityInspectionStatus(), "0")) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE); llCheck.setVisibility(View.GONE);
changePermission();
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.VISIBLE); llCheck.setVisibility(View.VISIBLE);
...@@ -119,6 +121,21 @@ public class QualityApplyDetailActivity extends WorkToolBarActivity { ...@@ -119,6 +121,21 @@ 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());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getName());
}
if (!hasPermission) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
}
private void checkDialog(int status, int id) { private void checkDialog(int status, int id) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null); View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
......
...@@ -17,6 +17,7 @@ import com.wd.workoffice.app.BaseBean; ...@@ -17,6 +17,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
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.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.AddStockApplyActivity; import com.wd.workoffice.ui.activity.bat.order.AddStockApplyActivity;
...@@ -131,7 +132,6 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -131,7 +132,6 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
status = Integer.valueOf(getIntent().getStringExtra("status")); status = Integer.valueOf(getIntent().getStringExtra("status"));
changView(status); changView(status);
} }
} }
private void changView(Integer status) { private void changView(Integer status) {
......
...@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R; import com.wd.workoffice.R;
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.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.adapter.ProSaleAdapter; import com.wd.workoffice.ui.adapter.ProSaleAdapter;
...@@ -71,7 +72,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal ...@@ -71,7 +72,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
@Override @Override
protected void initData() { protected void initData() {
identity = getIntent().getStringExtra("identity"); identity = getIntent().getStringExtra("identity");
orderList = new ArrayList<>(); orderList = new ArrayList<>();
if (TextUtils.equals(identity, "1")) { if (TextUtils.equals(identity, "1")) {
saleAdapter = new SaleSaleAdapter(R.layout.item_sale, orderList); saleAdapter = new SaleSaleAdapter(R.layout.item_sale, orderList);
...@@ -86,6 +87,9 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal ...@@ -86,6 +87,9 @@ 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())){
toast(R.string.permission);
}
} }
@Override @Override
...@@ -136,6 +140,10 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal ...@@ -136,6 +140,10 @@ 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())){
toast(R.string.permission);
return;
}
String key = etKey.getText().toString(); String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) { if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字"); toast("请输入搜索关键字");
......
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
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.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 java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -75,7 +80,20 @@ public class SendApplyActivity extends WorkToolBarActivity { ...@@ -75,7 +80,20 @@ public class SendApplyActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu); String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.SO_OUT_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_OUT_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.CO_OUT_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
......
...@@ -18,6 +18,7 @@ import com.wd.workoffice.bean.SendApplyBean; ...@@ -18,6 +18,7 @@ import com.wd.workoffice.bean.SendApplyBean;
import com.wd.workoffice.bean.SendApplyDetailBean; 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.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.ui.adapter.SendApplyDetailAdapter;
...@@ -85,6 +86,22 @@ public class SendApplyDetailActivity extends WorkToolBarActivity { ...@@ -85,6 +86,22 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
private void changePermission() {
boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getName());
}
if (!hasPermission) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
} }
@Override @Override
...@@ -101,6 +118,7 @@ public class SendApplyDetailActivity extends WorkToolBarActivity { ...@@ -101,6 +118,7 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
if (TextUtils.equals(info.getStatus(), "0")) { if (TextUtils.equals(info.getStatus(), "0")) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE); llCheck.setVisibility(View.GONE);
changePermission();
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.VISIBLE); llCheck.setVisibility(View.VISIBLE);
......
...@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R; import com.wd.workoffice.R;
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.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.adapter.ProSupplierAdapter; import com.wd.workoffice.ui.adapter.ProSupplierAdapter;
...@@ -56,7 +57,6 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal ...@@ -56,7 +57,6 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
setSupportActionBar(tbTitle); setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
} }
@Override @Override
...@@ -86,6 +86,9 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal ...@@ -86,6 +86,9 @@ 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())){
toast(R.string.permission);
}
} }
@Override @Override
...@@ -135,6 +138,10 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal ...@@ -135,6 +138,10 @@ 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())){
toast(R.string.permission);
return;
}
String key = etKey.getText().toString(); String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) { if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字"); toast("请输入搜索关键字");
......
...@@ -9,9 +9,13 @@ import android.view.View; ...@@ -9,9 +9,13 @@ 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.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.ui.fg.UseApplyFragment; import com.wd.workoffice.ui.fg.UseApplyFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -23,7 +27,7 @@ import butterknife.BindView; ...@@ -23,7 +27,7 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
/** /**
* 发货申请列表 * 领用列表
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
...@@ -80,12 +84,17 @@ public class UseApplyActivity extends WorkToolBarActivity { ...@@ -80,12 +84,17 @@ public class UseApplyActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.isEmpty(getIntent().getStringExtra("form"))) { String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(getIntent().getStringExtra("status"), "600")) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (!WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
} }
} else { } else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
getMenuInflater().inflate(R.menu.menu_add, menu); if (TextUtils.equals(getIntent().getStringExtra("status"), "600")) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
......
...@@ -18,6 +18,7 @@ import com.wd.workoffice.bean.UseApplyBean; ...@@ -18,6 +18,7 @@ import com.wd.workoffice.bean.UseApplyBean;
import com.wd.workoffice.bean.event.CheckSendEvent; 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.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.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -84,6 +85,7 @@ public class UseApplyDetailActivity extends WorkToolBarActivity { ...@@ -84,6 +85,7 @@ public class UseApplyDetailActivity extends WorkToolBarActivity {
if (TextUtils.equals(info.getStatus(), "0")) { if (TextUtils.equals(info.getStatus(), "0")) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE); llCheck.setVisibility(View.GONE);
changePermission();
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.VISIBLE); llCheck.setVisibility(View.VISIBLE);
...@@ -94,6 +96,18 @@ public class UseApplyDetailActivity extends WorkToolBarActivity { ...@@ -94,6 +96,18 @@ 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());
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_AUDIT.getName());
}
if (!hasPermission) {
tvAgree.setVisibility(View.GONE);
tvRefuse.setVisibility(View.GONE);
}
}
@Override @Override
protected void initEvent() { protected void initEvent() {
......
...@@ -7,9 +7,11 @@ import android.view.MenuItem; ...@@ -7,9 +7,11 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.InsideOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.InsideOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleInsideFragment; import com.wd.workoffice.ui.fg.SaleInsideFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -47,6 +49,10 @@ public class ProductInsideOrderActivity extends WorkToolBarActivity { ...@@ -47,6 +49,10 @@ public class ProductInsideOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -7,9 +7,11 @@ import android.view.MenuItem; ...@@ -7,9 +7,11 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.OutOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.OutOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.ProOutFragment; import com.wd.workoffice.ui.fg.ProOutFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -49,6 +51,10 @@ public class ProductOutOrderActivity extends WorkToolBarActivity { ...@@ -49,6 +51,10 @@ public class ProductOutOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -7,9 +7,11 @@ import android.view.MenuItem; ...@@ -7,9 +7,11 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.SaleOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.SaleOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.ProSaleFragment; import com.wd.workoffice.ui.fg.ProSaleFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -46,6 +48,10 @@ public class ProductSaleOrderActivity extends WorkToolBarActivity { ...@@ -46,6 +48,10 @@ public class ProductSaleOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -7,9 +7,11 @@ import android.view.MenuItem; ...@@ -7,9 +7,11 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.SupplierOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.ProSupplierFragment; import com.wd.workoffice.ui.fg.ProSupplierFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -46,6 +48,10 @@ public class ProductSupplierOrderActivity extends WorkToolBarActivity { ...@@ -46,6 +48,10 @@ public class ProductSupplierOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -7,10 +7,12 @@ import android.view.MenuItem; ...@@ -7,10 +7,12 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.CrucibleOrderBuyFragment; import com.wd.workoffice.ui.fg.CrucibleOrderBuyFragment;
import com.wd.workoffice.ui.fg.CrucibleOrderSaleFragment; import com.wd.workoffice.ui.fg.CrucibleOrderSaleFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -47,6 +49,10 @@ public class SaleCrucibleOrderActivity extends WorkToolBarActivity { ...@@ -47,6 +49,10 @@ public class SaleCrucibleOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
CrucibleOrderBuyFragment saleFragment = new CrucibleOrderBuyFragment(); CrucibleOrderBuyFragment saleFragment = new CrucibleOrderBuyFragment();
......
...@@ -7,9 +7,11 @@ import android.view.MenuItem; ...@@ -7,9 +7,11 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.InsideOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.InsideOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleInsideFragment; import com.wd.workoffice.ui.fg.SaleInsideFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -45,6 +47,10 @@ public class SaleInsideOrderActivity extends WorkToolBarActivity { ...@@ -45,6 +47,10 @@ public class SaleInsideOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -7,9 +7,11 @@ import android.view.MenuItem; ...@@ -7,9 +7,11 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.OutOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.OutOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleOutFragment; import com.wd.workoffice.ui.fg.SaleOutFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -47,6 +49,10 @@ public class SaleOutOrderActivity extends WorkToolBarActivity { ...@@ -47,6 +49,10 @@ public class SaleOutOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -7,11 +7,13 @@ import android.view.MenuItem; ...@@ -7,11 +7,13 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.ProductOrderAddActivity; import com.wd.workoffice.ui.activity.bat.order.ProductOrderAddActivity;
import com.wd.workoffice.ui.activity.bat.order.ProductOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.ProductOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.ProductOrderApplyFragment; import com.wd.workoffice.ui.fg.ProductOrderApplyFragment;
import com.wd.workoffice.ui.fg.ProductOrderFragment; import com.wd.workoffice.ui.fg.ProductOrderFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -38,6 +40,7 @@ public class SaleProductOrderActivity extends WorkToolBarActivity { ...@@ -38,6 +40,7 @@ public class SaleProductOrderActivity extends WorkToolBarActivity {
ViewPager vpData; ViewPager vpData;
private String tab[] = { private String tab[] = {
"组装订单", "组装申请"}; "组装订单", "组装申请"};
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -75,7 +78,11 @@ public class SaleProductOrderActivity extends WorkToolBarActivity { ...@@ -75,7 +78,11 @@ public class SaleProductOrderActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add_and_search, menu); if (WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_SAVE.getName())) {
getMenuInflater().inflate(R.menu.menu_add_and_search, menu);
}else {
getMenuInflater().inflate(R.menu.menu_search, menu);
}
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
...@@ -83,7 +90,7 @@ public class SaleProductOrderActivity extends WorkToolBarActivity { ...@@ -83,7 +90,7 @@ public class SaleProductOrderActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.search: case R.id.search:
startActivity(ProductOrderSearchActivity.class, "identity", getIntent().getStringExtra("identity")); startActivity(ProductOrderSearchActivity.class, "identity", getIntent().getStringExtra("identity"));
break; break;
case R.id.add: case R.id.add:
startActivity(ProductOrderAddActivity.class, "identity", getIntent().getStringExtra("identity")); startActivity(ProductOrderAddActivity.class, "identity", getIntent().getStringExtra("identity"));
......
...@@ -7,9 +7,11 @@ import android.view.MenuItem; ...@@ -7,9 +7,11 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.SaleOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.SaleOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleSaleFragment; import com.wd.workoffice.ui.fg.SaleSaleFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -46,6 +48,10 @@ public class SaleSaleOrderActivity extends WorkToolBarActivity { ...@@ -46,6 +48,10 @@ public class SaleSaleOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -7,9 +7,11 @@ import android.view.MenuItem; ...@@ -7,9 +7,11 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderSearchActivity; import com.wd.workoffice.ui.activity.bat.order.SupplierOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleSupplierFragment; import com.wd.workoffice.ui.fg.SaleSupplierFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -44,6 +46,10 @@ public class SaleSupplierOrderActivity extends WorkToolBarActivity { ...@@ -44,6 +46,10 @@ public class SaleSupplierOrderActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -12,6 +12,7 @@ import com.wd.workoffice.R; ...@@ -12,6 +12,7 @@ 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.ClientBean; import com.wd.workoffice.bean.ClientBean;
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.StoreClientAdapter; import com.wd.workoffice.ui.adapter.StoreClientAdapter;
...@@ -63,7 +64,11 @@ public class StoreClientFactoryActivity extends WorkToolBarActivity { ...@@ -63,7 +64,11 @@ 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"));
getData(); if (!WorkUtils.hasPermission(PagePermissionType.CUSTOMER_FACTORY.getName())) {
toast(R.string.permission);
} else {
getData();
}
} }
private void getData() { private void getData() {
...@@ -135,6 +140,10 @@ public class StoreClientFactoryActivity extends WorkToolBarActivity { ...@@ -135,6 +140,10 @@ 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())) {
toast(R.string.permission);
return;
}
param.put("name", etKey.getText().toString()); param.put("name", etKey.getText().toString());
param.put("current", 1); param.put("current", 1);
page = 1; page = 1;
......
...@@ -7,10 +7,12 @@ import android.view.MenuItem; ...@@ -7,10 +7,12 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.activity.bat.work.WorkFinancialLogisticAddActivity; import com.wd.workoffice.ui.activity.bat.work.WorkFinancialLogisticAddActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.StoreFinancialFragment; import com.wd.workoffice.ui.fg.StoreFinancialFragment;
import com.wd.workoffice.ui.fg.WorkLogisticsFragment; import com.wd.workoffice.ui.fg.WorkLogisticsFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -36,9 +38,10 @@ public class StoreFinancialActivity extends WorkToolBarActivity { ...@@ -36,9 +38,10 @@ public class StoreFinancialActivity extends WorkToolBarActivity {
@BindView(R.id.vp_data) @BindView(R.id.vp_data)
ViewPager vpData; ViewPager vpData;
private String tab[] = { private String tab[] = {
"全部","待审核", "不通过", "已通过"}; "全部", "待审核", "不通过", "已通过"};
private String order[] = { private String order[] = {
"", "0", "2", "1"};//0:待审核 1:已通过 2已驳回 3:待重审 9:已作废 "", "0", "2", "1"};//0:待审核 1:已通过 2已驳回 3:待重审 9:已作废
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -48,6 +51,10 @@ public class StoreFinancialActivity extends WorkToolBarActivity { ...@@ -48,6 +51,10 @@ public class StoreFinancialActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.FINANCE.getCode())) {
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -12,11 +12,13 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -12,11 +12,13 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean; import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.ProcessBean; import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.StockBean; import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.bean.workEnum.PermissionType; 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.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -112,6 +114,10 @@ public class StoreOutsourcingActivity extends WorkToolBarActivity implements Bat ...@@ -112,6 +114,10 @@ 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())){
toast(R.string.permission);
return;
}
if (clientId == null) { if (clientId == null) {
toast("请先选择客户"); toast("请先选择客户");
return; return;
......
...@@ -12,10 +12,12 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -12,10 +12,12 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean; import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.ProcessBean; import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.StockBean; import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.bean.workEnum.PermissionType; 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.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -94,6 +96,10 @@ public class StoreSaleActivity extends WorkToolBarActivity implements BatSaleCon ...@@ -94,6 +96,10 @@ 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())){
toast(R.string.permission);
return;
}
if (clientId == null) { if (clientId == null) {
toast("请先选择客户"); toast("请先选择客户");
return; return;
......
...@@ -11,6 +11,7 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -11,6 +11,7 @@ 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.DepBean;
import com.wd.workoffice.bean.ProPriceBean; import com.wd.workoffice.bean.ProPriceBean;
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;
...@@ -43,6 +44,7 @@ public class WorkAccountActivity extends WorkToolBarActivity { ...@@ -43,6 +44,7 @@ public class WorkAccountActivity extends WorkToolBarActivity {
@BindView(R.id.tv_see_flow) @BindView(R.id.tv_see_flow)
TextView tvSeeFlow; TextView tvSeeFlow;
private AccountBean dataBean; private AccountBean dataBean;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -50,14 +52,17 @@ public class WorkAccountActivity extends WorkToolBarActivity { ...@@ -50,14 +52,17 @@ public class WorkAccountActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
getData(); if (!WorkUtils.hasPermission(PagePermissionType.BALANCE_DETAILS.getName())) {
toast(R.string.permission);
} else {
getData();
}
} }
private void getData() { private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -78,7 +83,7 @@ public class WorkAccountActivity extends WorkToolBarActivity { ...@@ -78,7 +83,7 @@ public class WorkAccountActivity extends WorkToolBarActivity {
dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class); dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
tvName.setText(dataBean.getName()); tvName.setText(dataBean.getName());
tvDpeName.setText(dataBean.getName()); tvDpeName.setText(dataBean.getName());
tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(),2)); tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount())); tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
} }
}); });
...@@ -96,10 +101,14 @@ public class WorkAccountActivity extends WorkToolBarActivity { ...@@ -96,10 +101,14 @@ public class WorkAccountActivity extends WorkToolBarActivity {
@OnClick(R.id.tv_see_flow) @OnClick(R.id.tv_see_flow)
public void onViewClicked() { public void onViewClicked() {
if (dataBean==null){ if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_SHELF_LIST.getName())) {
toast(R.string.permission);
return;
}
if (dataBean == null) {
toast("正在加载中,请稍后"); toast("正在加载中,请稍后");
return; return;
} }
startActivity(WorkAccountFlowActivity.class,"id",dataBean.getDeptId()+""); startActivity(WorkAccountFlowActivity.class, "id", dataBean.getDeptId() + "");
} }
} }
...@@ -6,6 +6,8 @@ import android.widget.LinearLayout; ...@@ -6,6 +6,8 @@ import android.widget.LinearLayout;
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.PagePermissionType;
import com.wd.workoffice.util.WorkUtils;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
...@@ -75,10 +77,18 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity { ...@@ -75,10 +77,18 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(WorkContactsMoneyActivity.class, "type","1","id", getIntent().getStringExtra("id")); startActivity(WorkContactsMoneyActivity.class, "type","1","id", getIntent().getStringExtra("id"));
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())){
toast(R.string.permission);
return;
}
startActivity(WorkContactsMoneyActivity.class, "type","3","id", getIntent().getStringExtra("id")); startActivity(WorkContactsMoneyActivity.class, "type","3","id", getIntent().getStringExtra("id"));
}else { }else {
startActivity(WorkContactsMoneyActivity.class, "type","2","id", getIntent().getStringExtra("id")); startActivity(WorkContactsMoneyActivity.class, "type","2","id", getIntent().getStringExtra("id"));
......
...@@ -14,6 +14,7 @@ import com.wd.workoffice.R; ...@@ -14,6 +14,7 @@ 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.ContactsMoneyBean; import com.wd.workoffice.bean.ContactsMoneyBean;
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.ContactsGetMoneyAdapter; import com.wd.workoffice.ui.adapter.ContactsGetMoneyAdapter;
...@@ -165,6 +166,10 @@ public class WorkContactsMoneyActivity extends WorkToolBarActivity { ...@@ -165,6 +166,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(WorkContactsMoneyFlowActivity.class, "type", type, startActivity(WorkContactsMoneyFlowActivity.class, "type", type,
"id", dataList.get(position).getId() + ""); "id", dataList.get(position).getId() + "");
} }
......
...@@ -13,6 +13,7 @@ import com.wd.workoffice.R; ...@@ -13,6 +13,7 @@ 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.DepBean; import com.wd.workoffice.bean.DepBean;
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.WorkDepAdapter; import com.wd.workoffice.ui.adapter.WorkDepAdapter;
...@@ -122,6 +123,10 @@ public class WorkDepActivity extends WorkToolBarActivity { ...@@ -122,6 +123,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(WorkDepDetailActivity.class, "id", dataList.get(position).getId() + ""); startActivity(WorkDepDetailActivity.class, "id", dataList.get(position).getId() + "");
} }
}); });
......
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.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.Switch; import android.widget.Switch;
...@@ -10,11 +9,9 @@ import com.alibaba.fastjson.JSON; ...@@ -10,11 +9,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.DepBean; import com.wd.workoffice.bean.DepBean;
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.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -61,7 +58,6 @@ public class WorkDepDetailActivity extends WorkToolBarActivity { ...@@ -61,7 +58,6 @@ public class WorkDepDetailActivity extends WorkToolBarActivity {
private void getData() { private void getData() {
RtfUtils.getRtf().getDepDetail(getIntent().getStringExtra("id")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getRtf().getDepDetail(getIntent().getStringExtra("id")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
......
...@@ -80,10 +80,4 @@ public class WorkDepPersonActivity extends WorkToolBarActivity { ...@@ -80,10 +80,4 @@ public class WorkDepPersonActivity extends WorkToolBarActivity {
return R.layout.activity_work_dep_person; return R.layout.activity_work_dep_person;
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
} }
...@@ -13,6 +13,7 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -13,6 +13,7 @@ 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.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.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;
...@@ -65,7 +66,11 @@ public class WorkFinancialAccountActivity extends WorkToolBarActivity { ...@@ -65,7 +66,11 @@ 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);
getData(); if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_DEPT_LIST.getName())) {
toast(R.string.permission);
} else {
getData();
}
} }
private void getData() { private void getData() {
......
...@@ -17,6 +17,8 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -17,6 +17,8 @@ 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.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.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;
...@@ -89,12 +91,13 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity { ...@@ -89,12 +91,13 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(dataBean.getStatus()))); tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(dataBean.getStatus())));
tvTime.setText(dataBean.getCreatedTime()); tvTime.setText(dataBean.getCreatedTime());
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
param.put("id",dataBean.getId()); param.put("id", dataBean.getId());
param.put("applyAmount",dataBean.getApplyAmount()); param.put("applyAmount", dataBean.getApplyAmount());
} }
@Override @Override
protected void initData() { protected void initData() {
changePermission();
} }
...@@ -119,6 +122,20 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity { ...@@ -119,6 +122,20 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
break; break;
} }
} }
private void changePermission() {
boolean hasPermission;
if (TextUtils.equals("1", getIntent().getStringExtra("type"))) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_EXAM.getName());
} else {
hasPermission = WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_EXAM.getName());
}
if (!hasPermission) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
}
private void checkDialog(int status) { private void checkDialog(int status) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null); View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
...@@ -171,9 +188,9 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity { ...@@ -171,9 +188,9 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
param.put("status", status); param.put("status", status);
param.put("auditRemark", remark); param.put("auditRemark", remark);
Observable<BaseBean> observable = RtfUtils.getRtf().checkMoneyBack(WorkUtils.convertMapToBody(param)); Observable<BaseBean> observable = RtfUtils.getRtf().checkMoneyBack(WorkUtils.convertMapToBody(param));
if (TextUtils.equals("1",getIntent().getStringExtra("type"))){ if (TextUtils.equals("1", getIntent().getStringExtra("type"))) {
observable = RtfUtils.getRtf().checkMoneyBack(WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().checkMoneyBack(WorkUtils.convertMapToBody(param));
}else { } else {
observable = RtfUtils.getRtf().checkMoneyPay(WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().checkMoneyPay(WorkUtils.convertMapToBody(param));
} }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......
...@@ -15,6 +15,7 @@ import com.wd.workoffice.bean.MoneyOutBean; ...@@ -15,6 +15,7 @@ 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.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.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.WorkFinancialOutAdapter; import com.wd.workoffice.ui.adapter.WorkFinancialOutAdapter;
...@@ -100,7 +101,11 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity { ...@@ -100,7 +101,11 @@ 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");
getData(); if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_LIST.getName())) {
toast(R.string.permission);
} else {
getData();
}
} }
private void getData() { private void getData() {
...@@ -146,9 +151,13 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity { ...@@ -146,9 +151,13 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override @Override
protected void initEvent() { protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> { srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1; if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_LIST.getName())) {
param.put("current", page); toast(R.string.permission);
getData(); } else {
page = 1;
param.put("current", page);
getData();
}
}); });
dataAdapter.setOnLoadMoreListener(() -> { dataAdapter.setOnLoadMoreListener(() -> {
param.put("current", page); param.put("current", page);
...@@ -171,7 +180,11 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity { ...@@ -171,7 +180,11 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu); if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_APPLY.getName())){
return super.onCreateOptionsMenu(menu);
}else {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
......
...@@ -15,6 +15,7 @@ import com.wd.workoffice.bean.MoneyOutBean; ...@@ -15,6 +15,7 @@ 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.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.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.WorkFinancialOutAdapter; import com.wd.workoffice.ui.adapter.WorkFinancialOutAdapter;
...@@ -100,7 +101,11 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -100,7 +101,11 @@ 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");
getData(); if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_LIST.getName())) {
toast(R.string.permission);
} else {
getData();
}
} }
private void getData() { private void getData() {
...@@ -146,9 +151,13 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -146,9 +151,13 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
@Override @Override
protected void initEvent() { protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> { srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1; if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_LIST.getName())) {
param.put("current", page); toast(R.string.permission);
getData(); } else {
page = 1;
param.put("current", page);
getData();
}
}); });
dataAdapter.setOnLoadMoreListener(() -> { dataAdapter.setOnLoadMoreListener(() -> {
param.put("current", page); param.put("current", page);
...@@ -157,7 +166,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -157,7 +166,7 @@ public class WorkFinancialPayActivity 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) {
startActivity(WorkFinancialDetailActivity.class, "type","2","detail", JSON.toJSONString(dataList.get(position))); startActivity(WorkFinancialDetailActivity.class, "type", "2", "detail", JSON.toJSONString(dataList.get(position)));
} }
}); });
...@@ -171,7 +180,11 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -171,7 +180,11 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu); if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_APPLY.getName())) {
return super.onCreateOptionsMenu(menu);
} else {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
......
...@@ -14,6 +14,7 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -14,6 +14,7 @@ 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.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;
...@@ -107,6 +108,10 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity { ...@@ -107,6 +108,10 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
} }
private void getData() { private void getData() {
if (!hasPermission()) {
toast(R.string.permission);
return;
}
Observable<BaseBean> baseBeanObservable; Observable<BaseBean> baseBeanObservable;
if (TextUtils.equals(orderType, "供应订单")) { if (TextUtils.equals(orderType, "供应订单")) {
baseBeanObservable = RtfUtils.getRtf().receiveFoTicket(param); baseBeanObservable = RtfUtils.getRtf().receiveFoTicket(param);
...@@ -189,7 +194,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity { ...@@ -189,7 +194,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add: case R.id.add:
startActivity(WorkFinancialReceiveTicketAddActivity.class); startActivity(WorkFinancialReceiveTicketAddActivity.class);
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
...@@ -213,4 +218,18 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity { ...@@ -213,4 +218,18 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
param.put("current", page); param.put("current", page);
getData(); getData();
} }
private boolean hasPermission() {
boolean hasPermission = false;
if (TextUtils.equals(orderType, "供应订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_LIST.getName())) {
hasPermission = true;
}
} else if (TextUtils.equals(orderType, "外采购订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_LIST.getName())) {
hasPermission = true;
}
}
return hasPermission;
}
} }
...@@ -12,6 +12,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog; ...@@ -12,6 +12,7 @@ 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.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;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -65,6 +66,9 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity { ...@@ -65,6 +66,9 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
chooseType = WorkUtils.getOrderCode(typeList[which]); chooseType = WorkUtils.getOrderCode(typeList[which]);
tvOrder.setText(typeList[which]); tvOrder.setText(typeList[which]);
dialog.dismiss(); dialog.dismiss();
if (!hasAddPermission()){
toast(R.string.permission);
}
} }
}); });
} }
...@@ -102,6 +106,10 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity { ...@@ -102,6 +106,10 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.tv_next: case R.id.tv_next:
if (!hasAddPermission()){
toast(R.string.permission);
return;
}
if (TextUtils.isEmpty(chooseType)) { if (TextUtils.isEmpty(chooseType)) {
toast("请选择订单类别"); toast("请选择订单类别");
return; return;
...@@ -147,4 +155,18 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity { ...@@ -147,4 +155,18 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
public void refresh(CheckTicketEvent event) { public void refresh(CheckTicketEvent event) {
finish(); finish();
} }
private boolean hasAddPermission() {
boolean hasPermission = false;
if (TextUtils.equals(chooseType, "供应订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_SAVE.getName())) {
hasPermission = true;
}
} else if (TextUtils.equals(chooseType, "外采购订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_SAVE.getName())) {
hasPermission = true;
}
}
return hasPermission;
}
} }
...@@ -17,6 +17,7 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -17,6 +17,7 @@ import com.wd.workoffice.app.WorkToolBarActivity;
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.CheckTicketEvent; import com.wd.workoffice.bean.event.CheckTicketEvent;
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.WorkFinancialTicketDetailAdapter;
...@@ -68,6 +69,7 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit ...@@ -68,6 +69,7 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit
private WorkFinancialTicketDetailAdapter dataAdapter; private WorkFinancialTicketDetailAdapter dataAdapter;
private Map<String, Object> param; private Map<String, Object> param;
private String orderType; private String orderType;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -94,6 +96,7 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit ...@@ -94,6 +96,7 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit
param = new HashMap<>(); param = new HashMap<>();
param.put("id", info.getId()); param.put("id", info.getId());
orderType = getIntent().getStringExtra("type"); orderType = getIntent().getStringExtra("type");
changePermission();
} }
private void getData(String id) { private void getData(String id) {
...@@ -134,7 +137,6 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit ...@@ -134,7 +137,6 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit
} }
@OnClick({R.id.tv_refuse, R.id.tv_agree}) @OnClick({R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
...@@ -146,6 +148,7 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit ...@@ -146,6 +148,7 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit
break; break;
} }
} }
private void checkDialog(int status) { private void checkDialog(int status) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null); View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
...@@ -229,4 +232,17 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit ...@@ -229,4 +232,17 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit
} }
}); });
} }
private void changePermission() {
boolean hasPermission = true;
if (TextUtils.equals(orderType, "供应订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_AUDIT.getName());
} else if (TextUtils.equals(orderType, "外采购订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_AUDIT.getName());
}
if (!hasPermission) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
}
} }
...@@ -14,6 +14,8 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -14,6 +14,8 @@ 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.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.WorkFinancialTicketAdapter; import com.wd.workoffice.ui.adapter.WorkFinancialTicketAdapter;
...@@ -52,7 +54,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -52,7 +54,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
private SmartRefreshLayout srlRefresh; private SmartRefreshLayout srlRefresh;
private List<TicketBean.RecordsBean> dataList; private List<TicketBean.RecordsBean> dataList;
private WorkFinancialTicketAdapter dataAdapter; private WorkFinancialTicketAdapter dataAdapter;
private String orderType="销售订单"; private String orderType = "销售订单";
@Override @Override
protected void initView() { protected void initView() {
...@@ -103,7 +105,12 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -103,7 +105,12 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
getData(); getData();
} }
private void getData() { private void getData() {
if (!hasPermission()) {
toast(R.string.permission);
return;
}
Observable<BaseBean> baseBeanObservable; Observable<BaseBean> baseBeanObservable;
if (TextUtils.equals(orderType, "销售订单")) { if (TextUtils.equals(orderType, "销售订单")) {
baseBeanObservable = RtfUtils.getRtf().openSoTicket(param); baseBeanObservable = RtfUtils.getRtf().openSoTicket(param);
...@@ -167,7 +174,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -167,7 +174,7 @@ public class WorkFinancialTicketActivity 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) {
startActivity(WorkFinancialTicketDetailActivity.class, "type",orderType, "info", JSON.toJSONString(dataList.get(position))); startActivity(WorkFinancialTicketDetailActivity.class, "type", orderType, "info", JSON.toJSONString(dataList.get(position)));
} }
}); });
} }
...@@ -212,4 +219,30 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -212,4 +219,30 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
param.put("current", page); param.put("current", page);
getData(); getData();
} }
private boolean hasPermission() {
boolean hasPermission = true;
if (TextUtils.equals(orderType, "销售订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_LIST.getName());
} else if (TextUtils.equals(orderType, "外采购订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_LIST.getName());
} else if (TextUtils.equals(orderType, "坩埚订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_LIST.getName());
}
return hasPermission;
}
// private void changePermission() {
// boolean hasPermission = true;
// if (TextUtils.equals(orderType, "销售订单")) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_AUDIT.getName());
// } else if (TextUtils.equals(orderType, "外采购订单")) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.PRODUCT.getName());
// } else if (TextUtils.equals(orderType, "坩埚订单")) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.PRODUCT.getName());
// }
// dataAdapter.setHasPermission(hasPermission);
// dataAdapter.notifyDataSetChanged();
// }
} }
...@@ -13,6 +13,7 @@ import com.wd.workoffice.R; ...@@ -13,6 +13,7 @@ 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.OrderType;
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;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -66,6 +67,9 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity { ...@@ -66,6 +67,9 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
chooseType = WorkUtils.getOrderCode(typeList[which]); chooseType = WorkUtils.getOrderCode(typeList[which]);
tvOrder.setText(typeList[which]); tvOrder.setText(typeList[which]);
dialog.dismiss(); dialog.dismiss();
if (!hasAddPermission()){
toast(R.string.permission);
}
} }
}); });
} }
...@@ -104,7 +108,10 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity { ...@@ -104,7 +108,10 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.tv_next: case R.id.tv_next:
if (!hasAddPermission()){
toast(R.string.permission);
return;
}
if (TextUtils.isEmpty(chooseType)) { if (TextUtils.isEmpty(chooseType)) {
toast("请选择订单类别"); toast("请选择订单类别");
return; return;
...@@ -149,4 +156,28 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity { ...@@ -149,4 +156,28 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
public void refresh(CheckTicketEvent event) { public void refresh(CheckTicketEvent event) {
finish(); finish();
} }
private boolean hasAddPermission() {
boolean hasPermission = false;
if (TextUtils.equals(chooseType, "销售订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_SAVE.getName())) {
hasPermission = true;
}
} else if (TextUtils.equals(chooseType, "组装订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_SAVE.getName())) {
hasPermission = true;
}
}else if (TextUtils.equals(chooseType, "外采购订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_SAVE.getName())) {
hasPermission = true;
}
} else if (TextUtils.equals(chooseType, "坩埚订单")) {
if (!WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_SAVE.getName())) {
hasPermission = true;
}
}
return hasPermission;
}
} }
...@@ -19,6 +19,8 @@ import com.wd.workoffice.bean.TicketBean; ...@@ -19,6 +19,8 @@ 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.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.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.WorkFinancialTicketDetailAdapter;
...@@ -97,6 +99,7 @@ public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity { ...@@ -97,6 +99,7 @@ public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity {
if (TextUtils.equals("contacts",orderType)){ if (TextUtils.equals("contacts",orderType)){
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
} }
changePermission();
} }
private void getData(String id) { private void getData(String id) {
...@@ -234,4 +237,19 @@ public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity { ...@@ -234,4 +237,19 @@ public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
private void changePermission() {
boolean hasPermission = true;
if (TextUtils.equals(orderType, "销售订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_AUDIT.getName());
} else if (TextUtils.equals(orderType, "外采购订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_AUDIT.getName());
} else if (TextUtils.equals(orderType, "坩埚订单")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_AUDIT.getName());
}
if (!hasPermission) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
}
} }
...@@ -7,8 +7,10 @@ import android.view.MenuItem; ...@@ -7,8 +7,10 @@ import android.view.MenuItem;
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.PagePermissionType;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.WorkLogisticsFragment; import com.wd.workoffice.ui.fg.WorkLogisticsFragment;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -46,6 +48,10 @@ public class WorkLogisticActivity extends WorkToolBarActivity { ...@@ -46,6 +48,10 @@ public class WorkLogisticActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_APPLY_PAGE.getName())){
toast(R.string.permission);
return;
}
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
...@@ -74,7 +80,9 @@ public class WorkLogisticActivity extends WorkToolBarActivity { ...@@ -74,7 +80,9 @@ public class WorkLogisticActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu); if (WorkUtils.hasPermission(PagePermissionType.LOGISTICS_SAVE.getName())){
getMenuInflater().inflate(R.menu.menu_add, menu);
}
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
......
...@@ -20,6 +20,7 @@ import com.wd.workoffice.bean.ProPriceBean; ...@@ -20,6 +20,7 @@ import com.wd.workoffice.bean.ProPriceBean;
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.CheckLogisticEvent;
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.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.WorkFinancialTicketDetailAdapter;
...@@ -101,6 +102,7 @@ public class WorkLogisticsDetailActivity extends WorkToolBarActivity { ...@@ -101,6 +102,7 @@ public class WorkLogisticsDetailActivity extends WorkToolBarActivity {
tvCode.setText(info.getInvoiceNumber()); tvCode.setText(info.getInvoiceNumber());
if (TextUtils.equals(info.getStatus(), "0")) { if (TextUtils.equals(info.getStatus(), "0")) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
changePermission();
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
} }
...@@ -113,6 +115,14 @@ public class WorkLogisticsDetailActivity extends WorkToolBarActivity { ...@@ -113,6 +115,14 @@ public class WorkLogisticsDetailActivity extends WorkToolBarActivity {
orderType = getIntent().getStringExtra("type"); orderType = getIntent().getStringExtra("type");
} }
private void changePermission() {
boolean hasPermission = WorkUtils.hasPermission(PagePermissionType.LOGISTICS_UPDATE.getName());
if (!hasPermission) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
}
private void getData(String id) { private void getData(String id) {
RtfUtils.getRtf().logisticsDetail(id).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getRtf().logisticsDetail(id).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......
...@@ -13,6 +13,7 @@ import com.wd.workoffice.R; ...@@ -13,6 +13,7 @@ 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.StockFlowBean; import com.wd.workoffice.bean.StockFlowBean;
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.WorkStockDetailFlowAdapter; import com.wd.workoffice.ui.adapter.WorkStockDetailFlowAdapter;
...@@ -71,7 +72,11 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity { ...@@ -71,7 +72,11 @@ 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);
getData(); if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL_FLOW.getName())) {
toast(R.string.permission);
} else {
getData();
}
} }
private void getData() { private void getData() {
...@@ -121,9 +126,13 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity { ...@@ -121,9 +126,13 @@ 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) {
page = 1; if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_DETAIL_FLOW.getName())) {
param.put("current", page); toast(R.string.permission);
getData(); } else {
page = 1;
param.put("current", page);
getData();
}
} }
}); });
dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
...@@ -147,8 +156,7 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity { ...@@ -147,8 +156,7 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.tv_start, R.id.tv_end})
@OnClick({ R.id.tv_start, R.id.tv_end})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.tv_start: case R.id.tv_start:
......
...@@ -84,6 +84,7 @@ public class WorkWarehouseStockFlowActivity extends WorkToolBarActivity { ...@@ -84,6 +84,7 @@ public class WorkWarehouseStockFlowActivity extends WorkToolBarActivity {
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("sqId", getIntent().getStringExtra("id")); param.put("sqId", getIntent().getStringExtra("id"));
param.put("current", page); param.put("current", page);
getData(); getData();
} }
......
...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.AddStockBean; import com.wd.workoffice.bean.AddStockBean;
import com.wd.workoffice.bean.ReturnApplyBean; import com.wd.workoffice.bean.ReturnApplyBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -18,7 +19,7 @@ import androidx.annotation.Nullable; ...@@ -18,7 +19,7 @@ import androidx.annotation.Nullable;
public class AddStockSendApplyAdapter extends BaseQuickAdapter<AddStockBean.RecordsBean, BaseViewHolder> { public class AddStockSendApplyAdapter extends BaseQuickAdapter<AddStockBean.RecordsBean, BaseViewHolder> {
int status; int status;
boolean hasPermission=true;
public AddStockSendApplyAdapter(int layoutResId, List data) { public AddStockSendApplyAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
} }
...@@ -36,10 +37,20 @@ public class AddStockSendApplyAdapter extends BaseQuickAdapter<AddStockBean.Reco ...@@ -36,10 +37,20 @@ public class AddStockSendApplyAdapter extends BaseQuickAdapter<AddStockBean.Reco
helper.setText(R.id.tv_time, item.getCreatedTime()); helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_status, WorkUtils.getReturnStatus(Integer.valueOf(item.getStatus()))); helper.setText(R.id.tv_status, WorkUtils.getReturnStatus(Integer.valueOf(item.getStatus())));
if (status == 0) { if (status == 0) {
helper.setVisible(R.id.ll_btn, true); if (hasPermission){
helper.addOnClickListener(R.id.tv_agree); helper.setVisible(R.id.ll_btn, true);
helper.addOnClickListener(R.id.tv_refuse); helper.addOnClickListener(R.id.tv_agree);
helper.addOnClickListener(R.id.tv_refuse);
}
} }
} }
public boolean isHasPermission() {
return hasPermission;
}
public void setHasPermission(boolean hasPermission) {
this.hasPermission = hasPermission;
}
} }
...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,7 @@ 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.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -69,6 +70,9 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -69,6 +70,9 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
case 600: case 600:
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.CO_ENTER_PAGE.getName())) {
helper.setGone(R.id.tv_add, false);
}
} }
} }
...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,7 @@ 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.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -70,6 +71,9 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai ...@@ -70,6 +71,9 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai
case 600: case 600:
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.IO_ENTER_PAGE.getName())) {
helper.setGone(R.id.tv_add, false);
}
} }
} }
...@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -8,6 +8,7 @@ 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.OrderBean;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -68,6 +69,21 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -68,6 +69,21 @@ 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())) {
helper.setGone(R.id.tv_add, true);
} else {
helper.setGone(R.id.tv_add, false);
}
if (WorkUtils.hasPermission(PagePermissionType.SO_RETURN_APPLY_LIST.getName())) {
helper.setGone(R.id.tv_return, true);
} else {
helper.setGone(R.id.tv_return, false);
}
if (WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_LIST.getName())) {
helper.setGone(R.id.tv_get, true);
} else {
helper.setGone(R.id.tv_get, false);
}
} }
} }
...@@ -10,6 +10,8 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -10,6 +10,8 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.LogisticDetailBean; import com.wd.workoffice.bean.LogisticDetailBean;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
......
...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,7 @@ 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.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -65,6 +66,16 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O ...@@ -65,6 +66,16 @@ 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())) {
helper.setGone(R.id.tv_add, true);
} else {
helper.setGone(R.id.tv_add, false);
}
if (WorkUtils.hasPermission(PagePermissionType.PO_RETURN_APPLY_LIST.getName())) {
helper.setGone(R.id.tv_return, true);
} else {
helper.setGone(R.id.tv_return, false);
}
} }
} }
...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,7 @@ 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.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -43,6 +44,11 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -43,6 +44,11 @@ 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())) {
helper.setGone(R.id.tv_get, true);
} else {
helper.setGone(R.id.tv_get, false);
}
} }
} }
...@@ -17,6 +17,7 @@ import androidx.annotation.Nullable; ...@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
public class QualitypplyAdapter extends BaseQuickAdapter<AddStockBean.RecordsBean, BaseViewHolder> { public class QualitypplyAdapter extends BaseQuickAdapter<AddStockBean.RecordsBean, BaseViewHolder> {
int status; int status;
boolean hasPermission;
public QualitypplyAdapter(int layoutResId, List data) { public QualitypplyAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
...@@ -35,10 +36,20 @@ public class QualitypplyAdapter extends BaseQuickAdapter<AddStockBean.RecordsBea ...@@ -35,10 +36,20 @@ public class QualitypplyAdapter extends BaseQuickAdapter<AddStockBean.RecordsBea
helper.setText(R.id.tv_time, item.getCreatedTime()); helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getQualityInspectionStatus()))); helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getQualityInspectionStatus())));
if (status == 0) { if (status == 0) {
helper.setVisible(R.id.ll_btn, true); if (hasPermission) {
helper.addOnClickListener(R.id.tv_agree); helper.setVisible(R.id.ll_btn, true);
helper.addOnClickListener(R.id.tv_refuse); helper.addOnClickListener(R.id.tv_agree);
helper.addOnClickListener(R.id.tv_refuse);
}
} }
} }
public boolean isHasPermission() {
return hasPermission;
}
public void setHasPermission(boolean hasPermission) {
this.hasPermission = hasPermission;
}
} }
...@@ -17,7 +17,7 @@ import androidx.annotation.Nullable; ...@@ -17,7 +17,7 @@ import androidx.annotation.Nullable;
public class SendApplyAdapter extends BaseQuickAdapter<SendApplyBean.RecordsBean, BaseViewHolder> { public class SendApplyAdapter extends BaseQuickAdapter<SendApplyBean.RecordsBean, BaseViewHolder> {
int status; int status;
boolean hasPermission=true;
public SendApplyAdapter(int layoutResId, List data) { public SendApplyAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
} }
...@@ -33,12 +33,20 @@ public class SendApplyAdapter extends BaseQuickAdapter<SendApplyBean.RecordsBean ...@@ -33,12 +33,20 @@ public class SendApplyAdapter extends BaseQuickAdapter<SendApplyBean.RecordsBean
helper.setText(R.id.tv_reason, item.getApplyRemark()); helper.setText(R.id.tv_reason, item.getApplyRemark());
helper.setText(R.id.tv_time, item.getCreatedTime()); helper.setText(R.id.tv_time, item.getCreatedTime());
if (status == 0) { if (status == 0) {
helper.setVisible(R.id.ll_btn, true); if (hasPermission){
helper.addOnClickListener(R.id.tv_agree); helper.setVisible(R.id.ll_btn, true);
helper.addOnClickListener(R.id.tv_refuse); helper.addOnClickListener(R.id.tv_agree);
helper.addOnClickListener(R.id.tv_refuse);
}
} }
}
public boolean isHasPermission() {
return hasPermission;
}
public void setHasPermission(boolean hasPermission) {
this.hasPermission = hasPermission;
} }
} }
...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,7 @@ 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.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -66,6 +67,12 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet ...@@ -66,6 +67,12 @@ 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())) {
helper.setGone(R.id.tv_quality, false);
}
if (!WorkUtils.hasPermission(PagePermissionType.FO_ENTER_PAGE.getName())) {
helper.setGone(R.id.tv_add, false);
}
} }
} }
...@@ -18,6 +18,7 @@ import androidx.annotation.Nullable; ...@@ -18,6 +18,7 @@ import androidx.annotation.Nullable;
public class UseApplyAdapter extends BaseQuickAdapter<UseApplyBean.RecordsBean, BaseViewHolder> { public class UseApplyAdapter extends BaseQuickAdapter<UseApplyBean.RecordsBean, BaseViewHolder> {
int status; int status;
boolean hasPermission = true;
public UseApplyAdapter(int layoutResId, List data) { public UseApplyAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
...@@ -35,12 +36,21 @@ public class UseApplyAdapter extends BaseQuickAdapter<UseApplyBean.RecordsBean, ...@@ -35,12 +36,21 @@ public class UseApplyAdapter extends BaseQuickAdapter<UseApplyBean.RecordsBean,
helper.setText(R.id.tv_time, item.getCreatedTime()); helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus()))); helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
if (status == 0) { if (status == 0) {
helper.setVisible(R.id.ll_btn, true); if (hasPermission) {
helper.addOnClickListener(R.id.tv_agree); helper.setVisible(R.id.ll_btn, true);
helper.addOnClickListener(R.id.tv_refuse); helper.addOnClickListener(R.id.tv_agree);
helper.addOnClickListener(R.id.tv_refuse);
}
} }
}
public boolean isHasPermission() {
return hasPermission;
}
public void setHasPermission(boolean hasPermission) {
this.hasPermission = hasPermission;
} }
} }
...@@ -12,7 +12,9 @@ import com.wd.workoffice.R; ...@@ -12,7 +12,9 @@ import com.wd.workoffice.R;
import com.wd.workoffice.bean.AccountBean; 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.OrderBean;
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 java.util.List; import java.util.List;
...@@ -41,6 +43,14 @@ public class WorkFinancialAccountAdapter extends BaseQuickAdapter<AllAccountBean ...@@ -41,6 +43,14 @@ 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())) {
helper.setGone(R.id.tv_freeze, true);
helper.setGone(R.id.tv_thaw, true);
}
if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_FLOW_LIST.getName())) {
helper.setGone(R.id.tv_see_flow, true);
}
} }
} }
...@@ -5,6 +5,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,8 @@ 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.ProductBean; import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -32,6 +34,12 @@ public class WorkProductAdapter extends BaseQuickAdapter<ProductBean.RecordsBean ...@@ -32,6 +34,12 @@ 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())){
helper.setGone(R.id.btn_modify,false);
}
if (!WorkUtils.hasPermission(PagePermissionType.SHELF.getName())){
helper.setGone(R.id.btn_on_sale,false);
}
} }
} }
...@@ -5,6 +5,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,8 @@ 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.StockDetailBean; import com.wd.workoffice.bean.StockDetailBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -27,6 +29,10 @@ public class WorkStockDetailAdapter extends BaseQuickAdapter<StockDetailBean.Rec ...@@ -27,6 +29,10 @@ 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())) {
helper.setGone(R.id.tv_flow, false);
}
} }
} }
...@@ -5,6 +5,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,8 @@ 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.WarehouseStockBean; import com.wd.workoffice.bean.WarehouseStockBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -24,10 +26,16 @@ public class WorkWarhosutStockAdapter extends BaseQuickAdapter<WarehouseStockBea ...@@ -24,10 +26,16 @@ public class WorkWarhosutStockAdapter extends BaseQuickAdapter<WarehouseStockBea
helper.setText(R.id.tv_name, item.getProductName()); helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_code, "品名:".concat(item.getProductSoleCode())); helper.setText(R.id.tv_code, "品名:".concat(item.getProductSoleCode()));
helper.setText(R.id.tv_img_code, "图号:".concat(item.getProductSimpleCode())); helper.setText(R.id.tv_img_code, "图号:".concat(item.getProductSimpleCode()));
helper.setText(R.id.tv_num,String.valueOf(item.getQuantity())); helper.setText(R.id.tv_num, String.valueOf(item.getQuantity()));
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())) {
helper.setGone(R.id.tv_detail, false);
}
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_FLOW.getName())) {
helper.setGone(R.id.tv_flow, false);
}
} }
} }
...@@ -20,6 +20,7 @@ import com.wd.workoffice.bean.SendApplyBean; ...@@ -20,6 +20,7 @@ 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.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.PermissionType; 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;
...@@ -85,6 +86,7 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -85,6 +86,7 @@ public class AddStockApplyFragment extends WorkBaseFg {
dataAdapter = new AddStockSendApplyAdapter(R.layout.item_add_stock_apply, dataList, Integer.valueOf(state)); dataAdapter = new AddStockSendApplyAdapter(R.layout.item_add_stock_apply, dataList, Integer.valueOf(state));
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
changePermission();
getData(); getData();
} }
...@@ -110,7 +112,7 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -110,7 +112,7 @@ public class AddStockApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().addFoStockApplyList(param); observable = RtfUtils.getRtf().addFoStockApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().addCoStockApplyList(param); observable = RtfUtils.getRtf().addCoStockApplyList(param);
}else if (TextUtils.equals(orderType, OrderType.IN.getCode())) { } else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().addIoStockApplyList(param); observable = RtfUtils.getRtf().addIoStockApplyList(param);
} else { } else {
observable = RtfUtils.getRtf().addStockApplyList(param); observable = RtfUtils.getRtf().addStockApplyList(param);
...@@ -169,7 +171,7 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -169,7 +171,7 @@ public class AddStockApplyFragment extends WorkBaseFg {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(AddStockApplyDetailActivity.class, startActivity(AddStockApplyDetailActivity.class,
"orderType",orderType, "orderType", orderType,
"info", JSON.toJSONString(dataList.get(position))); "info", JSON.toJSONString(dataList.get(position)));
} }
}); });
...@@ -189,6 +191,22 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -189,6 +191,22 @@ 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());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_ENTER_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_ENTER_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_ENTER_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.IO_ENTER_AUDIT.getName());
}
dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged();
}
private void checkDialog(int status, int id) { private void checkDialog(int status, int id) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
...@@ -252,9 +270,9 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -252,9 +270,9 @@ public class AddStockApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.IN.getCode())) { } else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().addIoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addIoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
}else { } else {
observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......
...@@ -114,6 +114,7 @@ public class MainFragment extends WorkBaseFg { ...@@ -114,6 +114,7 @@ public class MainFragment extends WorkBaseFg {
} }
// @Nullable // @Nullable
// @Override // @Override
// public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { // public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
......
...@@ -8,6 +8,7 @@ import com.wd.workoffice.R; ...@@ -8,6 +8,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
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.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.SaleOrderDetailActivity; import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
...@@ -80,6 +81,10 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View ...@@ -80,6 +81,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class, startActivity(SaleOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
......
...@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
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.OrderBean; import com.wd.workoffice.bean.OrderBean;
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.SupplierOrderDetailActivity; import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
...@@ -76,6 +77,10 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract. ...@@ -76,6 +77,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class, startActivity(SupplierOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
......
...@@ -5,7 +5,9 @@ import android.os.Bundle; ...@@ -5,7 +5,9 @@ import android.os.Bundle;
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.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
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.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -44,6 +46,10 @@ public class ProductOrderApplyFragment extends WorkBaseFg { ...@@ -44,6 +46,10 @@ public class ProductOrderApplyFragment extends WorkBaseFg {
@Override @Override
protected void initData() { protected void initData() {
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getName())) {
toast(R.string.permission);
return;
}
FragmentManager sfm = getChildFragmentManager(); FragmentManager sfm = getChildFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { for (int i = 0; i < tab.length; i++) {
......
...@@ -13,6 +13,7 @@ import com.wd.workoffice.bean.LogisticBean; ...@@ -13,6 +13,7 @@ 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.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.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;
...@@ -64,6 +65,7 @@ public class ProductOrderFragment extends WorkBaseFg { ...@@ -64,6 +65,7 @@ public class ProductOrderFragment extends WorkBaseFg {
@Override @Override
protected void initData() { protected void initData() {
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("identity", identity); param.put("identity", identity);
page = 1; page = 1;
...@@ -72,7 +74,12 @@ public class ProductOrderFragment extends WorkBaseFg { ...@@ -72,7 +74,12 @@ 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);
getData(); if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getName())) {
toast(R.string.permission);
return;
}else {
getData();
}
} }
@Override @Override
...@@ -138,6 +145,10 @@ public class ProductOrderFragment extends WorkBaseFg { ...@@ -138,6 +145,10 @@ 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())) {
toast(R.string.permission);
return;
}
startActivity(ProductOrderDetailActivity.class, startActivity(ProductOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", dataList.get(position).getId() + "", "id", dataList.get(position).getId() + "",
......
...@@ -18,6 +18,7 @@ import com.wd.workoffice.app.WorkBaseFg; ...@@ -18,6 +18,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.AddStockBean; import com.wd.workoffice.bean.AddStockBean;
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.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;
...@@ -83,6 +84,7 @@ public class QualityApplyFragment extends WorkBaseFg { ...@@ -83,6 +84,7 @@ public class QualityApplyFragment extends WorkBaseFg {
dataAdapter = new QualitypplyAdapter(R.layout.item_add_stock_apply, dataList, Integer.valueOf(state)); dataAdapter = new QualitypplyAdapter(R.layout.item_add_stock_apply, dataList, Integer.valueOf(state));
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
changePermission();
getData(); getData();
} }
...@@ -106,7 +108,7 @@ public class QualityApplyFragment extends WorkBaseFg { ...@@ -106,7 +108,7 @@ public class QualityApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().enterStoreApplyList(param); observable = RtfUtils.getRtf().enterStoreApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().enterStoreApplyList(param); observable = RtfUtils.getRtf().enterStoreApplyList(param);
} else { } else {
observable = RtfUtils.getRtf().enterStoreApplyList(param); observable = RtfUtils.getRtf().enterStoreApplyList(param);
} }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
...@@ -163,7 +165,7 @@ public class QualityApplyFragment extends WorkBaseFg { ...@@ -163,7 +165,7 @@ public class QualityApplyFragment extends WorkBaseFg {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(QualityApplyDetailActivity.class, startActivity(QualityApplyDetailActivity.class,
"orderType",orderType, "orderType", orderType,
"info", JSON.toJSONString(dataList.get(position))); "info", JSON.toJSONString(dataList.get(position)));
} }
}); });
...@@ -290,4 +292,17 @@ public class QualityApplyFragment extends WorkBaseFg { ...@@ -290,4 +292,17 @@ public class QualityApplyFragment extends WorkBaseFg {
param.put("current", page); param.put("current", page);
getData(); getData();
} }
private void changePermission() {
boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getName());
}
dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged();
}
} }
...@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
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.OrderBean; import com.wd.workoffice.bean.OrderBean;
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;
...@@ -78,6 +79,10 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V ...@@ -78,6 +79,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(InsideOrderDetailActivity.class, startActivity(InsideOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
......
...@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
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.OrderBean; import com.wd.workoffice.bean.OrderBean;
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.OutOrderDetailActivity;
...@@ -77,6 +78,10 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View ...@@ -77,6 +78,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class, startActivity(OutOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
......
...@@ -11,6 +11,7 @@ import com.wd.workoffice.R; ...@@ -11,6 +11,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
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.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.SaleOrderDetailActivity; import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
...@@ -94,6 +95,10 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie ...@@ -94,6 +95,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(SaleOrderDetailActivity.class, startActivity(SaleOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
......
...@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
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.OrderBean; import com.wd.workoffice.bean.OrderBean;
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.OutOrderDetailActivity;
...@@ -78,6 +79,10 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract ...@@ -78,6 +79,10 @@ 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())){
toast(R.string.permission);
return;
}
startActivity(SupplierOrderDetailActivity.class, startActivity(SupplierOrderDetailActivity.class,
"identity",identity, "identity",identity,
"id", orderList.get(position).getId() + "", "id", orderList.get(position).getId() + "",
......
...@@ -18,6 +18,7 @@ import com.wd.workoffice.app.WorkBaseFg; ...@@ -18,6 +18,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SendApplyBean; import com.wd.workoffice.bean.SendApplyBean;
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.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.SendApplyDetailActivity;
...@@ -80,6 +81,20 @@ public class SendApplyFragment extends WorkBaseFg { ...@@ -80,6 +81,20 @@ public class SendApplyFragment extends WorkBaseFg {
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
getData(); getData();
changePermission();
}
private void changePermission() {
boolean hasPermission =true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getName());
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getName());
}
dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged();
} }
@Override @Override
......
...@@ -12,6 +12,8 @@ import com.wd.workoffice.app.WorkBaseFg; ...@@ -12,6 +12,8 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.FinancialBean; import com.wd.workoffice.bean.FinancialBean;
import com.wd.workoffice.bean.LogisticBean; import com.wd.workoffice.bean.LogisticBean;
import com.wd.workoffice.bean.event.CheckLogisticEvent; import com.wd.workoffice.bean.event.CheckLogisticEvent;
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.work.WorkLogisticsDetailActivity; import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
...@@ -135,6 +137,10 @@ public class StoreFinancialFragment extends WorkBaseFg { ...@@ -135,6 +137,10 @@ 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())) {
toast(R.string.permission);
return;
}
startActivity(WorkLogisticsDetailActivity.class, "info",JSON.toJSONString(dataList.get(position))); startActivity(WorkLogisticsDetailActivity.class, "info",JSON.toJSONString(dataList.get(position)));
} }
}); });
......
...@@ -20,6 +20,7 @@ import com.wd.workoffice.bean.UseApplyBean; ...@@ -20,6 +20,7 @@ import com.wd.workoffice.bean.UseApplyBean;
import com.wd.workoffice.bean.event.CheckSendEvent; 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.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.SendApplyDetailActivity;
...@@ -85,6 +86,7 @@ public class UseApplyFragment extends WorkBaseFg { ...@@ -85,6 +86,7 @@ public class UseApplyFragment extends WorkBaseFg {
dataAdapter = new UseApplyAdapter(R.layout.item_use_apply, dataList, Integer.valueOf(state)); dataAdapter = new UseApplyAdapter(R.layout.item_use_apply, dataList, Integer.valueOf(state));
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
changePermission();
getData(); getData();
} }
...@@ -100,6 +102,17 @@ public class UseApplyFragment extends WorkBaseFg { ...@@ -100,6 +102,17 @@ 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());
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_AUDIT.getName());
}
dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged();
}
private void getData() { private void getData() {
Observable<BaseBean> observable; Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
......
...@@ -14,6 +14,7 @@ import com.wd.workoffice.R; ...@@ -14,6 +14,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.ProductBean; import com.wd.workoffice.bean.ProductBean;
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.contract.WorkProContract; import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.presenter.WorkProPresenter; import com.wd.workoffice.presenter.WorkProPresenter;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity; import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
...@@ -114,6 +115,10 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View ...@@ -114,6 +115,10 @@ 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())){
toast(R.string.permission);
return;
}
workProPresenter.getPro(param); workProPresenter.getPro(param);
} }
......
...@@ -10,6 +10,7 @@ import com.wd.workoffice.app.WorkBaseFg; ...@@ -10,6 +10,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.WarehoustBean; import com.wd.workoffice.bean.WarehoustBean;
import com.wd.workoffice.bean.listener.WarehouseOrderFilterClickListener; import com.wd.workoffice.bean.listener.WarehouseOrderFilterClickListener;
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.WorkProDetailActivity;
...@@ -73,16 +74,25 @@ public class WorkWarehouse2Fragment extends WorkBaseFg implements WorkWarehouseC ...@@ -73,16 +74,25 @@ 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);
workProPresenter.getOrder(param); if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_ORDER.getName())){
toast(R.string.permission);
}else {
workProPresenter.getOrder(param);
}
} }
@Override @Override
protected void initEvent() { protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> { srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1; if (!WorkUtils.hasPermission(PagePermissionType.STOCK_QUANTITY_ORDER.getName())){
param.put("current", page); toast(R.string.permission);
workProPresenter.getOrder(param); }else {
page = 1;
param.put("current", page);
workProPresenter.getOrder(param);
}
}); });
workProductAdapter.setOnLoadMoreListener(() -> { workProductAdapter.setOnLoadMoreListener(() -> {
param.put("current", page); param.put("current", page);
......
...@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSON; ...@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSON;
import com.wd.workoffice.bean.TokenBean; import com.wd.workoffice.bean.TokenBean;
import com.wd.workoffice.bean.UserInfoBean; import com.wd.workoffice.bean.UserInfoBean;
import java.util.List;
import flexible.xd.android_base.utils.SPUtils; import flexible.xd.android_base.utils.SPUtils;
/** /**
...@@ -55,7 +57,7 @@ public class UserKeeper { ...@@ -55,7 +57,7 @@ public class UserKeeper {
} }
return tokenBean.getAccess_token(); return tokenBean.getAccess_token();
} }
public String getRefrshToken() { public String getRefreshToken() {
if (TextUtils.isEmpty(sp.getString(LOGIN_INFO))) { if (TextUtils.isEmpty(sp.getString(LOGIN_INFO))) {
return ""; return "";
} }
...@@ -98,6 +100,18 @@ public class UserKeeper { ...@@ -98,6 +100,18 @@ public class UserKeeper {
} }
return infoBean.getOfDept().getId() + ""; return infoBean.getOfDept().getId() + "";
} }
public List<String> getUserPermission() {
if (TextUtils.isEmpty(sp.getString(USER_INFO))) {
return null;
}
UserInfoBean infoBean = JSON.parseObject(sp.getString(USER_INFO), UserInfoBean.class);
if (infoBean == null || infoBean.getPermissionList() == null) {
return null;
}
return infoBean.getPermissionList();
}
public String getUserErpId() { public String getUserErpId() {
if (TextUtils.isEmpty(sp.getString(USER_INFO))) { if (TextUtils.isEmpty(sp.getString(USER_INFO))) {
return ""; return "";
......
...@@ -7,12 +7,13 @@ import android.net.Uri; ...@@ -7,12 +7,13 @@ import android.net.Uri;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.Config; import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkApp; import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.workEnum.OrderType; import com.wd.workoffice.bean.workEnum.OrderType;
...@@ -20,13 +21,14 @@ import com.wd.workoffice.bean.workEnum.PermissionType; ...@@ -20,13 +21,14 @@ import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import java.io.File; import java.io.File;
import java.io.IOException; 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 flexible.xd.android_base.utils.LogUtils;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
...@@ -246,7 +248,7 @@ public class WorkUtils { ...@@ -246,7 +248,7 @@ public class WorkUtils {
Map<String, Object> param = WorkUtils.simpleParam(); Map<String, Object> param = WorkUtils.simpleParam();
param.put("client_id", "android"); param.put("client_id", "android");
param.put("client_secret", "android"); param.put("client_secret", "android");
param.put("refresh_token", UserKeeper.getInstance().getRefrshToken()); param.put("refresh_token", UserKeeper.getInstance().getRefreshToken());
RtfUtils.getRtf().refreshToken(param).enqueue(new Callback<JSONObject>() { RtfUtils.getRtf().refreshToken(param).enqueue(new Callback<JSONObject>() {
@Override @Override
public void onResponse(Call<JSONObject> call, Response<JSONObject> response) { public void onResponse(Call<JSONObject> call, Response<JSONObject> response) {
...@@ -263,6 +265,50 @@ public class WorkUtils { ...@@ -263,6 +265,50 @@ public class WorkUtils {
} }
}); });
} }
/**
* 判断是否拥有权限
*
* @return
*/
public static boolean hasPermission(String permission) {
List<String> userPermission = UserKeeper.getInstance().getUserPermission();
if (userPermission == null) {
return true;
}
boolean hasPermission = false;
for (String s : userPermission) {
if (TextUtils.equals(permission, s)) {
hasPermission = true;
break;
}
}
return hasPermission;
}
public static void addPermissionRule(View view) {
List<View> list = getAllChildViews(view);
for (View child : list) {
if (child.getTag() != null) {
if (!hasPermission(child.getTag().toString())) {
child.setVisibility(View.GONE);
}
}
}
}
private static List<View> getAllChildViews(View view) {
List<View> allChildren = new ArrayList<>();
if (view instanceof ViewGroup) {
ViewGroup vp = (ViewGroup) view;
for (int i = 0; i < vp.getChildCount(); i++) {
View viewchild = vp.getChildAt(i);
allChildren.add(viewchild);
//再次 调用本身(递归)
allChildren.addAll(getAllChildViews(viewchild));
}
}
return allChildren;
}
public static File uriToFile(Uri uri, Context context) { public static File uriToFile(Uri uri, Context context) {
String path = null; String path = null;
......
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
android:background="@drawable/shape_red_btn" android:background="@drawable/shape_red_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:crucible-order:audit"
android:text="拒绝" android:text="拒绝"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -82,6 +83,7 @@ ...@@ -82,6 +83,7 @@
android:background="@drawable/shape_green_btn" android:background="@drawable/shape_green_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:crucible-order:audit"
android:text="同意" android:text="同意"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -115,6 +117,7 @@ ...@@ -115,6 +117,7 @@
android:background="@drawable/shape_blue_btn" android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:co:out-store-apply:page:list"
android:text="发货申请" android:text="发货申请"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -167,11 +170,11 @@ ...@@ -167,11 +170,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10mm" android:layout_marginTop="10mm"
android:paddingTop="10mm"
android:paddingBottom="20mm"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="20mm"> android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<RelativeLayout <RelativeLayout
...@@ -200,9 +203,10 @@ ...@@ -200,9 +203,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="14mm" android:layout_marginTop="14mm"
android:paddingVertical="10mm"
android:background="#FCFCFD" android:background="#FCFCFD"
android:orientation="vertical"> android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout <RelativeLayout
android:id="@+id/rl_dep" android:id="@+id/rl_dep"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -227,6 +231,7 @@ ...@@ -227,6 +231,7 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -251,6 +256,7 @@ ...@@ -251,6 +256,7 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -276,6 +282,7 @@ ...@@ -276,6 +282,7 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_stock" android:id="@+id/rl_stock"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -301,6 +308,7 @@ ...@@ -301,6 +308,7 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -325,6 +333,7 @@ ...@@ -325,6 +333,7 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -349,6 +358,7 @@ ...@@ -349,6 +358,7 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
...@@ -49,10 +49,10 @@ ...@@ -49,10 +49,10 @@
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60mm" android:layout_height="60mm"
android:visibility="gone"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<LinearLayout <LinearLayout
android:id="@+id/ll_check" android:id="@+id/ll_check"
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
android:background="@drawable/shape_red_btn" android:background="@drawable/shape_red_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:inside-order:audit"
android:text="拒绝" android:text="拒绝"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -82,6 +83,7 @@ ...@@ -82,6 +83,7 @@
android:background="@drawable/shape_green_btn" android:background="@drawable/shape_green_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:inside-order:audit"
android:text="同意" android:text="同意"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -167,11 +169,11 @@ ...@@ -167,11 +169,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10mm" android:layout_marginTop="10mm"
android:paddingTop="10mm"
android:paddingBottom="20mm"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="20mm"> android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<RelativeLayout <RelativeLayout
...@@ -200,9 +202,9 @@ ...@@ -200,9 +202,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="14mm" android:layout_marginTop="14mm"
android:paddingVertical="10mm"
android:background="#FCFCFD" android:background="#FCFCFD"
android:orientation="vertical"> android:orientation="vertical"
android:paddingVertical="10mm">
<!-- 1.下单 --> <!-- 1.下单 -->
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -363,7 +365,9 @@ ...@@ -363,7 +365,9 @@
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<View style="@style/ViewX" /> <View style="@style/ViewX" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10mm" android:layout_marginLeft="10mm"
android:text="拒绝" android:text="拒绝"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
...@@ -49,10 +50,10 @@ ...@@ -49,10 +50,10 @@
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60mm" android:layout_height="60mm"
android:visibility="gone"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<LinearLayout <LinearLayout
android:id="@+id/ll_check" android:id="@+id/ll_check"
...@@ -71,6 +72,7 @@ ...@@ -71,6 +72,7 @@
android:background="@drawable/shape_red_btn" android:background="@drawable/shape_red_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:purchase-order:audit"
android:text="拒绝" android:text="拒绝"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -82,6 +84,7 @@ ...@@ -82,6 +84,7 @@
android:background="@drawable/shape_green_btn" android:background="@drawable/shape_green_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:purchase-order:audit"
android:text="同意" android:text="同意"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -104,6 +107,7 @@ ...@@ -104,6 +107,7 @@
android:background="@drawable/shape_blue_btn" android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:po:advance-finish-apply:page:list"
android:text="提前结束申请" android:text="提前结束申请"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -115,6 +119,7 @@ ...@@ -115,6 +119,7 @@
android:background="@drawable/shape_blue_btn" android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:po:out-store-apply:page:list"
android:text="发货申请" android:text="发货申请"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -162,15 +167,16 @@ ...@@ -162,15 +167,16 @@
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="match_parent" <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10mm" android:layout_marginTop="10mm"
android:paddingTop="10mm"
android:paddingBottom="20mm"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="20mm"> android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<RelativeLayout <RelativeLayout
...@@ -199,9 +205,10 @@ ...@@ -199,9 +205,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="14mm" android:layout_marginTop="14mm"
android:paddingVertical="10mm"
android:background="#FCFCFD" android:background="#FCFCFD"
android:orientation="vertical"> android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout <RelativeLayout
android:id="@+id/rl_dep" android:id="@+id/rl_dep"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -279,9 +286,9 @@ ...@@ -279,9 +286,9 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rv_supplier"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/rv_supplier"
android:layout_marginTop="10mm" android:layout_marginTop="10mm"
android:paddingHorizontal="10mm"> android:paddingHorizontal="10mm">
...@@ -354,6 +361,7 @@ ...@@ -354,6 +361,7 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -417,8 +425,8 @@ ...@@ -417,8 +425,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:visibility="gone" android:paddingVertical="9mm"
android:paddingVertical="9mm"> android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -451,7 +459,9 @@ ...@@ -451,7 +459,9 @@
android:src="@mipmap/arrow_right_gray" /> android:src="@mipmap/arrow_right_gray" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/ViewX" /> <View style="@style/ViewX" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:text="拒绝" android:text="拒绝"
android:tag="order:sale-order:audit"
android:textColor="@color/white" /> android:textColor="@color/white" />
<TextView <TextView
...@@ -83,6 +84,7 @@ ...@@ -83,6 +84,7 @@
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:text="同意" android:text="同意"
android:tag="order:sale-order:audit"
android:textColor="@color/white" /> android:textColor="@color/white" />
</LinearLayout> </LinearLayout>
...@@ -105,6 +107,7 @@ ...@@ -105,6 +107,7 @@
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:text="提前结束申请" android:text="提前结束申请"
android:tag="order:so:advance-finish-apply:page:list"
android:textColor="@color/white" /> android:textColor="@color/white" />
<TextView <TextView
...@@ -116,6 +119,7 @@ ...@@ -116,6 +119,7 @@
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:text="发货申请" android:text="发货申请"
android:tag="order:so:out-store-apply:page:list"
android:textColor="@color/white" /> android:textColor="@color/white" />
</LinearLayout> </LinearLayout>
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:text="拒绝" android:text="拒绝"
android:tag="order:supplier-order:audit"
android:textColor="@color/white" /> android:textColor="@color/white" />
<TextView <TextView
...@@ -79,6 +80,7 @@ ...@@ -79,6 +80,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10mm" android:layout_marginRight="10mm"
android:tag="order:supplier-order:audit"
android:background="@drawable/shape_green_btn" android:background="@drawable/shape_green_btn"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
......
<resources> <resources>
<string name="app_name">正望企业管理</string> <string name="app_name">正望企业管理</string>
<string name="app_home">首页</string> <string name="permission">没有权限处理</string>
<string name="app_mes">MES</string>
<string name="app_nems">消息</string>
<string name="app_my">我的</string>
</resources> </resources>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论