Skip to content

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

1.修改权限问题

上级 606ae784
隐藏空白字符变更
内嵌 并排
正在显示 包含 118 行增加 和 68 行删除
app/src/main/java/com/wd/workoffice/bean/workEnum/PagePermissionType.java
浏览文件 @ d0aafa0d
......@@ -6,6 +6,9 @@ package com.wd.workoffice.bean.workEnum;
* github: https://github.com/FlexibleXd
**/
public enum PagePermissionType {
//common
COMMON("common", "common"),
//财税上缴
FINANCE("finance:finance-tax:page:list", "财税上缴"),
FINANCE_DETAIL("finance:finance-tax:page:detail", "获取财税明细"),
......@@ -143,12 +146,16 @@ public enum PagePermissionType {
CO_INVOICE_LIST("order:co:invoice-apply:page:list", "开票申请列表"),
CO_INVOICE_SAVE("order:co:invoice-apply:apply:save", "发起开票申请"),
CO_INVOICE_AUDIT("order:co:invoice-apply:audit", "开票审核"),
//库存数量
//仓库
STOCK_PAGE("stock:stock:page:list", "仓库"),
STOCK_QUANTITY_ORDER_PAGE("stockQuantity:order:page:list", "仓库"),
STOCK_QUANTITY_PAGE("stockQuantity:page:list", "仓库"),
//库 存数量
STOCK_QUANTITY_DETAIL("stockQuantityDetail:page:list", "库存数量明细"),
STOCK_QUANTITY_DETAIL_FLOW("stockQuantityDetailFlow:page:list", "库存数量明细流水"),
STOCK_QUANTITY_ORDER("stockQuantity:order:page:list", "订单列表"),
STOCK_QUANTITY_FLOW("stockQuantityFlow:page:list", "库存数量流水"),
//库存数量
//部门
SYS_UPDATE("sys:dept:ruler:update", "设置部门管理员"),
SYS_DETAIL("app:sys:dept:details", "一个部门的详情"),
//备件
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceActivity.java
浏览文件 @ d0aafa0d
......@@ -5,6 +5,8 @@ import android.widget.RelativeLayout;
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;
......@@ -49,12 +51,24 @@ public class DeviceActivity extends WorkToolBarActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_device:
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_LIST.getPermission()) && WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(DeviceListActivity.class);
break;
case R.id.rl_service:
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_REPAIR.getPermission())){
toast(R.string.permission);
return;
}
startActivity(DeviceRepairActivity.class);
break;
case R.id.rl_buy:
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR.getPermission())){
toast(R.string.permission);
return;
}
startActivity(DeviceBuyActivity.class);
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceListActivity.java
浏览文件 @ d0aafa0d
......@@ -51,10 +51,6 @@ public class DeviceListActivity extends WorkToolBarActivity {
List<Fragment> data = new ArrayList<>();
DeviceListFragment deviceListFragment = new DeviceListFragment();
SparePartsFragment sparePartsFragment = new SparePartsFragment();
// Bundle bundle = new Bundle();
// bundle.putString("orderId", getIntent().getStringExtra("orderId"));
// bundle.putString("orderType", getIntent().getStringExtra("orderType"));
// saleFragment.setArguments(bundle);
data.add(deviceListFragment);
data.add(sparePartsFragment);
VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
......@@ -73,34 +69,4 @@ public class DeviceListActivity extends WorkToolBarActivity {
return R.layout.activity_order;
}
// @Override
// public boolean onCreateOptionsMenu(Menu menu) {
// String orderType = getIntent().getStringExtra("orderType");
// if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
// if (WorkUtils.hasPermission(PagePermissionType.SO_OUT_SAVE.getPermission())) {
// getMenuInflater().inflate(R.menu.menu_add, menu);
// }
// } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
// if (WorkUtils.hasPermission(PagePermissionType.PO_OUT_SAVE.getPermission())) {
// getMenuInflater().inflate(R.menu.menu_add, menu);
// }
// } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
// if (WorkUtils.hasPermission(PagePermissionType.CO_OUT_SAVE.getPermission())) {
// getMenuInflater().inflate(R.menu.menu_add, menu);
// }
// }
// return super.onCreateOptionsMenu(menu);
// }
//
// @Override
// public boolean onOptionsItemSelected(MenuItem item) {
// switch (item.getItemId()) {
// case R.id.add:
// startActivity(SendApplyAddActivity.class,
// "orderType", getIntent().getStringExtra("orderType"),
// "id", getIntent().getStringExtra("orderId"));
// break;
// }
// return super.onOptionsItemSelected(item);
// }
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialActivity.java
浏览文件 @ d0aafa0d
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
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;
......@@ -51,28 +54,59 @@ public class WorkFinancialActivity extends WorkToolBarActivity {
}
@OnClick({R.id.ll_profit,R.id.ll_back, R.id.ll_pay, R.id.ll_open_ticket, R.id.ll_receive_ticket, R.id.ll_account, R.id.ll_logistics})
@OnClick({R.id.ll_profit, R.id.ll_back, R.id.ll_pay, R.id.ll_open_ticket, R.id.ll_receive_ticket, R.id.ll_account, R.id.ll_logistics})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_profit:
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_AUDIT.getPermission()) &&
!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_AUDIT.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkFinancialProfitActivity.class);
break;
case R.id.ll_back:
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkFinancialOutActivity.class);
break;
case R.id.ll_pay:
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_PAY_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkFinancialPayActivity.class);
break;
case R.id.ll_open_ticket:
if (!WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_LIST.getPermission()) &&
!WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_LIST.getPermission()) && !WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkFinancialTicketActivity.class);
break;
case R.id.ll_receive_ticket:
if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_LIST.getPermission()) &&
!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkFinancialReceiveTicketActivity.class);
break;
case R.id.ll_account:
if (!WorkUtils.hasPermission(PagePermissionType.FINANCE_DEPT_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkFinancialAccountActivity.class);
break;
case R.id.ll_logistics:
if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_APPLY_PAGE.getPermission())){
toast(R.string.permission);
return;
}
startActivity(WorkLogisticActivity.class);
break;
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkAddTicketOrderAdapter.java
浏览文件 @ d0aafa0d
package com.wd.workoffice.ui.adapter;
import android.text.TextUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
......@@ -34,9 +36,10 @@ public class WorkAddTicketOrderAdapter extends BaseQuickAdapter<TicketAddBean.Re
helper.setText(R.id.tv_order, item.getOrderId());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_apply_num, MathUtils.converData(item.getCanInvoiceSum(),3) );
helper.setText(R.id.tv_apply_num, MathUtils.converData(item.getCanInvoiceSum(), 3));
helper.setText(R.id.tv_price, item.getCarPrice());
helper.setText(R.id.tv_num, item.getCarNum());
helper.setVisible(R.id.ll_desc, !TextUtils.isEmpty(item.getCarPrice()));
if (type == 1) {
helper.setVisible(R.id.iv_cart, false);
}
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkFragment.java
浏览文件 @ d0aafa0d
......@@ -12,6 +12,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.vo.BatLayoutVo;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.WorkOrderActivity;
......@@ -35,6 +36,7 @@ import com.wd.workoffice.ui.activity.bat.work.WorkInStockActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseActivity;
import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -177,9 +179,17 @@ public class WorkFragment extends WorkBaseFg {
// "库存类别", "订单"};
switch (position) {
case 0:
if (!WorkUtils.hasPermission(PagePermissionType.PRODUCT.getPermission())){
toast(R.string.permission);
return;
}
startActivity(WorkProActivity.class);
break;
case 1:
if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkContactsActivity.class);
break;
// case 2:
......@@ -189,6 +199,10 @@ public class WorkFragment extends WorkBaseFg {
startActivity(WorkWarehouseActivity.class);
break;
case 3:
if (!WorkUtils.hasPermission(PagePermissionType.COMMON.getPermission())) {
toast(R.string.permission);
return;
}
startActivity(WorkDepActivity.class);
break;
case 4:
......@@ -204,6 +218,10 @@ public class WorkFragment extends WorkBaseFg {
// toast("暂无数据");
// break;
case 6:
if (!WorkUtils.hasPermission(PagePermissionType.STOCK_TYPE_LIST.getPermission())){
toast(R.string.permission);
return;
}
startActivity(WorkInStockActivity.class);
break;
case 7:
......
app/src/main/res/layout/item_ticket_add_detail.xml
浏览文件 @ d0aafa0d
......@@ -141,44 +141,51 @@
android:layout_marginTop="10mm"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开票单价:"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<LinearLayout
android:id="@+id/ll_desc"
android:visibility="gone"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开票单价:"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15mm"
android:text="申请数量:"
android:textColor="@color/red_btn_bg"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15mm"
android:text="申请数量:"
android:textColor="@color/red_btn_bg"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red_btn_bg"
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/red_btn_bg"
android:textSize="12sp" />
<TextView
android:id="@+id/iv_cart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_blue_btn"
android:text="加入申请单"
android:textColor="@color/white"
android:paddingVertical="4mm"
android:paddingHorizontal="10mm"
android:layout_height="wrap_content" />
android:paddingVertical="4mm"
android:text="加入申请单"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论