提交 899f2bd0 authored 作者: lgd's avatar lgd

1.接单显示规则

2.//TODO (采购新增,设备采购-维修列表接口,新增维修的部门接口,接单显示规则),坩埚下单,下单时间选择器当前时间验证,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级 1218c867
...@@ -26,6 +26,7 @@ import com.wd.workoffice.retrofit.RtfUtils; ...@@ -26,6 +26,7 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.DeviceDetailAdapter; import com.wd.workoffice.ui.adapter.DeviceDetailAdapter;
import com.wd.workoffice.ui.adapter.SendApplyDetailAdapter; import com.wd.workoffice.ui.adapter.SendApplyDetailAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -100,6 +101,15 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity { ...@@ -100,6 +101,15 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
tvOrderTime.setText(info.getCreatedTime()); tvOrderTime.setText(info.getCreatedTime());
tvPrice.setText(info.getCreatedTime()); tvPrice.setText(info.getCreatedTime());
tvRemark.setText(info.getRemark()); tvRemark.setText(info.getRemark());
changePermissionView();
dataList = new ArrayList<>();
dataAdapter = new DeviceDetailAdapter(R.layout.item_device_detail, dataList);
dataAdapter.bindToRecyclerView(rvData);
param = new HashMap<>();
param.put("id", info.getId());
}
private void changePermissionView() {
if (info.getStatus() == 100) { if (info.getStatus() == 100) {
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR_UPDATE.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR_UPDATE.getPermission())) {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
...@@ -110,18 +120,16 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity { ...@@ -110,18 +120,16 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR_APPLY.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR_APPLY.getPermission())) {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
} else { } else {
if (TextUtils.equals(UserKeeper.getInstance().getUserDepId(), info.getReceiveDeptId() + "")
&&TextUtils.equals(UserKeeper.getInstance().getUserDepRuler(), "1")) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
tvRefuse.setText("拒单"); tvRefuse.setText("拒单");
tvAgree.setText("接单"); tvAgree.setText("接单");
} }
}
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
} }
dataList = new ArrayList<>();
dataAdapter = new DeviceDetailAdapter(R.layout.item_device_detail, dataList);
dataAdapter.bindToRecyclerView(rvData);
param = new HashMap<>();
param.put("id", info.getId());
} }
private void getData(String id) { private void getData(String id) {
......
...@@ -97,6 +97,15 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity { ...@@ -97,6 +97,15 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
tvOrderTime.setText(info.getCreatedTime()); tvOrderTime.setText(info.getCreatedTime());
tvPrice.setText(info.getCreatedTime()); tvPrice.setText(info.getCreatedTime());
tvRemark.setText(info.getRemark()); tvRemark.setText(info.getRemark());
changePermissionView();
dataList = new ArrayList<>();
dataAdapter = new DeviceDetailAdapter(R.layout.item_device_detail, dataList);
dataAdapter.bindToRecyclerView(rvData);
param = new HashMap<>();
param.put("id", info.getId());
}
private void changePermissionView() {
if (info.getStatus() == 100) { if (info.getStatus() == 100) {
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_REPAIR_UPDATE.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_REPAIR_UPDATE.getPermission())) {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
...@@ -114,11 +123,6 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity { ...@@ -114,11 +123,6 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
} else { } else {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
} }
dataList = new ArrayList<>();
dataAdapter = new DeviceDetailAdapter(R.layout.item_device_detail, dataList);
dataAdapter.bindToRecyclerView(rvData);
param = new HashMap<>();
param.put("id", info.getId());
} }
private void getData(String id) { private void getData(String id) {
......
...@@ -23,7 +23,6 @@ public class UserKeeper { ...@@ -23,7 +23,6 @@ public class UserKeeper {
private final String USER_INFO = "_USER_INFO"; private final String USER_INFO = "_USER_INFO";
private final String MES_LOGIN = "_MES_LOGIN"; private final String MES_LOGIN = "_MES_LOGIN";
private final String MES_LOGIN_INFO = "_MES_LOGIN_INFO"; private final String MES_LOGIN_INFO = "_MES_LOGIN_INFO";
private final String MES_UID = "_MES_UID";
private final String COOKIE = "_COOKIE"; private final String COOKIE = "_COOKIE";
private final String IS_AGREE = "_IS_AGREE"; private final String IS_AGREE = "_IS_AGREE";
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论