提交 db27760e authored 作者: lgd's avatar lgd

1.修改唛头测试

2.TODO 供应订单三个功能测试,
上级 1366e630
...@@ -137,8 +137,8 @@ public class OrderMarkActivity extends WorkToolBarActivity { ...@@ -137,8 +137,8 @@ public class OrderMarkActivity extends WorkToolBarActivity {
etSuppliesCode.setText(markBean.getMaterialCodeOther()); etSuppliesCode.setText(markBean.getMaterialCodeOther());
etContract.setText(markBean.getForeignTradeContractNumber()); etContract.setText(markBean.getForeignTradeContractNumber());
etCountryCompany.setText(markBean.getDomesticShipCompany()); etCountryCompany.setText(markBean.getDomesticShipCompany());
etAppName.setText(markBean.getReceiveCompany()); etAppName.setText(markBean.getProjectName());
etUse.setText(markBean.getProductName()); etUse.setText(markBean.getUseLocation());
} }
@Override @Override
......
...@@ -141,8 +141,8 @@ public class ChooseHeadActivity extends WorkToolBarActivity { ...@@ -141,8 +141,8 @@ public class ChooseHeadActivity extends WorkToolBarActivity {
etSuppliesCode.setText(markBean.getMaterialCodeOther()); etSuppliesCode.setText(markBean.getMaterialCodeOther());
etContract.setText(markBean.getForeignTradeContractNumber()); etContract.setText(markBean.getForeignTradeContractNumber());
etCountryCompany.setText(markBean.getDomesticShipCompany()); etCountryCompany.setText(markBean.getDomesticShipCompany());
etAppName.setText(markBean.getReceiveCompany()); etAppName.setText(markBean.getProjectName());
etUse.setText(markBean.getProductName()); etUse.setText(markBean.getUseLocation());
} }
@Override @Override
...@@ -193,8 +193,8 @@ public class ChooseHeadActivity extends WorkToolBarActivity { ...@@ -193,8 +193,8 @@ public class ChooseHeadActivity extends WorkToolBarActivity {
markBean.setMaterialCodeOther(etSuppliesCode.getText().toString()); markBean.setMaterialCodeOther(etSuppliesCode.getText().toString());
markBean.setForeignTradeContractNumber(etContract.getText().toString()); markBean.setForeignTradeContractNumber(etContract.getText().toString());
markBean.setDomesticShipCompany(etCountryCompany.getText().toString()); markBean.setDomesticShipCompany(etCountryCompany.getText().toString());
markBean.setReceiveCompany(etAppName.getText().toString()); markBean.setProjectName(etAppName.getText().toString());
markBean.setProductName(etUse.getText().toString()); markBean.setUseLocation(etUse.getText().toString());
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra("mark", JSON.toJSONString(markBean)); intent.putExtra("mark", JSON.toJSONString(markBean));
......
...@@ -247,28 +247,26 @@ ...@@ -247,28 +247,26 @@
android:textColor="@color/flexible_text_gray" /> android:textColor="@color/flexible_text_gray" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:id="@+id/ll_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="10mm"
android:visibility="gone">
<TextView <TextView
android:id="@+id/tv_mark" android:id="@+id/tv_mark"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:visibility="gone"
android:layout_marginRight="10mm" android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn" android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm" android:paddingHorizontal="10mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:layout_gravity="right"
android:layout_marginTop="10mm"
android:visibility="gone"
android:text="唛头" android:text="唛头"
android:textColor="@color/white" /> android:textColor="@color/white" />
<LinearLayout
android:id="@+id/ll_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="10mm"
android:visibility="gone">
<FrameLayout <FrameLayout
android:id="@+id/fl_back" android:id="@+id/fl_back"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论