Skip to content

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

1.初版权限维护 

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