Skip to content

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

1.评价，总结 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改
上级 ef935b41
隐藏空白字符变更
内嵌 并排
正在显示 包含 1082 行增加 和 272 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/ReviewBean.java 0 → 100644
浏览文件 @ 9afa8b48
package com.wd.workoffice.bean.mesBean;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class ReviewBean {
/**
* id : 17
* createDateTime : null
* updateDateTime : null
* jobNo : SCTN20041511
* evaluationScore : 5
* evaluationUserId : 398c852b38e911ea8334fa163e1166bd
* evaluationUserName : hello
* evaluationDateTime : 2020-04-26 11:51:47
* createUserId : 398c852b38e911ea8334fa163e1166bd
* createUserName : hello
* updateUserId : null
* updateUserName : null
* remark : null
* delete : null
*/
private String id;
private Object createDateTime;
private Object updateDateTime;
private String jobNo;
private int evaluationScore;
private String evaluationUserId;
private String evaluationUserName;
private String evaluationDateTime;
private String createUserId;
private String createUserName;
private Object updateUserId;
private Object updateUserName;
private Object remark;
private Object delete;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Object getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(Object createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getJobNo() {
return jobNo;
}
public void setJobNo(String jobNo) {
this.jobNo = jobNo;
}
public int getEvaluationScore() {
return evaluationScore;
}
public void setEvaluationScore(int evaluationScore) {
this.evaluationScore = evaluationScore;
}
public String getEvaluationUserId() {
return evaluationUserId;
}
public void setEvaluationUserId(String evaluationUserId) {
this.evaluationUserId = evaluationUserId;
}
public String getEvaluationUserName() {
return evaluationUserName;
}
public void setEvaluationUserName(String evaluationUserName) {
this.evaluationUserName = evaluationUserName;
}
public String getEvaluationDateTime() {
return evaluationDateTime;
}
public void setEvaluationDateTime(String evaluationDateTime) {
this.evaluationDateTime = evaluationDateTime;
}
public String getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Object getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(Object updateUserId) {
this.updateUserId = updateUserId;
}
public Object getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(Object updateUserName) {
this.updateUserName = updateUserName;
}
public Object getRemark() {
return remark;
}
public void setRemark(Object remark) {
this.remark = remark;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/SummaryBean.java
浏览文件 @ 9afa8b48
...@@ -49,7 +49,7 @@ public class SummaryBean { ...@@ -49,7 +49,7 @@ public class SummaryBean {
private long updateDateTime; private long updateDateTime;
private String jobNo; private String jobNo;
private int jobTypeId; private int jobTypeId;
private String productDrawingConfirmation; private int productDrawingConfirmation;
private String siteInvestigation; private String siteInvestigation;
private String feasibilityReport; private String feasibilityReport;
private String productsCode; private String productsCode;
...@@ -117,11 +117,11 @@ public class SummaryBean { ...@@ -117,11 +117,11 @@ public class SummaryBean {
this.jobTypeId = jobTypeId; this.jobTypeId = jobTypeId;
} }
public String getProductDrawingConfirmation() { public int getProductDrawingConfirmation() {
return productDrawingConfirmation; return productDrawingConfirmation;
} }
public void setProductDrawingConfirmation(String productDrawingConfirmation) { public void setProductDrawingConfirmation(int productDrawingConfirmation) {
this.productDrawingConfirmation = productDrawingConfirmation; this.productDrawingConfirmation = productDrawingConfirmation;
} }
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 9afa8b48
...@@ -8,6 +8,7 @@ import com.wd.workoffice.app.Config; ...@@ -8,6 +8,7 @@ import com.wd.workoffice.app.Config;
import io.reactivex.Observable; import io.reactivex.Observable;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.http.Body; import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.POST; import retrofit2.http.POST;
import retrofit2.http.Path; import retrofit2.http.Path;
import retrofit2.http.Query; import retrofit2.http.Query;
...@@ -77,8 +78,24 @@ public interface MesApiService { ...@@ -77,8 +78,24 @@ public interface MesApiService {
* *
* @return * @return
*/ */
@POST("/himes/api/msWorkSummary/show/{id}.json") @GET("/himes/api/msWorkSummary/show/{id}.json")
Observable<BaseMesBean> summaryDetail(@Query("functionId") String functionId, @Path("id") String id); Observable<BaseMesBean> summaryDetail(@Path("id") String id, @Query("functionId") String functionId);
/**
* msWorkEvaluation
*
* @return
*/
@GET("/himes/api/msWorkEvaluation/show/{id}.json")
Observable<BaseMesBean> review(@Path("id") String id, @Query("functionId") String functionId);
/**
* msWorkEvaluation
*
* @return
*/
@POST("/himes/api/msWorkEvaluation/save.json")
Observable<BaseMesBean> reviewAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/** /**
* 工作总结新增 * 工作总结新增
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailFinishActivity.java
浏览文件 @ 9afa8b48
package com.wd.workoffice.ui.activity.mes.ticket; package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -10,9 +13,10 @@ import android.widget.TextView; ...@@ -10,9 +13,10 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean; import com.wd.workoffice.bean.event.AddTicketEvent;
import com.wd.workoffice.bean.mesBean.SummaryBean;
import com.wd.workoffice.bean.mesBean.TicketBean; import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
...@@ -20,8 +24,11 @@ import com.wd.workoffice.ui.adapter.ImgAdapter; ...@@ -20,8 +24,11 @@ import com.wd.workoffice.ui.adapter.ImgAdapter;
import com.wd.workoffice.ui.adapter.StarAdapter; import com.wd.workoffice.ui.adapter.StarAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
...@@ -41,17 +48,69 @@ import io.reactivex.disposables.Disposable; ...@@ -41,17 +48,69 @@ import io.reactivex.disposables.Disposable;
public class MesTicketDetailFinishActivity extends WorkToolBarActivity { public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
@BindView(R.id.tv_code) @BindView(R.id.tv_code)
TextView tvCode; TextView tvCode;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
@BindView(R.id.rl_company)
RelativeLayout rlCompany;
@BindView(R.id.btn_reviews) @BindView(R.id.btn_reviews)
Button btnReviews; Button btnReviews;
@BindView(R.id.ll_bottom) @BindView(R.id.ll_bottom)
LinearLayout llBottom; LinearLayout llBottom;
@BindView(R.id.rv_img) @BindView(R.id.rv_img)
RecyclerView rvImg; RecyclerView rvImg;
private AccountBean dataBean; @BindView(R.id.tv_finish)
TextView tvFinish;
@BindView(R.id.tv_design_confirm)
TextView tvDesignConfirm;
@BindView(R.id.et_design1)
EditText etDesign1;
@BindView(R.id.et_design2)
EditText etDesign2;
@BindView(R.id.ll_design)
LinearLayout llDesign;
@BindView(R.id.tv_try_pro)
TextView tvTryPro;
@BindView(R.id.rl_try_pro)
RelativeLayout rlTryPro;
@BindView(R.id.et_try1)
EditText etTry1;
@BindView(R.id.et_try2)
EditText etTry2;
@BindView(R.id.et_try3)
EditText etTry3;
@BindView(R.id.ll_try)
LinearLayout llTry;
@BindView(R.id.tv_quality_pro)
TextView tvQualityPro;
@BindView(R.id.rl_quality_pro)
RelativeLayout rlQualityPro;
@BindView(R.id.et_quality1)
EditText etQuality1;
@BindView(R.id.et_quality2)
EditText etQuality2;
@BindView(R.id.et_quality3)
EditText etQuality3;
@BindView(R.id.et_quality4)
EditText etQuality4;
@BindView(R.id.ll_quality)
LinearLayout llQuality;
@BindView(R.id.tv_tech_pro)
TextView tvTechPro;
@BindView(R.id.rl_tech_pro)
RelativeLayout rlTechPro;
@BindView(R.id.et_tech1)
EditText etTech1;
@BindView(R.id.et_tech2)
EditText etTech2;
@BindView(R.id.et_tech3)
EditText etTech3;
@BindView(R.id.ll_tech)
LinearLayout llTech;
@BindView(R.id.et_tender1)
EditText etTender1;
@BindView(R.id.et_tender2)
EditText etTender2;
@BindView(R.id.ll_tender)
LinearLayout llTender;
@BindView(R.id.tv_detail)
TextView tvDetail;
private SummaryBean dataBean;
private List<Object> imgList; private List<Object> imgList;
private ImgAdapter imgAdapter; private ImgAdapter imgAdapter;
private TicketBean.ListBean data; private TicketBean.ListBean data;
...@@ -59,12 +118,20 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity { ...@@ -59,12 +118,20 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
String from = getIntent().getStringExtra("from");
if (!TextUtils.isEmpty(from)) {
btnReviews.setVisibility(View.GONE);
} else {
btnReviews.setVisibility(View.VISIBLE);
}
rvImg.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)); rvImg.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
} }
@Override @Override
protected void initData() { protected void initData() {
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class); data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
tvCode.setText(data.getJobNo());
changView();
imgList = new ArrayList<>(); imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList); imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg); imgAdapter.bindToRecyclerView(rvImg);
...@@ -86,21 +153,53 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity { ...@@ -86,21 +153,53 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
RecyclerView rvStar = view.findViewById(R.id.rv_reviews); RecyclerView rvStar = view.findViewById(R.id.rv_reviews);
TextView tvScore = view.findViewById(R.id.tv_score); TextView tvScore = view.findViewById(R.id.tv_score);
StarAdapter starAdapter = WorkUtils.starView(rvStar, this); StarAdapter starAdapter = WorkUtils.starView(rvStar, this);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
addCartDialog.show();
starAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { starAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
starAdapter.setScore(position + 1); starAdapter.setScore(position + 1);
tvScore.setText(String.format("%s分", position + 1)); tvScore.setText(String.format("%s分", position + 1));
startActivity(MesTicketDetailReviewActivity.class); review(position + 1);
addCartDialog.dismiss();
}
});
}
private void review(int evaluationScore) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("evaluationScore", evaluationScore);
param.put("jobNo", data.getJobNo());
RtfUtils.getMesRtf().reviewAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
toast("评价成功");
EventBus.getDefault().post(new AddTicketEvent());
btnReviews.setVisibility(View.GONE);
} }
}); });
builder.setView(view);
AlertDialog addCartDialog = builder.create();
addCartDialog.show();
} }
private void getData() { private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getMesRtf().summaryDetail(data.getJobNo(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
...@@ -113,21 +212,62 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity { ...@@ -113,21 +212,62 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
} }
@Override @Override
public void onSuccess(BaseBean data) { public void onSuccess(BaseMesBean data) {
hideLoading(); hideLoading();
if (data.getCode() != 0) { if (!data.isSuccess()) {
toast(data.getMessage()); toast(data.getMessage());
return; return;
} }
dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class); dataBean = JSON.parseObject(data.getData().toString(), SummaryBean.class);
// tvName.setText(dataBean.getName()); setViewData();
// tvDpeName.setText(dataBean.getName());
// tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
// tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
} }
}); });
} }
private void setViewData() {
if (TextUtils.equals(data.getJobTypeId(), "01")) {
tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() == 0 ? "是" : "否");
etDesign1.setText(dataBean.getSiteInvestigation());
etDesign2.setText(dataBean.getFeasibilityReport());
} else if (TextUtils.equals(data.getJobTypeId(), "02")) {
etTry1.setText(dataBean.getExperimentProcess());
etTry2.setText(dataBean.getExperimentResult());
etTry3.setText(dataBean.getImproveProposal());
} else if (TextUtils.equals(data.getJobTypeId(), "03")) {
etQuality1.setText(dataBean.getFeedbackQualityIssues());
etQuality2.setText(dataBean.getSiteUseSituation());
etQuality3.setText(dataBean.getCauseAnalysis());
etQuality4.setText(dataBean.getSolution());
} else if (TextUtils.equals(data.getJobTypeId(), "04")) {
etTech1.setText(dataBean.getCommunicativePurposes());
etTech2.setText(dataBean.getCommunicativeSituation());
etTech3.setText(dataBean.getReachOpinion());
} else if (TextUtils.equals(data.getJobTypeId(), "05")) {
etTender1.setText(dataBean.getProductDevise());
etTender2.setText(dataBean.getProductQuotedPrice());
}
if (!TextUtils.isEmpty(dataBean.getProductsCode())) {
tvQualityPro.setText(dataBean.getProductsName());
tvTechPro.setText(dataBean.getProductsName());
tvTryPro.setText(dataBean.getProductsName());
}
tvFinish.setText(dataBean.getCommunicativeSituation());
}
private void changView() {
if (TextUtils.equals(data.getJobTypeId(), "01")) {
llDesign.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "02")) {
llTry.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "03")) {
llQuality.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "04")) {
llTech.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "05")) {
llTender.setVisibility(View.VISIBLE);
}
}
@Override @Override
protected void initEvent() { protected void initEvent() {
} }
...@@ -138,8 +278,15 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity { ...@@ -138,8 +278,15 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
} }
@OnClick(R.id.btn_reviews) @OnClick({R.id.btn_reviews, R.id.tv_detail})
public void onViewClicked() { public void onViewClicked(View view) {
openStar(0); switch (view.getId()) {
case R.id.btn_reviews:
openStar(0);
break;
case R.id.tv_detail:
startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(data));
break;
}
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailReviewActivity.java
浏览文件 @ 9afa8b48
package com.wd.workoffice.ui.activity.mes.ticket; package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean; import com.wd.workoffice.bean.mesBean.ReviewBean;
import com.wd.workoffice.bean.mesBean.SummaryBean;
import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter; import com.wd.workoffice.ui.adapter.ImgAdapter;
...@@ -22,6 +28,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; ...@@ -22,6 +28,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
...@@ -34,22 +41,80 @@ import io.reactivex.disposables.Disposable; ...@@ -34,22 +41,80 @@ import io.reactivex.disposables.Disposable;
public class MesTicketDetailReviewActivity extends WorkToolBarActivity { public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
@BindView(R.id.tv_code) @BindView(R.id.tv_code)
TextView tvCode; TextView tvCode;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
@BindView(R.id.rl_company)
RelativeLayout rlCompany;
@BindView(R.id.rv_star) @BindView(R.id.rv_star)
RecyclerView rvStar; RecyclerView rvStar;
@BindView(R.id.rv_data) @BindView(R.id.rv_img)
RecyclerView rvData; RecyclerView rvData;
private AccountBean dataBean; @BindView(R.id.tv_finish)
TextView tvFinish;
@BindView(R.id.tv_design_confirm)
TextView tvDesignConfirm;
@BindView(R.id.et_design1)
EditText etDesign1;
@BindView(R.id.et_design2)
EditText etDesign2;
@BindView(R.id.ll_design)
LinearLayout llDesign;
@BindView(R.id.tv_try_pro)
TextView tvTryPro;
@BindView(R.id.rl_try_pro)
RelativeLayout rlTryPro;
@BindView(R.id.et_try1)
EditText etTry1;
@BindView(R.id.et_try2)
EditText etTry2;
@BindView(R.id.et_try3)
EditText etTry3;
@BindView(R.id.ll_try)
LinearLayout llTry;
@BindView(R.id.tv_quality_pro)
TextView tvQualityPro;
@BindView(R.id.rl_quality_pro)
RelativeLayout rlQualityPro;
@BindView(R.id.et_quality1)
EditText etQuality1;
@BindView(R.id.et_quality2)
EditText etQuality2;
@BindView(R.id.et_quality3)
EditText etQuality3;
@BindView(R.id.et_quality4)
EditText etQuality4;
@BindView(R.id.ll_quality)
LinearLayout llQuality;
@BindView(R.id.tv_tech_pro)
TextView tvTechPro;
@BindView(R.id.rl_tech_pro)
RelativeLayout rlTechPro;
@BindView(R.id.et_tech1)
EditText etTech1;
@BindView(R.id.et_tech2)
EditText etTech2;
@BindView(R.id.et_tech3)
EditText etTech3;
@BindView(R.id.ll_tech)
LinearLayout llTech;
@BindView(R.id.et_tender1)
EditText etTender1;
@BindView(R.id.et_tender2)
EditText etTender2;
@BindView(R.id.ll_tender)
LinearLayout llTender;
@BindView(R.id.tv_detail)
TextView tvDetail;
@BindView(R.id.tv_score)
TextView tvScore;
private StarAdapter starAdapter; private StarAdapter starAdapter;
private List<Object> imgList; private List<Object> imgList;
private ImgAdapter imgAdapter; private ImgAdapter imgAdapter;
private SummaryBean dataBean;
private TicketBean.ListBean data;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
tvCode.setText(data.getJobNo());
changView();
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)); rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
rvStar.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)); rvStar.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
} }
...@@ -67,9 +132,41 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity { ...@@ -67,9 +132,41 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
getData(); getData();
} }
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_ticket_detail_reviews;
}
private void getData() { private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getMesRtf().summaryDetail(data.getJobNo(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
dataBean = JSON.parseObject(data.getData().toString(), SummaryBean.class);
setViewData();
}
});
RtfUtils.getMesRtf().review(data.getJobNo(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
...@@ -82,29 +179,69 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity { ...@@ -82,29 +179,69 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
} }
@Override @Override
public void onSuccess(BaseBean data) { public void onSuccess(BaseMesBean data) {
hideLoading(); hideLoading();
if (data.getCode() != 0) { if (!data.isSuccess()) {
toast(data.getMessage()); toast(data.getMessage());
return; return;
} }
dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class); ReviewBean dataBean = JSON.parseObject(data.getData().toString(), ReviewBean.class);
// tvName.setText(dataBean.getName()); starAdapter.setScore(dataBean.getEvaluationScore());
// tvDpeName.setText(dataBean.getName()); tvScore.setText(String.format("%s分", dataBean.getEvaluationScore()));
// tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
// tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
} }
}); });
} }
@Override private void setViewData() {
protected void initEvent() { if (TextUtils.equals(data.getJobTypeId(), "01")) {
tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() == 0 ? "是" : "否");
etDesign1.setText(dataBean.getSiteInvestigation());
etDesign2.setText(dataBean.getFeasibilityReport());
} else if (TextUtils.equals(data.getJobTypeId(), "02")) {
etTry1.setText(dataBean.getExperimentProcess());
etTry2.setText(dataBean.getExperimentResult());
etTry3.setText(dataBean.getImproveProposal());
} else if (TextUtils.equals(data.getJobTypeId(), "03")) {
etQuality1.setText(dataBean.getFeedbackQualityIssues());
etQuality2.setText(dataBean.getSiteUseSituation());
etQuality3.setText(dataBean.getCauseAnalysis());
etQuality4.setText(dataBean.getSolution());
} else if (TextUtils.equals(data.getJobTypeId(), "04")) {
etTech1.setText(dataBean.getCommunicativePurposes());
etTech2.setText(dataBean.getCommunicativeSituation());
etTech3.setText(dataBean.getReachOpinion());
} else if (TextUtils.equals(data.getJobTypeId(), "05")) {
etTender1.setText(dataBean.getProductDevise());
etTender2.setText(dataBean.getProductQuotedPrice());
}
if (!TextUtils.isEmpty(dataBean.getProductsCode())) {
tvQualityPro.setText(dataBean.getProductsName());
tvTechPro.setText(dataBean.getProductsName());
tvTryPro.setText(dataBean.getProductsName());
}
tvFinish.setText(dataBean.getCommunicativeSituation());
} }
@Override private void changView() {
protected int layoutId() { if (TextUtils.equals(data.getJobTypeId(), "01")) {
return R.layout.activity_mes_ticket_detail_reviews; llDesign.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "02")) {
llTry.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "03")) {
llQuality.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "04")) {
llTech.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(data.getJobTypeId(), "05")) {
llTender.setVisibility(View.VISIBLE);
}
} }
@OnClick({R.id.tv_detail})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_detail:
startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(data));
break;
}
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java
浏览文件 @ 9afa8b48
...@@ -141,10 +141,10 @@ public class MesTicketListActivity extends WorkToolBarActivity { ...@@ -141,10 +141,10 @@ public class MesTicketListActivity extends WorkToolBarActivity {
startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position))); startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
break; break;
case 3: case 3:
startActivity(MesTicketDetailReviewActivity.class, "data", JSON.toJSONString(dataList.get(position))); startActivity(MesTicketDetailFinishActivity.class, "data", JSON.toJSONString(dataList.get(position)));
break; break;
case 4: case 4:
startActivity(MesTicketDetailFinishActivity.class, "data", JSON.toJSONString(dataList.get(position))); startActivity(MesTicketDetailReviewActivity.class, "data", JSON.toJSONString(dataList.get(position)));
break; break;
} }
} }
......
app/src/main/res/layout/activity_mes_ticket_detail_finish.xml
浏览文件 @ 9afa8b48
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_detail"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5mm" android:layout_marginLeft="5mm"
...@@ -82,65 +83,12 @@ ...@@ -82,65 +83,12 @@
android:layout_marginBottom="10mm" android:layout_marginBottom="10mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:gravity="top" android:gravity="top"
android:hint="请输入"
android:minLines="3" android:minLines="3"
android:padding="5mm" android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_client"
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:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="资料搜集"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="已完成"
android:textColor="#ff41b390"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_company"
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:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="产品图纸确认"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="已完成"
android:textColor="#ff41b390"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout <LinearLayout
android:id="@+id/ll_design" android:id="@+id/ll_design"
...@@ -152,11 +100,9 @@ ...@@ -152,11 +100,9 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="产品图纸确认" android:text="产品图纸确认"
...@@ -169,6 +115,7 @@ ...@@ -169,6 +115,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="10mm" android:layout_marginRight="10mm"
android:text="请选择" android:text="请选择"
android:textColor="#FF41B390"
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout> </RelativeLayout>
...@@ -178,7 +125,6 @@ ...@@ -178,7 +125,6 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="现场情况调查" android:text="现场情况调查"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -187,9 +133,10 @@ ...@@ -187,9 +133,10 @@
android:id="@+id/et_design1" android:id="@+id/et_design1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -200,7 +147,6 @@ ...@@ -200,7 +147,6 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="可行性方案" android:text="可行性方案"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -209,9 +155,11 @@ ...@@ -209,9 +155,11 @@
android:id="@+id/et_design2" android:id="@+id/et_design2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -231,7 +179,7 @@ ...@@ -231,7 +179,7 @@
android:id="@+id/rl_try_pro" android:id="@+id/rl_try_pro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <TextView
...@@ -258,10 +206,6 @@ ...@@ -258,10 +206,6 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -271,7 +215,7 @@ ...@@ -271,7 +215,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="实验过程" android:text="实验过程"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -280,9 +224,11 @@ ...@@ -280,9 +224,11 @@
android:id="@+id/et_try1" android:id="@+id/et_try1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -293,7 +239,7 @@ ...@@ -293,7 +239,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="实验结果" android:text="实验结果"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -302,9 +248,11 @@ ...@@ -302,9 +248,11 @@
android:id="@+id/et_try2" android:id="@+id/et_try2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -314,7 +262,7 @@ ...@@ -314,7 +262,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="改进及建议" android:text="改进及建议"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -323,9 +271,11 @@ ...@@ -323,9 +271,11 @@
android:id="@+id/et_try3" android:id="@+id/et_try3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -344,7 +294,7 @@ ...@@ -344,7 +294,7 @@
android:id="@+id/rl_quality_pro" android:id="@+id/rl_quality_pro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <TextView
...@@ -371,10 +321,6 @@ ...@@ -371,10 +321,6 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -384,7 +330,7 @@ ...@@ -384,7 +330,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="反馈的质量问题" android:text="反馈的质量问题"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -393,9 +339,11 @@ ...@@ -393,9 +339,11 @@
android:id="@+id/et_quality1" android:id="@+id/et_quality1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -406,7 +354,7 @@ ...@@ -406,7 +354,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="现场使用情况" android:text="现场使用情况"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -415,9 +363,11 @@ ...@@ -415,9 +363,11 @@
android:id="@+id/et_quality2" android:id="@+id/et_quality2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -427,7 +377,7 @@ ...@@ -427,7 +377,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="原因分析" android:text="原因分析"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -436,9 +386,11 @@ ...@@ -436,9 +386,11 @@
android:id="@+id/et_quality3" android:id="@+id/et_quality3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -448,7 +400,7 @@ ...@@ -448,7 +400,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="解决方案" android:text="解决方案"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -457,9 +409,11 @@ ...@@ -457,9 +409,11 @@
android:id="@+id/et_quality4" android:id="@+id/et_quality4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -478,7 +432,7 @@ ...@@ -478,7 +432,7 @@
android:id="@+id/rl_tech_pro" android:id="@+id/rl_tech_pro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <TextView
...@@ -505,10 +459,6 @@ ...@@ -505,10 +459,6 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -518,7 +468,7 @@ ...@@ -518,7 +468,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="交流目的" android:text="交流目的"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -527,9 +477,11 @@ ...@@ -527,9 +477,11 @@
android:id="@+id/et_tech1" android:id="@+id/et_tech1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -540,7 +492,7 @@ ...@@ -540,7 +492,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="交流情况" android:text="交流情况"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -549,9 +501,11 @@ ...@@ -549,9 +501,11 @@
android:id="@+id/et_tech2" android:id="@+id/et_tech2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -561,7 +515,7 @@ ...@@ -561,7 +515,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="达成意见" android:text="达成意见"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -570,9 +524,11 @@ ...@@ -570,9 +524,11 @@
android:id="@+id/et_tech3" android:id="@+id/et_tech3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -592,7 +548,7 @@ ...@@ -592,7 +548,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="产品设计" android:text="产品设计"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -601,9 +557,11 @@ ...@@ -601,9 +557,11 @@
android:id="@+id/et_tender1" android:id="@+id/et_tender1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
...@@ -614,7 +572,7 @@ ...@@ -614,7 +572,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="产品报价" android:text="产品报价"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -623,9 +581,11 @@ ...@@ -623,9 +581,11 @@
android:id="@+id/et_tender2" android:id="@+id/et_tender2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
android:minLines="3" android:minLines="3"
......
app/src/main/res/layout/activity_mes_ticket_detail_reviews.xml
浏览文件 @ 9afa8b48
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_detail"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5mm" android:layout_marginLeft="5mm"
...@@ -66,6 +67,7 @@ ...@@ -66,6 +67,7 @@
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/tv_score"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="10mm" android:layout_marginHorizontal="10mm"
...@@ -95,154 +97,548 @@ ...@@ -95,154 +97,548 @@
android:src="@mipmap/arrow_down" /> android:src="@mipmap/arrow_down" />
</RelativeLayout> </RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm"
android:paddingVertical="13mm"
android:text="完成情况"
android:textSize="14sp" />
<TextView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginHorizontal="10mm" android:orientation="vertical"
android:layout_marginTop="3mm" android:paddingHorizontal="10mm">
android:layout_marginBottom="10mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<View style="@style/dividerX" />
<RelativeLayout <TextView
android:id="@+id/rl_client" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:paddingVertical="13mm"
android:paddingHorizontal="10mm" android:text="完成情况"
android:paddingVertical="9mm"> android:textSize="14sp" />
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/tv_finish"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_marginTop="3mm"
android:layout_centerVertical="true" android:layout_marginBottom="10mm"
android:text="资料搜集" android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<View style="@style/dividerX" />
<TextView
android:layout_width="wrap_content" <LinearLayout
android:id="@+id/ll_design"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:orientation="vertical"
android:text="已完成" android:visibility="gone">
android:textColor="#ff41b390"
android:textSize="15sp" /> <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_design_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" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="现场情况调查"
android:textSize="14sp" />
<EditText
android:id="@+id/et_design1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="可行性方案"
android:textSize="14sp" />
<EditText
android:id="@+id/et_design2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_try"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<RelativeLayout
android:id="@+id/rl_try_pro"
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:layout_alignParentLeft="true"
android:layout_centerVertical="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_try_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="实验过程"
android:textSize="14sp" />
<EditText
android:id="@+id/et_try1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="实验结果"
android:textSize="14sp" />
<EditText
android:id="@+id/et_try2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="改进及建议"
android:textSize="14sp" />
<EditText
android:id="@+id/et_try3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_quality"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<RelativeLayout
android:id="@+id/rl_quality_pro"
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:layout_alignParentLeft="true"
android:layout_centerVertical="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_quality_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="反馈的质量问题"
android:textSize="14sp" />
<EditText
android:id="@+id/et_quality1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="现场使用情况"
android:textSize="14sp" />
<EditText
android:id="@+id/et_quality2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="原因分析"
android:textSize="14sp" />
<EditText
android:id="@+id/et_quality3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="解决方案"
android:textSize="14sp" />
<EditText
android:id="@+id/et_quality4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_tech"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<RelativeLayout
android:id="@+id/rl_tech_pro"
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:layout_alignParentLeft="true"
android:layout_centerVertical="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_tech_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="交流目的"
android:textSize="14sp" />
<EditText
android:id="@+id/et_tech1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="交流情况"
android:textSize="14sp" />
<EditText
android:id="@+id/et_tech2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="13mm"
android:text="达成意见"
android:textSize="14sp" />
<EditText
android:id="@+id/et_tech3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_tender"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
</RelativeLayout>
<View style="@style/dividerX" /> <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
<RelativeLayout android:paddingVertical="13mm"
android:id="@+id/rl_company" android:text="产品设计"
android:layout_width="match_parent" android:textSize="14sp" />
android:layout_height="wrap_content"
android:paddingHorizontal="10mm"
android:paddingVertical="9mm">
<TextView <EditText
android:layout_width="wrap_content" android:id="@+id/et_tender1"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_alignParentLeft="true" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="产品图纸确认"
android:textSize="14sp" />
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:clickable="false"
android:enabled="false"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="已完成"
android:textColor="#ff41b390"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" /> <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
<TextView android:paddingVertical="13mm"
android:layout_width="match_parent" android:text="产品报价"
android:layout_height="wrap_content" android:textSize="14sp" />
android:paddingHorizontal="10mm"
android:paddingVertical="13mm"
android:text="现场情况调查"
android:textSize="14sp" />
<TextView <EditText
android:layout_width="match_parent" android:id="@+id/et_tender2"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginHorizontal="10mm" android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:layout_marginBottom="10mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView android:layout_marginTop="3mm"
android:layout_width="match_parent" android:background="@drawable/shape_input_white"
android:layout_height="wrap_content" android:clickable="false"
android:paddingHorizontal="10mm" android:enabled="false"
android:paddingVertical="13mm" android:gravity="top"
android:text="可行性方案" android:hint="请输入"
android:textSize="14sp" /> android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="10mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="10mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:paddingHorizontal="10mm"
android:textSize="14sp" />
<TextView </LinearLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm"
android:paddingVertical="13mm"
android:text="完成情况"
android:textSize="14sp" />
<TextView <androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent" android:id="@+id/rv_img"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginHorizontal="10mm" android:layout_height="wrap_content"
android:layout_marginTop="3mm" android:paddingHorizontal="10mm" />
android:layout_marginBottom="10mm" </LinearLayout>
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="40mm"
android:paddingHorizontal="10mm" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</RelativeLayout> </RelativeLayout>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论