Skip to content

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

1.子详情 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改,用户反馈 新增没通
上级 7a4163ba
显示空白字符变更
内嵌 并排
正在显示 包含 518 行增加 和 81 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/MachineDetailBean.java
浏览文件 @ b606d0f5
...@@ -1493,9 +1493,9 @@ public class MachineDetailBean { ...@@ -1493,9 +1493,9 @@ public class MachineDetailBean {
private Object createUserName; private Object createUserName;
private String updateUserId; private String updateUserId;
private String updateUserName; private String updateUserName;
private Object remark; private String remark;
private boolean delete; private boolean delete;
private List<?> attachments; private List<ImageBean> attachments;
public String getId() { public String getId() {
return id; return id;
...@@ -1617,11 +1617,11 @@ public class MachineDetailBean { ...@@ -1617,11 +1617,11 @@ public class MachineDetailBean {
this.updateUserName = updateUserName; this.updateUserName = updateUserName;
} }
public Object getRemark() { public String getRemark() {
return remark; return remark;
} }
public void setRemark(Object remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
...@@ -1633,11 +1633,11 @@ public class MachineDetailBean { ...@@ -1633,11 +1633,11 @@ public class MachineDetailBean {
this.delete = delete; this.delete = delete;
} }
public List<?> getAttachments() { public List<ImageBean> getAttachments() {
return attachments; return attachments;
} }
public void setAttachments(List<?> attachments) { public void setAttachments(List<ImageBean> attachments) {
this.attachments = attachments; this.attachments = attachments;
} }
} }
...@@ -1671,7 +1671,7 @@ public class MachineDetailBean { ...@@ -1671,7 +1671,7 @@ public class MachineDetailBean {
private String refractoryName; private String refractoryName;
private String figureNumber; private String figureNumber;
private String materialsUsed; private String materialsUsed;
private Object useRequirement; private String useRequirement;
private String useLife; private String useLife;
private String useProblemFeedback; private String useProblemFeedback;
private Object attachmentId; private Object attachmentId;
...@@ -1679,9 +1679,9 @@ public class MachineDetailBean { ...@@ -1679,9 +1679,9 @@ public class MachineDetailBean {
private Object createUserName; private Object createUserName;
private String updateUserId; private String updateUserId;
private String updateUserName; private String updateUserName;
private Object remark; private String remark;
private boolean delete; private boolean delete;
private List<?> attachments; private List<ImageBean> attachments;
public String getId() { public String getId() {
return id; return id;
...@@ -1739,11 +1739,11 @@ public class MachineDetailBean { ...@@ -1739,11 +1739,11 @@ public class MachineDetailBean {
this.materialsUsed = materialsUsed; this.materialsUsed = materialsUsed;
} }
public Object getUseRequirement() { public String getUseRequirement() {
return useRequirement; return useRequirement;
} }
public void setUseRequirement(Object useRequirement) { public void setUseRequirement(String useRequirement) {
this.useRequirement = useRequirement; this.useRequirement = useRequirement;
} }
...@@ -1803,11 +1803,11 @@ public class MachineDetailBean { ...@@ -1803,11 +1803,11 @@ public class MachineDetailBean {
this.updateUserName = updateUserName; this.updateUserName = updateUserName;
} }
public Object getRemark() { public String getRemark() {
return remark; return remark;
} }
public void setRemark(Object remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
...@@ -1819,11 +1819,11 @@ public class MachineDetailBean { ...@@ -1819,11 +1819,11 @@ public class MachineDetailBean {
this.delete = delete; this.delete = delete;
} }
public List<?> getAttachments() { public List<ImageBean> getAttachments() {
return attachments; return attachments;
} }
public void setAttachments(List<?> attachments) { public void setAttachments(List<ImageBean> attachments) {
this.attachments = attachments; this.attachments = attachments;
} }
} }
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ b606d0f5
...@@ -268,6 +268,6 @@ public interface MesApiService { ...@@ -268,6 +268,6 @@ public interface MesApiService {
* @return * @return
*/ */
@GET("/himes/api/msLadleRefractoryRecord/show/{id}.json") @GET("/himes/api/msLadleRefractoryRecord/show/{id}.json")
Observable<BaseMesBean> middleDetail(@Path("id") String id, @Query("functionId") String functionId); Observable<BaseMesBean> packageDetail(@Path("id") String id, @Query("functionId") String functionId);
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleDetailActivity.java
浏览文件 @ b606d0f5
...@@ -36,7 +36,7 @@ public class MesMiddleDetailActivity extends WorkToolBarActivity { ...@@ -36,7 +36,7 @@ public class MesMiddleDetailActivity extends WorkToolBarActivity {
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_user_data_other_supplier; return R.layout.activity_mes_user_data_other_middle;
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesOtherSupplierDetailActivity.java
浏览文件 @ b606d0f5
package com.wd.workoffice.ui.activity.mes.user; package com.wd.workoffice.ui.activity.mes.user;
import android.view.Menu; import android.os.Bundle;
import android.view.MenuItem; import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent; import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import org.greenrobot.eventbus.EventBus; import com.wd.workoffice.retrofit.RtfUtils;
import org.greenrobot.eventbus.Subscribe; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/** /**
* author : flexible * author : flexible
...@@ -18,15 +29,37 @@ import butterknife.ButterKnife; ...@@ -18,15 +29,37 @@ import butterknife.ButterKnife;
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class MesOtherSupplierDetailActivity extends WorkToolBarActivity { public class MesOtherSupplierDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_years)
TextView tvYears;
@BindView(R.id.tv_supply_num)
TextView tvSupplyNum;
@BindView(R.id.tv_stock_num)
TextView tvStockNum;
@BindView(R.id.tv_content)
TextView tvContent;
@BindView(R.id.rv_img)
RecyclerView rvImg;
@BindView(R.id.tv_remark)
TextView tvRemark;
private MachineDetailBean.OtherSupListBean dataBean;
private List<ImageBean> imgList;
private ImgAdapter imgAdapter;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
} }
@Override @Override
protected void initData() { protected void initData() {
imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg);
getData();
} }
...@@ -36,40 +69,40 @@ public class MesOtherSupplierDetailActivity extends WorkToolBarActivity { ...@@ -36,40 +69,40 @@ public class MesOtherSupplierDetailActivity extends WorkToolBarActivity {
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_user_data_other_supplier; return R.layout.activity_mes_user_data_other_supplier_detail;
} }
private void getData() {
RtfUtils.getMesRtf().supplierDetail(getIntent().getStringExtra("id"), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public void doOnSubscribe(Disposable d) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public void onFail(String errorMsg) {
switch (item.getItemId()) { hideLoading();
case R.id.finish: toast(errorMsg);
finish();
break;
}
return super.onOptionsItemSelected(item);
} }
@Override @Override
public void onStart() { public void onSuccess(BaseMesBean data) {
super.onStart(); hideLoading();
EventBus.getDefault().register(this); if (!data.isSuccess()) {
toast(data.getMsg());
return;
} }
@Override dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.OtherSupListBean.class);
public void onStop() { imgList.addAll(dataBean.getAttachments());
super.onStop(); imgAdapter.notifyDataSetChanged();
EventBus.getDefault().unregister(this); tvName.setText(dataBean.getSupplierName());
tvSupplyNum.setText(dataBean.getSupplyNumber());
tvStockNum.setText(dataBean.getStockNumber());
tvYears.setText(dataBean.getUseLife());
tvContent.setText(dataBean.getOtherSituationDescription());
tvRemark.setText(dataBean.getRemark());
} }
});
@Subscribe
public void refresh(AddFactoryEvent event) {
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesPackageDetailActivity.java
浏览文件 @ b606d0f5
package com.wd.workoffice.ui.activity.mes.user; package com.wd.workoffice.ui.activity.mes.user;
import android.view.Menu; import android.os.Bundle;
import android.view.MenuItem; import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent; import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import org.greenrobot.eventbus.EventBus; import com.wd.workoffice.retrofit.RtfUtils;
import org.greenrobot.eventbus.Subscribe; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/** /**
* author : flexible * author : flexible
...@@ -18,15 +30,41 @@ import butterknife.ButterKnife; ...@@ -18,15 +30,41 @@ import butterknife.ButterKnife;
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class MesPackageDetailActivity extends WorkToolBarActivity { public class MesPackageDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_pro)
TextView tvPro;
@BindView(R.id.rl_pro)
RelativeLayout rlPro;
@BindView(R.id.et_img_code)
TextView etImgCode;
@BindView(R.id.tv_materials)
TextView tvMaterials;
@BindView(R.id.tv_requirements)
TextView tvRequirements;
@BindView(R.id.tv_years)
TextView tvYears;
@BindView(R.id.tv_content)
TextView tvContent;
@BindView(R.id.rv_img)
RecyclerView rvImg;
@BindView(R.id.tv_remark)
TextView tvRemark;
private MachineDetailBean.OtherLadleListBean dataBean;
private List<ImageBean> imgList;
private ImgAdapter imgAdapter;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
} }
@Override @Override
protected void initData() { protected void initData() {
imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg);
getData();
} }
...@@ -36,40 +74,40 @@ public class MesPackageDetailActivity extends WorkToolBarActivity { ...@@ -36,40 +74,40 @@ public class MesPackageDetailActivity extends WorkToolBarActivity {
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_user_data_other_package; return R.layout.activity_mes_user_data_other_package_detail;
} }
private void getData() {
RtfUtils.getMesRtf().packageDetail(getIntent().getStringExtra("id"), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public void doOnSubscribe(Disposable d) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public void onFail(String errorMsg) {
switch (item.getItemId()) { hideLoading();
case R.id.finish: toast(errorMsg);
finish();
break;
}
return super.onOptionsItemSelected(item);
} }
@Override @Override
public void onStart() { public void onSuccess(BaseMesBean data) {
super.onStart(); hideLoading();
EventBus.getDefault().register(this); if (!data.isSuccess()) {
toast(data.getMsg());
return;
} }
@Override dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.OtherLadleListBean.class);
public void onStop() { imgList.addAll(dataBean.getAttachments());
super.onStop(); imgAdapter.notifyDataSetChanged();
EventBus.getDefault().unregister(this); tvPro.setText(dataBean.getRefractoryName());
etImgCode.setText(dataBean.getFigureNumber());
tvRequirements.setText(dataBean.getUseRequirement());
tvYears.setText(dataBean.getUseLife());
tvContent.setText(dataBean.getUseProblemFeedback());
tvRemark.setText(dataBean.getRemark());
} }
});
@Subscribe
public void refresh(AddFactoryEvent event) {
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ b606d0f5
...@@ -342,13 +342,13 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -342,13 +342,13 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesOtherSupplierModifyActivity.class); startActivity(MesOtherSupplierDetailActivity.class, "id", machineDetailBean.getOtherSupList().get(position).getId());
} }
}); });
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageModifyActivity.class); startActivity(MesPackageDetailActivity.class, "id", machineDetailBean.getOtherLadleList().get(position).getId());
} }
}); });
} }
......
app/src/main/res/layout/activity_mes_user_data_other_package_detail.xml 0 → 100644
浏览文件 @ b606d0f5
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_pro"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="名称"
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="图号"
android:textSize="14sp" />
<TextView
android:id="@+id/et_img_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="用料"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_materials"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="使用要求"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_requirements"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="使用寿命"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_years"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="15mm"
android:paddingLeft="18mm"
android:text="使用问题反馈（侵蚀、冲刷、断裂等）"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="15mm"
android:paddingLeft="18mm"
android:text="备注"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="10mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/activity_mes_user_data_other_supplier_detail.xml 0 → 100644
浏览文件 @ b606d0f5
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="供应商名称"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="使用寿命"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_years"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="供货量"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_supply_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="库存量"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_stock_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="15mm"
android:paddingLeft="18mm"
android:text="使用问题反馈（侵蚀、冲刷、断裂等）"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img"
android:paddingHorizontal="20mm"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="15mm"
android:paddingLeft="18mm"
android:text="备注"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="100mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/activity_mes_user_data_three_detail.xml
浏览文件 @ b606d0f5
...@@ -325,8 +325,9 @@ ...@@ -325,8 +325,9 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img" android:id="@+id/rv_img"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:paddingHorizontal="20mm" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论