提交 874b4b51 authored 作者: lgd's avatar lgd

1.修改供应商选择方式

2.修改时间为不可输入小数
上级 e416aa0a
...@@ -143,12 +143,16 @@ public class MesSpeedAddActivity extends WorkToolBarActivity { ...@@ -143,12 +143,16 @@ public class MesSpeedAddActivity extends WorkToolBarActivity {
MachineDetailBean.SpeedsBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu(); MachineDetailBean.SpeedsBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) { if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.SpeedsBean.MouldFluBean(); mouldFlu = new MachineDetailBean.SpeedsBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu); machineDetailBean.setMouldFlu(mouldFlu);
} }
mouldFlu.setMouldFluxesName(tvProtection1.getText().toString()); mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
mouldFlu.setAcidAlkaliDegreeFlu(tvProtection2.getText().toString()); mouldFlu.setAcidAlkaliDegreeFlu(tvProtection2.getText().toString());
mouldFlu.setChemicalCompositionFlu(tvProtection3.getText().toString()); mouldFlu.setChemicalCompositionFlu(tvProtection3.getText().toString());
covAgent.setSupplierNameCov(tvCover4.getText().toString());
mouldFlu.setSupplierNameFlu(tvProtection4.getText().toString());
if (TextUtils.equals(from, "1")) { if (TextUtils.equals(from, "1")) {
EventBus.getDefault().post(new AddMachineAddChildEvent(7, JSON.toJSONString(machineDetailBean))); EventBus.getDefault().post(new AddMachineAddChildEvent(7, JSON.toJSONString(machineDetailBean)));
finish(); finish();
...@@ -215,17 +219,17 @@ public class MesSpeedAddActivity extends WorkToolBarActivity { ...@@ -215,17 +219,17 @@ public class MesSpeedAddActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.rl_cover4, R.id.rl_protection4}) // @OnClick({R.id.rl_cover4, R.id.rl_protection4})
public void onViewClicked(View view) { // public void onViewClicked(View view) {
switch (view.getId()) { // switch (view.getId()) {
case R.id.rl_cover4: // case R.id.rl_cover4:
startActivityForResult(MesChooseClientActivity.class, // startActivityForResult(MesChooseClientActivity.class,
10001, "from", "1"); // 10001, "from", "1");
break; // break;
case R.id.rl_protection4: // case R.id.rl_protection4:
startActivityForResult(MesChooseClientActivity.class, // startActivityForResult(MesChooseClientActivity.class,
10002, "from", "1"); // 10002, "from", "1");
break; // break;
} // }
} // }
} }
...@@ -36,7 +36,6 @@ public class UserDataAdd3RefAdapter extends BaseQuickAdapter<FactoryDetailBean.S ...@@ -36,7 +36,6 @@ public class UserDataAdd3RefAdapter extends BaseQuickAdapter<FactoryDetailBean.S
} }
} }
}); });
helper.setText(R.id.tv_name, "精炼炉"); helper.setText(R.id.tv_name, "精炼炉");
helper.setText(R.id.tv_content1, item.getModelNumber()); helper.setText(R.id.tv_content1, item.getModelNumber());
helper.setText(R.id.tv_content2, item.getTablesNumber()); helper.setText(R.id.tv_content2, item.getTablesNumber());
......
...@@ -746,7 +746,7 @@ ...@@ -746,7 +746,7 @@
android:id="@+id/tv_middle8" android:id="@+id/tv_middle8"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="numberDecimal" android:inputType="number"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:background="@null" android:background="@null"
......
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:inputType="numberDecimal" android:inputType="number"
android:background="@null" android:background="@null"
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout> </RelativeLayout>
......
...@@ -190,7 +190,8 @@ ...@@ -190,7 +190,8 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView android:hint="请输入" <EditText
android:hint="请输入"
android:id="@+id/tv_cover4" android:id="@+id/tv_cover4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -332,7 +333,7 @@ ...@@ -332,7 +333,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView android:hint="请输入" <EditText android:hint="请输入"
android:id="@+id/tv_protection4" android:id="@+id/tv_protection4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/white" android:background="@android:color/white"
android:visibility="gone"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
...@@ -78,6 +77,7 @@ ...@@ -78,6 +77,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:visibility="gone"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" /> android:src="@mipmap/mes_arrow_down" />
</RelativeLayout> </RelativeLayout>
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
android:id="@+id/tv_content3" android:id="@+id/tv_content3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="numberDecimal" android:inputType="number"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:textSize="14sp" /> android:textSize="14sp" />
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:background="@null" android:background="@null"
android:hint="请输入" android:hint="请输入"
android:inputType="numberDecimal" android:inputType="number"
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论