Skip to content

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

1.修改ticket的差异 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数
上级 d04f1aa9
隐藏空白字符变更
内嵌 并排
正在显示 包含 192 行增加 和 70 行删除
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddActivity.java
浏览文件 @ c01ee41e
......@@ -282,6 +282,12 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
}
private void submit() {
String startTime = tvStartTime.getText().toString();
String endTime = tvEndTime.getText().toString();
if (TextUtils.isEmpty(startTime)||TextUtils.isEmpty(endTime)){
toast("情选择开始结束时间");
return;
}
if (chooseClient != null) {
param.put("customerUserCode", chooseClient.getCustomerCode());
param.put("customerUserName", chooseClient.getCustomerName());
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java
浏览文件 @ c01ee41e
......@@ -5,6 +5,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.net.Uri;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
......@@ -123,9 +124,16 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
RecyclerView rvPhoto;
@BindView(R.id.rv_annex)
RecyclerView rvAnnex;
@BindView(R.id.tv_finish_confirm)
TextView tvFinishConfirm;
@BindView(R.id.rl_finish)
RelativeLayout rlFinish;
@BindView(R.id.tv_upload)
TextView tvUpload;
private Map<String, Object> param;
private TicketBean.ListBean data;
private QMUIDialog.MenuDialogBuilder proDialog;
private QMUIDialog.MenuDialogBuilder finishDialog;
private MesProBean.ListBean choosePro;
private List<ImageBean> imgList;
private List<ImageBean> annexList;
......@@ -140,7 +148,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
changVisibility(data.getJobTypeId());
proDialog = DialogUtils.listDialog(this);
proDialog.addItems(new String[]{"是", "否"}, new DialogInterface.OnClickListener() {
proDialog.addItems(new String[]{"确认", "未确认"}, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == 0)
......@@ -148,7 +156,19 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
else
param.put("productDrawingConfirmation", 0);
dialog.dismiss();
tvDesignConfirm.setText(which == 0 ? "是" : "否");
tvDesignConfirm.setText(which == 0 ? "确认" : "未确认");
}
});
finishDialog = DialogUtils.listDialog(this);
finishDialog.addItems(new String[]{"完成", "未完成"}, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == 0)
param.put("dataCollectionStatus", 1);
else
param.put("dataCollectionStatus", 0);
dialog.dismiss();
tvFinishConfirm.setText(which == 0 ? "完成" : "未完成");
}
});
}
......@@ -158,7 +178,6 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
param = WorkUtils.simpleParam();
param.put("jobNo", data.getJobNo());
param.put("jobTypeId", data.getJobTypeId());
param.put("dataCollectionStatus", 1);
annexList = new ArrayList<>();
imgList = new ArrayList<>();
ImageBean imageBean = new ImageBean();
......@@ -182,7 +201,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
imgAddAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (position==imgList.size()-1){
if (position == imgList.size() - 1) {
addImg();
}
}
......@@ -232,7 +251,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_upload, R.id.rl_quality_pro, R.id.ll_design, R.id.rl_try_pro, R.id.rl_tech_pro})
@OnClick({R.id.rl_finish,R.id.tv_upload, R.id.rl_quality_pro, R.id.ll_design, R.id.rl_try_pro, R.id.rl_tech_pro})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_upload:
......@@ -242,6 +261,9 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
// startActivityForResult(intent, 10003);
addFile();
break;
case R.id.rl_finish:
finishDialog.show();
break;
case R.id.ll_design:
proDialog.show();
break;
......@@ -306,11 +328,11 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
}
}
param.put("completionSituation", etClient.getText().toString());
List<ImageBean> uploadImg =new ArrayList<>();
for (int i = 0; i < imgList.size()-1; i++) {
List<ImageBean> uploadImg = new ArrayList<>();
for (int i = 0; i < imgList.size() - 1; i++) {
uploadImg.add(imgList.get(i));
}
param.put("attachments",uploadImg);
param.put("attachments", uploadImg);
RtfUtils.getMesRtf().summaryAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
......@@ -365,6 +387,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
}
});
}
private void addFile() {
RxPermissions rxPermissions = new RxPermissions(this);
rxPermissions
......@@ -383,6 +406,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
}
});
}
/**
* type 1 图片 2 附件
*
......@@ -392,11 +416,10 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
private void upload(int type, Object uri) {
showLoading();
File file;
if (uri instanceof Uri){
if (uri instanceof Uri) {
file = WorkUtils.uriToFile((Uri) uri, this);
}
else {
file =new File(uri.toString());
} else {
file = new File(uri.toString());
}
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
RtfUtils.getMesRtf().
......@@ -428,7 +451,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
imageBean.setType(data.getData().toString().split("\\.")[1]);
if (type == 1) {
imgList.add(imgList.size()-1, imageBean);
imgList.add(imgList.size() - 1, imageBean);
imgAddAdapter.notifyDataSetChanged();
imageBean.setUri((Uri) uri);
} else {
......@@ -439,4 +462,10 @@ public class MesTicketAddSummaryActivity 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/activity/mes/ticket/MesTicketDetailActivity.java
浏览文件 @ c01ee41e
......@@ -84,7 +84,6 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
RelativeLayout rlLog;
@BindView(R.id.rl_add_log)
RelativeLayout rlAddLog;
private AccountBean dataBean;
private TicketBean.ListBean data;
private Map<String, Object> param;
......@@ -92,7 +91,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
protected void initView() {
ButterKnife.bind(this);
String from = getIntent().getStringExtra("from");//0 服务 1 任务担当
rvClazz.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvClazz.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
if (TextUtils.equals(from, "1")) {
llBottom.setVisibility(View.VISIBLE);
......@@ -186,10 +185,11 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
startActivity(MesTicketAddSummaryActivity.class, "data", JSON.toJSONString(data));
break;
case R.id.rl_log:
startActivity(MesTicketLogActivity.class, "id", data.getJobNo());
startActivity(MesTicketLogActivity.class, "id", data.getJobNo(), "data", JSON.toJSONString(data));
break;
case R.id.rl_add_log:
startActivity(MesTicketAddLogActivity.class, "data", JSON.toJSONString(data));
startActivity(MesTicketLogActivity.class, "id", data.getJobNo(), "data", JSON.toJSONString(data), "from", "1");
// startActivity(MesTicketAddLogActivity.class, "data", JSON.toJSONString(data));
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailFinishActivity.java
浏览文件 @ c01ee41e
......@@ -114,6 +114,8 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
TextView tvDetail;
@BindView(R.id.rv_annex)
RecyclerView rvAnnex;
@BindView(R.id.tv_finish_confirm)
TextView tvFinishConfirm;
private SummaryBean dataBean;
private List<ImageBean> imgList;
private ImgAdapter imgAdapter;
......@@ -123,13 +125,13 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
protected void initView() {
ButterKnife.bind(this);
String from = getIntent().getStringExtra("from");
if (!TextUtils.isEmpty(from)) {
btnReviews.setVisibility(View.GONE);
} else {
btnReviews.setVisibility(View.VISIBLE);
}
// if (!TextUtils.isEmpty(from)) {
// btnReviews.setVisibility(View.GONE);
// } else {
// btnReviews.setVisibility(View.VISIBLE);
// }
rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
rvAnnex.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvAnnex.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
......@@ -227,8 +229,9 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
}
private void setViewData() {
tvFinishConfirm.setText(dataBean.getDataCollectionStatus() == 1 ? "完成" : "未完成");
if (TextUtils.equals(data.getJobTypeId(), "01")) {
tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() == 0 ? "是" : "否");
tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() ==1 ? "确认" : "未确认");
etDesign1.setText(dataBean.getSiteInvestigation());
etDesign2.setText(dataBean.getFeasibilityReport());
} else if (TextUtils.equals(data.getJobTypeId(), "02")) {
......@@ -296,10 +299,4 @@ public class MesTicketDetailFinishActivity 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/activity/mes/ticket/MesTicketDetailReviewActivity.java
浏览文件 @ c01ee41e
package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
......@@ -103,6 +104,8 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
TextView tvDetail;
@BindView(R.id.tv_score)
TextView tvScore;
@BindView(R.id.tv_finish_confirm)
TextView tvFinishConfirm;
private StarAdapter starAdapter;
private List<ImageBean> imgList;
private ImgAdapter imgAdapter;
......@@ -124,11 +127,8 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvData);
starAdapter = WorkUtils.starView(rvStar, this);
// imgList.add(null);
// imgList.add(null);
// imgList.add(null);
imgAdapter.notifyDataSetChanged();
starAdapter = WorkUtils.starView(rvStar, this);
getData();
}
......@@ -192,8 +192,9 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
}
private void setViewData() {
tvFinishConfirm.setText(dataBean.getDataCollectionStatus() == 1 ? "完成" : "未完成");
if (TextUtils.equals(data.getJobTypeId(), "01")) {
tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() == 0 ? "是" : "否");
tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() ==1 ? "确认" : "未确认");
etDesign1.setText(dataBean.getSiteInvestigation());
etDesign2.setText(dataBean.getFeasibilityReport());
} else if (TextUtils.equals(data.getJobTypeId(), "02")) {
......@@ -219,6 +220,8 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
tvTryPro.setText(dataBean.getProductsName());
}
tvFinish.setText(dataBean.getCommunicativeSituation());
imgList.addAll(dataBean.getAttachments());
imgAdapter.notifyDataSetChanged();
}
private void changView() {
......@@ -243,4 +246,11 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
break;
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketLogActivity.java
浏览文件 @ c01ee41e
package com.wd.workoffice.ui.activity.mes.ticket;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import com.alibaba.fastjson.JSON;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
......@@ -10,6 +14,7 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.LogBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.SendApplyAddActivity;
import com.wd.workoffice.ui.adapter.MesTicketLogAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -52,7 +57,7 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new MesTicketLogAdapter(R.layout.item_mes_ticket_log, dataList,MesTicketLogActivity.this);
dataAdapter = new MesTicketLogAdapter(R.layout.item_mes_ticket_log, dataList, MesTicketLogActivity.this);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.simpleParam();
......@@ -104,6 +109,7 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
protected int layoutId() {
return R.layout.activity_pro_price;
}
@Override
public void onBackPressed() {
if (Jzvd.backPress()) {
......@@ -118,4 +124,20 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
Jzvd.releaseAllVideos();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals("1", getIntent().getStringExtra("from")))
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(MesTicketAddLogActivity.class, "data", getIntent().getStringExtra("data"));
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketTakeOnActivity.java
浏览文件 @ c01ee41e
......@@ -46,7 +46,7 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
private List<TakeOnBean.ListBean> clientList;
private MesTakeOnAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -61,7 +61,9 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
param.put("pageNum", 1);
param.put("paramMap",paramMap);
getData();
}
......@@ -133,7 +135,7 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search)
public void onViewClicked() {
param.put("name", etKey.getText().toString());
paramMap.put("name", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
......
app/src/main/res/layout/activity_mes_ticket_detail.xml
浏览文件 @ c01ee41e
......@@ -268,13 +268,13 @@
<TextView
android:id="@+id/tv_start_time"
android:layout_width="100mm"
android:layout_width="110mm"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:gravity="center"
android:padding="5mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
......@@ -285,12 +285,12 @@
<TextView
android:id="@+id/tv_end_time"
android:layout_width="100mm"
android:layout_width="110mm"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="5mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
android:textSize="12sp" />
</LinearLayout>
</RelativeLayout>
......
app/src/main/res/layout/activity_mes_ticket_detail_finish.xml
浏览文件 @ c01ee41e
......@@ -88,7 +88,29 @@
android:textSize="14sp" />
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="资料完成情况"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_finish_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:text="请选择"
android:textColor="#FF41B390"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:id="@+id/ll_design"
......@@ -138,7 +160,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -161,7 +182,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -230,7 +250,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -254,7 +273,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -277,7 +295,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -345,7 +362,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -369,7 +385,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -392,7 +407,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -415,7 +429,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -483,7 +496,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -507,7 +519,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -530,7 +541,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -563,7 +573,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -587,7 +596,6 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......
app/src/main/res/layout/activity_mes_ticket_detail_reviews.xml
浏览文件 @ c01ee41e
......@@ -126,7 +126,29 @@
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="资料完成情况"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_finish_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:text="请选择"
android:textColor="#FF41B390"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:id="@+id/ll_design"
android:layout_width="match_parent"
......@@ -175,7 +197,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -198,7 +220,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -267,7 +289,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -291,7 +313,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -314,7 +336,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -382,7 +404,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -406,7 +428,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -429,7 +451,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -452,7 +474,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -520,7 +542,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -544,7 +566,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -567,7 +589,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -600,7 +622,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......@@ -624,7 +646,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
......
app/src/main/res/layout/activity_mes_ticket_summary_add.xml
浏览文件 @ c01ee41e
......@@ -9,6 +9,31 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_finish"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="资料完成情况"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_finish_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:id="@+id/ll_design"
......
app/src/main/res/layout/view_reviews.xml
浏览文件 @ c01ee41e
......@@ -4,6 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingVertical="20mm"
android:orientation="horizontal">
<androidx.recyclerview.widget.RecyclerView
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论