Skip to content

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

1.新增总结展示页面 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token
上级 5de9c736
隐藏空白字符变更
内嵌 并排
正在显示 包含 615 行增加 和 102 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/SummaryBean.java
浏览文件 @ 42886796
...@@ -49,31 +49,31 @@ public class SummaryBean { ...@@ -49,31 +49,31 @@ public class SummaryBean {
private long updateDateTime; private long updateDateTime;
private String jobNo; private String jobNo;
private int jobTypeId; private int jobTypeId;
private Object productDrawingConfirmation; private String productDrawingConfirmation;
private Object siteInvestigation; private String siteInvestigation;
private Object feasibilityReport; private String feasibilityReport;
private String productsCode; private String productsCode;
private String productsName; private String productsName;
private Object experimentProcess; private String experimentProcess;
private Object experimentResult; private String experimentResult;
private Object improveProposal; private String improveProposal;
private String feedbackQualityIssues; private String feedbackQualityIssues;
private String siteUseSituation; private String siteUseSituation;
private String causeAnalysis; private String causeAnalysis;
private String solution; private String solution;
private Object communicativePurposes; private String communicativePurposes;
private Object communicativeSituation; private String communicativeSituation;
private Object reachOpinion; private String reachOpinion;
private Object productDevise; private String productDevise;
private Object productQuotedPrice; private String productQuotedPrice;
private String completionSituation; private String completionSituation;
private int dataCollectionStatus; private int dataCollectionStatus;
private Object attachmentId; private String attachmentId;
private String createUserId; private String createUserId;
private String createUserName; private String createUserName;
private String updateUserId; private String updateUserId;
private Object updateUserName; private String updateUserName;
private Object remark; private String remark;
private boolean delete; private boolean delete;
private List<AttachmentsBean> attachments; private List<AttachmentsBean> attachments;
...@@ -117,27 +117,27 @@ public class SummaryBean { ...@@ -117,27 +117,27 @@ public class SummaryBean {
this.jobTypeId = jobTypeId; this.jobTypeId = jobTypeId;
} }
public Object getProductDrawingConfirmation() { public String getProductDrawingConfirmation() {
return productDrawingConfirmation; return productDrawingConfirmation;
} }
public void setProductDrawingConfirmation(Object productDrawingConfirmation) { public void setProductDrawingConfirmation(String productDrawingConfirmation) {
this.productDrawingConfirmation = productDrawingConfirmation; this.productDrawingConfirmation = productDrawingConfirmation;
} }
public Object getSiteInvestigation() { public String getSiteInvestigation() {
return siteInvestigation; return siteInvestigation;
} }
public void setSiteInvestigation(Object siteInvestigation) { public void setSiteInvestigation(String siteInvestigation) {
this.siteInvestigation = siteInvestigation; this.siteInvestigation = siteInvestigation;
} }
public Object getFeasibilityReport() { public String getFeasibilityReport() {
return feasibilityReport; return feasibilityReport;
} }
public void setFeasibilityReport(Object feasibilityReport) { public void setFeasibilityReport(String feasibilityReport) {
this.feasibilityReport = feasibilityReport; this.feasibilityReport = feasibilityReport;
} }
...@@ -157,27 +157,27 @@ public class SummaryBean { ...@@ -157,27 +157,27 @@ public class SummaryBean {
this.productsName = productsName; this.productsName = productsName;
} }
public Object getExperimentProcess() { public String getExperimentProcess() {
return experimentProcess; return experimentProcess;
} }
public void setExperimentProcess(Object experimentProcess) { public void setExperimentProcess(String experimentProcess) {
this.experimentProcess = experimentProcess; this.experimentProcess = experimentProcess;
} }
public Object getExperimentResult() { public String getExperimentResult() {
return experimentResult; return experimentResult;
} }
public void setExperimentResult(Object experimentResult) { public void setExperimentResult(String experimentResult) {
this.experimentResult = experimentResult; this.experimentResult = experimentResult;
} }
public Object getImproveProposal() { public String getImproveProposal() {
return improveProposal; return improveProposal;
} }
public void setImproveProposal(Object improveProposal) { public void setImproveProposal(String improveProposal) {
this.improveProposal = improveProposal; this.improveProposal = improveProposal;
} }
...@@ -213,43 +213,43 @@ public class SummaryBean { ...@@ -213,43 +213,43 @@ public class SummaryBean {
this.solution = solution; this.solution = solution;
} }
public Object getCommunicativePurposes() { public String getCommunicativePurposes() {
return communicativePurposes; return communicativePurposes;
} }
public void setCommunicativePurposes(Object communicativePurposes) { public void setCommunicativePurposes(String communicativePurposes) {
this.communicativePurposes = communicativePurposes; this.communicativePurposes = communicativePurposes;
} }
public Object getCommunicativeSituation() { public String getCommunicativeSituation() {
return communicativeSituation; return communicativeSituation;
} }
public void setCommunicativeSituation(Object communicativeSituation) { public void setCommunicativeSituation(String communicativeSituation) {
this.communicativeSituation = communicativeSituation; this.communicativeSituation = communicativeSituation;
} }
public Object getReachOpinion() { public String getReachOpinion() {
return reachOpinion; return reachOpinion;
} }
public void setReachOpinion(Object reachOpinion) { public void setReachOpinion(String reachOpinion) {
this.reachOpinion = reachOpinion; this.reachOpinion = reachOpinion;
} }
public Object getProductDevise() { public String getProductDevise() {
return productDevise; return productDevise;
} }
public void setProductDevise(Object productDevise) { public void setProductDevise(String productDevise) {
this.productDevise = productDevise; this.productDevise = productDevise;
} }
public Object getProductQuotedPrice() { public String getProductQuotedPrice() {
return productQuotedPrice; return productQuotedPrice;
} }
public void setProductQuotedPrice(Object productQuotedPrice) { public void setProductQuotedPrice(String productQuotedPrice) {
this.productQuotedPrice = productQuotedPrice; this.productQuotedPrice = productQuotedPrice;
} }
...@@ -269,11 +269,11 @@ public class SummaryBean { ...@@ -269,11 +269,11 @@ public class SummaryBean {
this.dataCollectionStatus = dataCollectionStatus; this.dataCollectionStatus = dataCollectionStatus;
} }
public Object getAttachmentId() { public String getAttachmentId() {
return attachmentId; return attachmentId;
} }
public void setAttachmentId(Object attachmentId) { public void setAttachmentId(String attachmentId) {
this.attachmentId = attachmentId; this.attachmentId = attachmentId;
} }
...@@ -301,19 +301,19 @@ public class SummaryBean { ...@@ -301,19 +301,19 @@ public class SummaryBean {
this.updateUserId = updateUserId; this.updateUserId = updateUserId;
} }
public Object getUpdateUserName() { public String getUpdateUserName() {
return updateUserName; return updateUserName;
} }
public void setUpdateUserName(Object updateUserName) { public void setUpdateUserName(String updateUserName) {
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;
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java
浏览文件 @ 42886796
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.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout;
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.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.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.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.Map; import java.util.Map;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
...@@ -29,16 +34,79 @@ import io.reactivex.disposables.Disposable; ...@@ -29,16 +34,79 @@ import io.reactivex.disposables.Disposable;
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class MesTicketAddSummaryActivity extends WorkToolBarActivity { public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
@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.et_client)
EditText etClient;
@BindView(R.id.rv_photo)
RecyclerView rvPhoto;
@BindView(R.id.rv_annx)
RecyclerView rvAnnx;
private Map<String, Object> param; private Map<String, Object> param;
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);
changVisibility(data.getJobTypeId());
} }
@Override @Override
protected void initData() { protected void initData() {
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
param.put("jobNo", getIntent().getStringExtra("id")); param.put("jobNo", data.getJobNo());
} }
private void submit() { private void submit() {
...@@ -90,4 +158,18 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity { ...@@ -90,4 +158,18 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
private void changVisibility(String jobTypeId) {
if (TextUtils.equals(jobTypeId, "01")) {
llDesign.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(jobTypeId, "02")) {
llTry.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(jobTypeId, "03")) {
llQuality.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(jobTypeId, "04")) {
llTech.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(jobTypeId, "05")) {
llTender.setVisibility(View.VISIBLE);
}
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailActivity.java
浏览文件 @ 42886796
...@@ -100,7 +100,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -100,7 +100,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
btnReceive.setVisibility(View.VISIBLE); btnReceive.setVisibility(View.VISIBLE);
} }
if (data.getJobStatus() == 2) { if (data.getJobStatus() == 2) {
btnReceive.setVisibility(View.VISIBLE); btnSubmit.setVisibility(View.VISIBLE);
rlLog.setVisibility(View.GONE); rlLog.setVisibility(View.GONE);
rlAddLog.setVisibility(View.VISIBLE); rlAddLog.setVisibility(View.VISIBLE);
} }
...@@ -108,6 +108,8 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -108,6 +108,8 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
rlAddLog.setVisibility(View.GONE); rlAddLog.setVisibility(View.GONE);
} }
rlAddLog.setVisibility(View.VISIBLE); rlAddLog.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.VISIBLE);
btnSubmit.setVisibility(View.VISIBLE);
tvCode.setText(data.getJobNo()); tvCode.setText(data.getJobNo());
tvClient.setText(data.getCustomerUserName()); tvClient.setText(data.getCustomerUserName());
tvCompany.setText(data.getSalesCompanyName()); tvCompany.setText(data.getSalesCompanyName());
...@@ -211,7 +213,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -211,7 +213,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
receive(); receive();
break; break;
case R.id.btn_submit: case R.id.btn_submit:
startActivity(MesTicketAddSummaryActivity.class, "id", data.getJobNo()); startActivity(MesTicketAddSummaryActivity.class, "data", JSON.toJSONString(data));
break; break;
case R.id.rl_log: case R.id.rl_log:
startActivity(MesTicketLogActivity.class, "id", data.getJobNo()); startActivity(MesTicketLogActivity.class, "id", data.getJobNo());
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java
浏览文件 @ 42886796
...@@ -178,10 +178,10 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity { ...@@ -178,10 +178,10 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
startActivity(MesTicketDetailActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position))); startActivity(MesTicketDetailActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
break; break;
case 3: case 3:
startActivity(MesTicketDetailReviewActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position))); startActivity(MesTicketDetailFinishActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
break; break;
case 4: case 4:
startActivity(MesTicketDetailReviewActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position))); startActivity(MesTicketDetailFinishActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
break; break;
} }
} }
......
app/src/main/res/layout/activity_mes_ticket_detail.xml
浏览文件 @ 42886796
...@@ -19,22 +19,21 @@ ...@@ -19,22 +19,21 @@
android:id="@+id/btn_receive" android:id="@+id/btn_receive"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="20mm"
android:background="@drawable/shape_blue_circle" android:background="@drawable/shape_blue_circle"
android:paddingHorizontal="40mm" android:paddingHorizontal="40mm"
android:text="接收" android:text="接收"
android:visibility="gone" android:textColor="@color/white"
android:textColor="@color/white" /> android:visibility="gone" />
<Button <Button
android:id="@+id/btn_submit" android:id="@+id/btn_submit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:background="@drawable/shape_blue_circle" android:background="@drawable/shape_blue_circle"
android:paddingHorizontal="40mm" android:paddingHorizontal="40mm"
android:text="提交工单总结" android:text="提交工单总结"
android:textColor="@color/white" /> android:textColor="@color/white"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
...@@ -47,7 +46,7 @@ ...@@ -47,7 +46,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <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:paddingHorizontal="20mm"
...@@ -56,6 +55,7 @@ ...@@ -56,6 +55,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="任务单号" android:text="任务单号"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -63,9 +63,10 @@ ...@@ -63,9 +63,10 @@
android:id="@+id/tv_code" android:id="@+id/tv_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10mm" android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -168,9 +169,10 @@ ...@@ -168,9 +169,10 @@
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="right"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
...@@ -183,7 +185,7 @@ ...@@ -183,7 +185,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_clazz" android:id="@+id/rv_clazz"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:layout_marginRight="3mm" /> android:layout_marginRight="3mm" />
......
app/src/main/res/layout/activity_mes_ticket_summary_add.xml
浏览文件 @ 42886796
...@@ -10,74 +10,498 @@ ...@@ -10,74 +10,498 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <LinearLayout
android:id="@+id/ll_design"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:orientation="vertical"
android:paddingVertical="9mm"> android:visibility="gone">
<RelativeLayout
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_design_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" />
<TextView <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="现场情况调查"
android:textSize="14sp" />
android:layout_width="wrap_content" <EditText
android:id="@+id/et_design1"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="产品图纸确认" android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_code" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:paddingHorizontal="20mm"
android:layout_marginRight="10mm" android:paddingVertical="13mm"
android:text="1111" android:text="可行性方案"
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" /> <EditText
android:id="@+id/et_design2"
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:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView </LinearLayout>
<LinearLayout
android:id="@+id/ll_try"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:orientation="vertical"
android:paddingVertical="13mm" android:visibility="gone">
android:text="现场情况调查"
android:textSize="14sp" />
<EditText <RelativeLayout
android:id="@+id/et_content" android:id="@+id/rl_try_pro"
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: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" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm" android:orientation="vertical"
android:layout_marginTop="3mm" android:visibility="gone">
android:background="@drawable/shape_input_white"
android:gravity="top" <RelativeLayout
android:hint="请输入" android:id="@+id/rl_quality_pro"
android:minLines="3" android:layout_width="match_parent"
android:padding="5mm" android:layout_height="wrap_content"
android:textSize="14sp" /> android:paddingHorizontal="20mm"
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 <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" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:orientation="vertical"
android:paddingVertical="13mm" android:visibility="gone">
android:text="可行性方案"
android:textSize="14sp" />
<EditText <RelativeLayout
android:id="@+id/et_question_desc" android:id="@+id/rl_tech_pro"
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: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" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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:paddingHorizontal="20mm"
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_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm" android:orientation="vertical"
android:layout_marginTop="3mm" android:visibility="gone">
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入" <TextView
android:minLines="3" android:layout_width="match_parent"
android:padding="5mm" android:layout_height="wrap_content"
android:textSize="14sp" /> android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="产品设计"
android:textSize="14sp" />
<EditText
android:id="@+id/et_tender1"
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:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="产品报价"
android:textSize="14sp" />
<EditText
android:id="@+id/et_tender2"
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:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -108,7 +532,8 @@ ...@@ -108,7 +532,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm"
android:visibility="gone">
<TextView <TextView
...@@ -137,6 +562,7 @@ ...@@ -137,6 +562,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_photo"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
...@@ -159,6 +585,7 @@ ...@@ -159,6 +585,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_annx"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论