Skip to content

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

1.外采购入库方式修改 

2.TODO 三个功能测试，下单新增唛头測試
上级 f6a8503f
显示空白字符变更
内嵌 并排
正在显示 包含 151 行增加 和 1 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 1366e630
......@@ -145,6 +145,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
private RecyclerView rvFlowSheet;
private List<OrderDetail.OrderFlowsBean> flowSheetList;
private OrderProcessAdapter flowSheetAdapter;
private int enterStockType;
@Override
protected void initView() {
......@@ -164,6 +165,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
settingDialog.addItems(settingList, (dialog, which) -> {
tvSet.setText(settingList[which]);
setting(++which);
enterStockType = ++which;
dialog.dismiss();
});
View viewData = LayoutInflater.from(this).inflate(R.layout.view_rv, null);
......@@ -579,11 +581,15 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
private void checkReceiveDialog(int status, String id) {
QMUIDialog.MenuDialogBuilder menuDialogBuilder = DialogUtils.listDialog(this);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
View view = LayoutInflater.from(this).inflate(R.layout.view_out_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
TextView tvSet = view.findViewById(R.id.tv_set);
RelativeLayout rlSet = view.findViewById(R.id.rl_set);
tvDesc.setText(status == 1 ? "统一接单" : "拒绝接单");
rlSet.setVisibility(status == 1 ? View.VISIBLE : View.GONE);
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
......@@ -593,6 +599,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (enterStockType == 0 && status == 1) {
toast("请选择入库方式");
return;
}
if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注");
return;
......@@ -607,12 +617,26 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
addCartDialog.dismiss();
}
});
rlSet.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
menuDialogBuilder.show();
}
});
menuDialogBuilder.addItems(settingList, (dialog, which) -> {
tvSet.setText(settingList[which]);
enterStockType = ++which;
dialog.dismiss();
});
addCartDialog.show();
}
private void checkReceive(int status, String remark, String id) {
Map<String, Object> param = WorkUtils.simpleParam();
if (status == 1) {
param.put("enterStockType", enterStockType);
}
param.put("result", status);
param.put("comment", remark);
param.put("id", id);
......
app/src/main/res/layout/view_out_check.xml 0 → 100644
浏览文件 @ 1366e630
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#d1f8f8f8"
android:orientation="vertical">
<TextView
android:id="@+id/tv_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20mm"
android:gravity="center"
android:text="修改内部价格"
android:textSize="17sp"
android:textStyle="bold" />
<RelativeLayout
android:id="@+id/rl_set"
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_set"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:hint="请选择入库方式"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:id="@+id/iv_setting"
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="10mm"
android:background="@drawable/shape_confirm_order"
android:orientation="vertical">
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@null"
android:gravity="top"
android:hint="请输入原因"
android:minLines="4"
android:padding="5mm"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="4mm"
android:text="0/140"
android:textColor="@color/flexible_text_gray" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30mm"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:paddingVertical="15mm"
android:text="取消"
android:textColor="#007AFF"
android:textSize="17sp" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="#D8DCE6" />
<TextView
android:id="@+id/tv_ok"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:paddingVertical="15mm"
android:text="确定"
android:textColor="#007AFF"
android:textSize="17sp" />
</LinearLayout>
</LinearLayout>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论