提交 d17b5f33 authored 作者: lgd's avatar lgd

1.设备维修

2.//TODO 坩埚下单,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级 4d0feb33
...@@ -70,6 +70,7 @@ public class DeviceBuyRepairAddActivity extends WorkToolBarActivity { ...@@ -70,6 +70,7 @@ public class DeviceBuyRepairAddActivity extends WorkToolBarActivity {
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
depDialog = DialogUtils.listDialog(this); depDialog = DialogUtils.listDialog(this);
WorkUtils.addDecimalsListener(etPrice);
} }
@Override @Override
......
...@@ -24,6 +24,7 @@ import com.wd.workoffice.retrofit.RtfUtils; ...@@ -24,6 +24,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.util.DialogUtils; import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -102,7 +103,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity { ...@@ -102,7 +103,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
tvOrderPeople.setText(info.getLaunchUserName()); tvOrderPeople.setText(info.getLaunchUserName());
tvOrderDep.setText(info.getLaunchDeptName()); tvOrderDep.setText(info.getLaunchDeptName());
tvOrderTime.setText(info.getCreatedTime()); tvOrderTime.setText(info.getCreatedTime());
tvPrice.setText(info.getCreatedTime()); tvPrice.setText( MathUtils.converData(info.getLaunchOrderAmount(),3));
tvRemark.setText(info.getRemark()); tvRemark.setText(info.getRemark());
changePermissionView(); changePermissionView();
dataList = new ArrayList<>(); dataList = new ArrayList<>();
...@@ -114,7 +115,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity { ...@@ -114,7 +115,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
private void changePermissionView() { private void changePermissionView() {
if (TextUtils.equals("0", getIntent().getStringExtra("from"))) { if (!TextUtils.equals("0", getIntent().getStringExtra("from"))) {
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
return; return;
} }
......
...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.RepairBean; import com.wd.workoffice.bean.RepairBean;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -30,7 +31,7 @@ public class DeviceRepairAdapter extends BaseQuickAdapter<RepairBean.RecordsBean ...@@ -30,7 +31,7 @@ public class DeviceRepairAdapter extends BaseQuickAdapter<RepairBean.RecordsBean
helper.setText(R.id.tv_order_time, item.getCreatedTime()); helper.setText(R.id.tv_order_time, item.getCreatedTime());
helper.setText(R.id.tv_repair_time, item.getRepairDateTime()); helper.setText(R.id.tv_repair_time, item.getRepairDateTime());
helper.setText(R.id.tv_status, WorkUtils.getDeviceStatus(item.getStatus())); helper.setText(R.id.tv_status, WorkUtils.getDeviceStatus(item.getStatus()));
helper.setText(R.id.tv_all_price, String.valueOf(item.getAmount())); helper.setText(R.id.tv_all_price, MathUtils.converData(item.getAmount(),3));
} }
} }
...@@ -18,7 +18,7 @@ import butterknife.BindView; ...@@ -18,7 +18,7 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
/** /**
* 销售 - 供应订单 * 设备维修列表
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
......
...@@ -18,7 +18,7 @@ import butterknife.BindView; ...@@ -18,7 +18,7 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
/** /**
* 销售 - 供应订单 * 设备维修列表
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
......
...@@ -58,7 +58,6 @@ public class DeviceRepairListFragment extends WorkBaseFg { ...@@ -58,7 +58,6 @@ public class DeviceRepairListFragment extends WorkBaseFg {
private Map<String, Object> param; private Map<String, Object> param;
private DeviceRepairAdapter dataAdapter; private DeviceRepairAdapter dataAdapter;
private List<RepairBean.RecordsBean> dataList; private List<RepairBean.RecordsBean> dataList;
private String identity;
@Override @Override
protected void initView() { protected void initView() {
...@@ -88,7 +87,6 @@ public class DeviceRepairListFragment extends WorkBaseFg { ...@@ -88,7 +87,6 @@ public class DeviceRepairListFragment extends WorkBaseFg {
Bundle arguments = getArguments(); Bundle arguments = getArguments();
if (arguments != null) { if (arguments != null) {
state = arguments.getString("state"); state = arguments.getString("state");
identity = arguments.getString("identity");
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论