Skip to content

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

1.维修

上级 ed3dc739
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 269 行增加 和 127 行删除
app/src/main/java/com/wd/workoffice/bean/RepairBean.java
浏览文件 @ 7155acc1
......@@ -160,6 +160,24 @@ public class RepairBean {
private Object userDeptMesId;
private Object receiveUserErpId;
private String ensureComment;
private String repairDateTimeBegin;
private String repairDateTimeEnd;
public String getRepairDateTimeBegin() {
return repairDateTimeBegin;
}
public void setRepairDateTimeBegin(String repairDateTimeBegin) {
this.repairDateTimeBegin = repairDateTimeBegin;
}
public String getRepairDateTimeEnd() {
return repairDateTimeEnd;
}
public void setRepairDateTimeEnd(String repairDateTimeEnd) {
this.repairDateTimeEnd = repairDateTimeEnd;
}
public int getCreatedBy() {
return createdBy;
......
app/src/main/java/com/wd/workoffice/bean/vo/DeviceRepairVo.java
浏览文件 @ 7155acc1
......@@ -9,10 +9,27 @@ public class DeviceRepairVo {
private int equipmentId;
private int subEquipmentId;
private int replaceSparePartId;
private int sparePartId;
private String equipmentName;
private String subEquipmentName;
private String replaceSparePartName;
private String amount;
public int getSparePartId() {
return sparePartId;
}
public void setSparePartId(int sparePartId) {
this.sparePartId = sparePartId;
}
public String getAmount() {
return amount;
}
public void setAmount(String amount) {
this.amount = amount;
}
public int getEquipmentId() {
return equipmentId;
......@@ -30,13 +47,6 @@ public class DeviceRepairVo {
this.subEquipmentId = subEquipmentId;
}
public int getReplaceSparePartId() {
return replaceSparePartId;
}
public void setReplaceSparePartId(int replaceSparePartId) {
this.replaceSparePartId = replaceSparePartId;
}
public String getEquipmentName() {
return equipmentName;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyRepairAddActivity.java
浏览文件 @ 7155acc1
......@@ -53,10 +53,14 @@ public class DeviceBuyRepairAddActivity extends WorkToolBarActivity {
RelativeLayout rlDep;
@BindView(R.id.et_price)
EditText etPrice;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.rl_time)
RelativeLayout rlTime;
@BindView(R.id.tv_start_time)
TextView tvStartTime;
@BindView(R.id.rl_start_time)
RelativeLayout rlStartTime;
@BindView(R.id.tv_end_time)
TextView tvEndTime;
@BindView(R.id.rl_end_time)
RelativeLayout rlEndTime;
@BindView(R.id.tv_product)
TextView tvProduct;
@BindView(R.id.rl_product)
......@@ -124,14 +128,22 @@ public class DeviceBuyRepairAddActivity extends WorkToolBarActivity {
}
@OnClick({R.id.rl_dep, R.id.rl_time, R.id.rl_product})
@OnClick({R.id.rl_dep, R.id.rl_start_time, R.id.rl_end_time, R.id.rl_product})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_time:
case R.id.rl_start_time:
PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
tvStartTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
}
}).show();
break;
case R.id.rl_end_time:
PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvEndTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
}
}).show();
break;
......@@ -147,18 +159,25 @@ public class DeviceBuyRepairAddActivity extends WorkToolBarActivity {
toast("请填写金额");
return;
}
if (TextUtils.isEmpty(tvTime.getText().toString())) {
toast("请填写时间");
if (TextUtils.isEmpty(tvStartTime.getText().toString())) {
toast("请填写开始时间");
return;
}
if (TextUtils.isEmpty(tvEndTime.getText().toString())) {
toast("请填写结束时间");
return;
}
startActivity(DeviceBuyRepairProductActivity.class,
"depId", chooseDep.getId() + "",
"depName", chooseDep.getName(),
"amount", etPrice.getText().toString(),
"repairDateTime", tvTime.getText().toString());
"repairDateTimeBegin", tvStartTime.getText().toString()+" 00:00:00",
"repairDateTimeEnd", tvEndTime.getText().toString()+" 00:00:00"
);
break;
}
}
@Override
public void onStart() {
super.onStart();
......@@ -175,4 +194,5 @@ public class DeviceBuyRepairAddActivity extends WorkToolBarActivity {
public void onMessageEvent(AddDeviceEvent event) {
finish();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyRepairConfirmActivity.java
浏览文件 @ 7155acc1
package com.wd.workoffice.ui.activity.bat.work;
import android.text.Editable;
import android.text.TextWatcher;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.RelativeLayout;
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.WorkToolBarActivity;
......@@ -18,7 +15,6 @@ import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.vo.DeviceRepairVo;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.store.StoreOrderSuccessActivity;
import com.wd.workoffice.ui.adapter.DeviceRepairProductAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
......@@ -34,7 +30,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
......@@ -48,16 +43,18 @@ public class DeviceBuyRepairConfirmActivity extends WorkToolBarActivity {
@BindView(R.id.tv_num)
TextView tvNum;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.tv_ok)
TextView tvOk;
@BindView(R.id.ll_bottom)
RelativeLayout llBottom;
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.tv_start_time)
TextView tvStartTime;
@BindView(R.id.tv_end_time)
TextView tvEndTime;
@BindView(R.id.rv_pro)
RecyclerView rvPro;
@BindView(R.id.et_input5)
......@@ -79,7 +76,8 @@ public class DeviceBuyRepairConfirmActivity extends WorkToolBarActivity {
protected void initData() {
tvDep.setText(getIntent().getStringExtra("depName"));
tvPrice.setText(getIntent().getStringExtra("amount"));
tvTime.setText(getIntent().getStringExtra("repairDateTime"));
tvStartTime.setText(getIntent().getStringExtra("repairDateTimeBegin"));
tvEndTime.setText(getIntent().getStringExtra("repairDateTimeEnd"));
proList = new ArrayList<>();
proAdapter = new DeviceRepairProductAdapter(R.layout.item_device_product_repair, proList, 1);
proAdapter.bindToRecyclerView(rvPro);
......@@ -89,7 +87,8 @@ public class DeviceBuyRepairConfirmActivity extends WorkToolBarActivity {
param.put("receiveDeptId", getIntent().getStringExtra("depId"));
param.put("launchUserId", UserKeeper.getInstance().getUserId());
param.put("launchDeptId", UserKeeper.getInstance().getUserDepId());
param.put("repairDateTime", getIntent().getStringExtra("repairDateTime"));
param.put("repairDateTimeBegin", getIntent().getStringExtra("repairDateTimeBegin"));
param.put("repairDateTimeEnd", getIntent().getStringExtra("repairDateTimeEnd"));
param.put("amount", getIntent().getStringExtra("amount"));
}
......@@ -106,7 +105,7 @@ public class DeviceBuyRepairConfirmActivity extends WorkToolBarActivity {
* @param tv
*/
private void addNumListener(EditText et, TextView tv) {
WorkUtils.addNumListener(et,tv);
WorkUtils.addNumListener(et, tv);
}
@Override
......@@ -145,6 +144,7 @@ public class DeviceBuyRepairConfirmActivity extends WorkToolBarActivity {
}
});
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_report, menu);
......@@ -161,4 +161,5 @@ public class DeviceBuyRepairConfirmActivity extends WorkToolBarActivity {
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyRepairProductActivity.java
浏览文件 @ 7155acc1
package com.wd.workoffice.ui.activity.bat.work;
import android.content.DialogInterface;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -17,7 +20,6 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.SparePartsBean;
import com.wd.workoffice.bean.event.AddDeviceEvent;
import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.bean.vo.DeviceRepairVo;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -56,10 +58,6 @@ public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
TextView tvMachine;
@BindView(R.id.rl_machine)
RelativeLayout rlMachine;
@BindView(R.id.tv_components)
TextView tvComponents;
@BindView(R.id.rl_components)
RelativeLayout rlComponents;
@BindView(R.id.tv_spare_parts)
TextView tvSpareParts;
@BindView(R.id.rl_spare_parts)
......@@ -70,6 +68,8 @@ public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
TextView tvOk;
@BindView(R.id.ll_add)
LinearLayout llAdd;
@BindView(R.id.et_amount)
EditText etAmount;
private Map<String, Object> param;
private List<DeviceRepairVo> dataList;
private DeviceRepairProductAdapter dataAdapter;
......@@ -94,10 +94,10 @@ public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
machineDialog = DialogUtils.listDialog(this);
componentsDialog = DialogUtils.listDialog(this);
sparePartsDialog = DialogUtils.listDialog(this);
WorkUtils.addDecimalsListener(etAmount);
}
@Override
protected void initData() {
dataList = new ArrayList<>();
......@@ -151,7 +151,7 @@ public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
private void clearViewData() {
chooseComponents = null;
chooseSpareParts = null;
tvComponents.setText("");
etAmount.setText("");
tvSpareParts.setText("");
}
......@@ -187,7 +187,7 @@ public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseComponents = componentsList.get(which);
tvComponents.setText(componentsNameList.get(which));
etAmount.setText(componentsNameList.get(which));
dialog.dismiss();
}
});
......@@ -269,24 +269,23 @@ public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
}
startActivity(DeviceBuyRepairConfirmActivity.class,
"pro", JSON.toJSONString(dataList),
"depId",getIntent().getStringExtra("depId"),
"depId", getIntent().getStringExtra("depId"),
"depName", getIntent().getStringExtra("depName"),
"amount", getIntent().getStringExtra("amount"),
"repairDateTime", getIntent().getStringExtra("repairDateTime"));
"repairDateTimeBegin", getIntent().getStringExtra("repairDateTimeBegin"),
"repairDateTimeEnd", getIntent().getStringExtra("repairDateTimeEnd"));
break;
}
return super.onOptionsItemSelected(item);
}
@OnClick({R.id.tv_add, R.id.rl_machine, R.id.rl_components, R.id.rl_spare_parts, R.id.tv_cancel, R.id.tv_ok})
@OnClick({R.id.tv_add, R.id.rl_machine, R.id.rl_spare_parts, R.id.tv_cancel, R.id.tv_ok})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_machine:
machineDialog.show();
break;
case R.id.rl_components:
componentsDialog.show();
break;
case R.id.rl_spare_parts:
sparePartsDialog.show();
break;
......@@ -304,12 +303,13 @@ public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
}
private void addData() {
String amount = etAmount.getText().toString();
if (chooseMachine == null) {
toast("请选择设备");
return;
}
if (chooseComponents == null) {
toast("请选择组件");
if (TextUtils.isEmpty(amount)||Double.valueOf(amount)==0d) {
toast("请输入消耗数量");
return;
}
if (chooseSpareParts == null) {
......@@ -319,9 +319,10 @@ public class DeviceBuyRepairProductActivity extends WorkToolBarActivity {
DeviceRepairVo deviceRepairVo = new DeviceRepairVo();
deviceRepairVo.setEquipmentId(chooseMachine.getId());
deviceRepairVo.setEquipmentName(chooseMachine.getTitle());
deviceRepairVo.setSubEquipmentId(chooseComponents.getId());
deviceRepairVo.setSubEquipmentName(chooseComponents.getTitle());
deviceRepairVo.setReplaceSparePartId(chooseSpareParts.getId());
// deviceRepairVo.setSubEquipmentId(chooseComponents.getId());
// deviceRepairVo.setSubEquipmentName(chooseComponents.getTitle());
deviceRepairVo.setAmount(amount);
deviceRepairVo.setSparePartId(chooseSpareParts.getId());
deviceRepairVo.setReplaceSparePartName(chooseSpareParts.getItemName());
dataList.add(deviceRepairVo);
dataAdapter.notifyDataSetChanged();
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceRepairDetailActivity.java
浏览文件 @ 7155acc1
......@@ -17,13 +17,13 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.DeviceBuyBean;
import com.wd.workoffice.bean.RepairBean;
import com.wd.workoffice.bean.event.CheckDeviceEvent;
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.DeviceRepairDetailAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -50,68 +50,69 @@ import io.reactivex.disposables.Disposable;
* github: https://github.com/FlexibleXd
**/
public class DeviceRepairDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_finish)
TextView tvFinish;
@BindView(R.id.tv_refuse)
TextView tvRefuse;
@BindView(R.id.tv_agree)
TextView tvAgree;
@BindView(R.id.ll_check)
LinearLayout llCheck;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_code)
TextView tvCode;
@BindView(R.id.ll_code)
RelativeLayout llCode;
@BindView(R.id.tv_status)
TextView tvStatus;
@BindView(R.id.ll_status)
RelativeLayout llStatus;
@BindView(R.id.tv_receive_dep)
TextView tvReceiveDep;
@BindView(R.id.tv_order_people)
TextView tvOrderPeople;
@BindView(R.id.tv_order_dep)
TextView tvOrderDep;
@BindView(R.id.tv_order_time)
TextView tvOrderTime;
@BindView(R.id.tv_start_time)
TextView tvStartTime;
@BindView(R.id.tv_end_time)
TextView tvEndTime;
@BindView(R.id.tv_price_desc)
TextView tvPriceDesc;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.tv_remark)
TextView tvRemark;
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.tv_desc)
TextView tvDesc;
@BindView(R.id.tv_finish)
TextView tvFinish;
@BindView(R.id.ll_check)
LinearLayout llCheck;
@BindView(R.id.ll_code)
RelativeLayout llCode;
@BindView(R.id.ll_status)
RelativeLayout llStatus;
@BindView(R.id.tv_price_desc)
TextView tvPriceDesc;
@BindView(R.id.rv_data)
RecyclerView rvData;
private List<DeviceBean.RecordsBean> dataList;
private DeviceRepairDetailAdapter dataAdapter;
private Map<String, Object> param;
private DeviceBuyBean.RecordsBean info;
private RepairBean.RecordsBean info;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
tvDesc.setText("维修明细");
llCode.setVisibility(View.GONE);
llStatus.setVisibility(View.GONE);
tvPriceDesc.setText("维修时间");
}
@Override
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"), DeviceBuyBean.RecordsBean.class);
info = JSON.parseObject(getIntent().getStringExtra("info"), RepairBean.RecordsBean.class);
getData(info.getId() + "");
tvCode.setText(info.getId());
tvStatus.setText(WorkUtils.getDeviceStatus(info.getStatus()));
tvReceiveDep.setText(info.getReceiveDeptName());
tvOrderPeople.setText(info.getLaunchUserName());
tvOrderDep.setText(info.getLaunchDeptName());
tvOrderTime.setText(info.getCreatedTime());
tvPrice.setText(info.getCreatedTime().split(" ")[0]);
tvStartTime.setText(info.getRepairDateTimeBegin());
tvEndTime.setText(info.getRepairDateTimeEnd());
tvPrice.setText(info.getCreatedTime());
tvRemark.setText(info.getRemark());
changePermissionView();
dataList = new ArrayList<>();
......@@ -186,7 +187,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_device_buy_detail;
return R.layout.activity_device_repair_detail;
}
......@@ -319,10 +320,4 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
});
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/DeviceRepairAdapter.java
浏览文件 @ 7155acc1
......@@ -29,7 +29,8 @@ public class DeviceRepairAdapter extends BaseQuickAdapter<RepairBean.RecordsBean
helper.setText(R.id.tv_order_dep, item.getLaunchDeptName());
helper.setText(R.id.tv_code, item.getId());
helper.setText(R.id.tv_order_time, item.getCreatedTime());
helper.setText(R.id.tv_repair_time, item.getRepairDateTime());
helper.setText(R.id.tv_start_time, item.getRepairDateTimeBegin());
helper.setText(R.id.tv_end_time, item.getRepairDateTimeEnd());
helper.setText(R.id.tv_status, WorkUtils.getDeviceStatus(item.getStatus()));
helper.setText(R.id.tv_all_price, MathUtils.converData(item.getAmount(),3));
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/DeviceRepairDetailAdapter.java
浏览文件 @ 7155acc1
......@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
......@@ -23,8 +24,8 @@ public class DeviceRepairDetailAdapter extends BaseQuickAdapter<DeviceBean.Recor
@Override
protected void convert(BaseViewHolder helper, DeviceBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getEquipmentName());
helper.setText(R.id.tv_component,item.getSubEquipmentName());
helper.setText(R.id.tv_spare_parts, item.getReplaceSparePartName() );
helper.setText(R.id.tv_amount, MathUtils.converData(item.getAmount(),3));
helper.setText(R.id.tv_spare_parts, item.getSparePartName() );
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/DeviceRepairProductAdapter.java
浏览文件 @ 7155acc1
......@@ -23,7 +23,7 @@ public class DeviceRepairProductAdapter extends BaseQuickAdapter<DeviceRepairVo,
@Override
protected void convert(BaseViewHolder helper, DeviceRepairVo item) {
helper.setText(R.id.tv_component_name, item.getSubEquipmentName());
helper.setText(R.id.tv_component_name, item.getAmount());
helper.setText(R.id.tv_spare_parts_name, item.getReplaceSparePartName());
helper.setText(R.id.tv_machine_name, item.getEquipmentName());
helper.addOnClickListener(R.id.tv_delete);
......
app/src/main/res/layout/activity_device_buy_pro_repair.xml
浏览文件 @ 7155acc1
......@@ -31,8 +31,8 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ll_add"
android:visibility="gone"
android:id="@+id/ll_add"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#70000000"
......@@ -103,6 +103,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:hint="请选择设备"
android:gravity="right"
android:textSize="16sp"
android:textStyle="bold" />
......@@ -114,8 +115,9 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_components"
android:id="@+id/rl_spare_parts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -133,17 +135,18 @@
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#C45D5D" />
android:background="#FFE3AD6E" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择组件"
android:text="消耗物料(备件)"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -151,11 +154,12 @@
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_components"
android:id="@+id/tv_spare_parts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:hint="请选择组件"
android:hint="请选择消耗物料"
android:gravity="right"
android:textSize="16sp"
android:textStyle="bold" />
......@@ -167,8 +171,8 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_spare_parts"
<LinearLayout
android:id="@+id/rl_components"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -186,40 +190,33 @@
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#FFE3AD6E" />
android:background="#C45D5D" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="替换备件"
android:text="消耗数量"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_spare_parts"
android:layout_width="wrap_content"
<EditText
android:id="@+id/et_amount"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:hint="请选择替换备件"
android:gravity="right"
android:background="@null"
android:hint="请输入消耗数量"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
......
app/src/main/res/layout/activity_device_buy_repair.xml
浏览文件 @ 7155acc1
......@@ -122,7 +122,7 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_time"
android:id="@+id/rl_start_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -147,7 +147,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择接维修时间"
android:text="维修开始时间"
android:textSize="16sp" />
</LinearLayout>
......@@ -159,11 +159,11 @@
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_time"
android:id="@+id/tv_start_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择维修时间"
android:text="请选择维修开始时间"
android:textSize="16sp"
android:textStyle="bold" />
......@@ -175,7 +175,59 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_end_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#FF3F617F" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="维修结束时间"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择维修结束时间"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="60mm"
......
app/src/main/res/layout/activity_device_buy_repair_confirm.xml
浏览文件 @ 7155acc1
......@@ -144,13 +144,13 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="维修时间"
android:text="维修开始时间"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_time"
android:id="@+id/tv_start_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -159,8 +159,32 @@
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<View style="@style/ViewX" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="维修结束时间"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/ViewX" />
......
app/src/main/res/layout/item_device_product_repair.xml
浏览文件 @ 7155acc1
......@@ -40,6 +40,7 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
......@@ -48,21 +49,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="组件名称"
android:text="消耗物料(备件)"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_component_name"
android:id="@+id/tv_spare_parts_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
......@@ -71,12 +70,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="替换组件名称"
android:text="消耗数量"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_spare_parts_name"
android:id="@+id/tv_component_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......
app/src/main/res/layout/item_device_repair.xml
浏览文件 @ 7155acc1
......@@ -133,12 +133,33 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="维修时间"
android:text="维修开始时间"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_repair_time"
android:id="@+id/tv_start_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="维修结束时间"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......
app/src/main/res/layout/item_device_repair_detail.xml
浏览文件 @ 7155acc1
......@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="设备名字"
android:text="设备"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
......@@ -38,6 +38,7 @@
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -47,18 +48,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="组件名称"
android:text="消耗物料(备件)"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_component"
android:id="@+id/tv_spare_parts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -68,12 +70,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="替换备件名称"
android:text="消耗数量"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_spare_parts"
android:id="@+id/tv_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论