Skip to content

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

1.详情页面修改完成

上级 d2b3199c
隐藏空白字符变更
内嵌 并排
正在显示 包含 437 行增加 和 216 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ d40f99b3
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -112,6 +112,10 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -112,6 +112,10 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
TextView tvClaim6; TextView tvClaim6;
@BindView(R.id.ll_see_more) @BindView(R.id.ll_see_more)
LinearLayout llSeeMore; LinearLayout llSeeMore;
@BindView(R.id.view_send_apply)
View viewSendApply;
@BindView(R.id.fl_send_apply)
FrameLayout flSendApply;
private OrderDetail dataBean; private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList; private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter; private OrderProcessAdapter flowAdapter;
...@@ -173,23 +177,23 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -173,23 +177,23 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
case 300: case 300:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
break; break;
case 410: case 410:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
break; break;
case 420: case 420:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
break; break;
case 500: case 500:
if (TextUtils.equals(type, "1")) {//1坩埚生产 2 坩埚销售 if (TextUtils.equals(type, "1")) {//1坩埚生产 2 坩埚销售
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
} else { } else {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
...@@ -215,7 +219,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -215,7 +219,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
flowAdapter.bindToRecyclerView(rvProcess); flowAdapter.bindToRecyclerView(rvProcess);
flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess); flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
proList = new ArrayList<>(); proList = new ArrayList<>();
proAdapter = new CruibleOrderDetailProductAdapter(R.layout.item_order_product, proList, status == null ? 0 : status); proAdapter = new CruibleOrderDetailProductAdapter(R.layout.item_order_product, proList, status == null ? 0 : status);
proAdapter.bindToRecyclerView(rvPro); proAdapter.bindToRecyclerView(rvPro);
proAdapter.setEmptyView(R.layout.view_empty_order, rvPro); proAdapter.setEmptyView(R.layout.view_empty_order, rvPro);
} }
...@@ -254,7 +258,8 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -254,7 +258,8 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
if (dataBean.getOrderFlows().size() <= 3) { if (dataBean.getOrderFlows().size() <= 3) {
llSeeMore.setVisibility(View.GONE); llSeeMore.setVisibility(View.GONE);
flowList.addAll(dataBean.getOrderFlows()); flowList.addAll(dataBean.getOrderFlows());
} else { flowList.addAll(dataBean.getOrderFlows().subList(0, 3)); } else {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
} }
flowAdapter.notifyDataSetChanged(); flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems()); proList.addAll(dataBean.getOrderItems());
...@@ -299,7 +304,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -299,7 +304,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
startActivity(UseApplyActivity.class, startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(), "orderType", dataBean.getExpandInfo().getOrderType(),
"customerId", dataBean.getCustomerId()+"", "customerId", dataBean.getCustomerId() + "",
"num", proList.get(position).getCanUseProductSum() + "", "num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -563,11 +568,4 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -563,11 +568,4 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ d40f99b3
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -12,7 +12,6 @@ import android.widget.TextView; ...@@ -12,7 +12,6 @@ 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.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
...@@ -101,6 +100,14 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -101,6 +100,14 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
TextView tvClaim6; TextView tvClaim6;
@BindView(R.id.ll_see_more) @BindView(R.id.ll_see_more)
LinearLayout llSeeMore; LinearLayout llSeeMore;
@BindView(R.id.view_finish_apply)
View viewFinishApply;
@BindView(R.id.fl_finish_apply)
FrameLayout flFinishApply;
@BindView(R.id.view_send_apply)
View viewSendApply;
@BindView(R.id.fl_send_apply)
FrameLayout flSendApply;
private OrderDetail dataBean; private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList; private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter; private OrderProcessAdapter flowAdapter;
...@@ -112,6 +119,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -112,6 +119,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
private RecyclerView rvFlowSheet; private RecyclerView rvFlowSheet;
private List<OrderDetail.OrderFlowsBean> flowSheetList; private List<OrderDetail.OrderFlowsBean> flowSheetList;
private OrderProcessAdapter flowSheetAdapter; private OrderProcessAdapter flowSheetAdapter;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -174,7 +182,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -174,7 +182,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
flowAdapter.bindToRecyclerView(rvProcess); flowAdapter.bindToRecyclerView(rvProcess);
flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess); flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
proList = new ArrayList<>(); proList = new ArrayList<>();
proAdapter = new InsideOrderDetailProductAdapter(R.layout.item_order_product, proList, status == null ? 0 : status); proAdapter = new InsideOrderDetailProductAdapter(R.layout.item_order_product, proList, status == null ? 0 : status);
proAdapter.bindToRecyclerView(rvPro); proAdapter.bindToRecyclerView(rvPro);
proAdapter.setEmptyView(R.layout.view_empty_order, rvPro); proAdapter.setEmptyView(R.layout.view_empty_order, rvPro);
} }
...@@ -204,10 +212,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -204,10 +212,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
changeView(); changeView();
flowSheetList.addAll(dataBean.getOrderFlows()); flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged(); flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size()<=3){ if (dataBean.getOrderFlows().size() <= 3) {
llSeeMore.setVisibility(View.GONE); llSeeMore.setVisibility(View.GONE);
flowList.addAll(dataBean.getOrderFlows()); flowList.addAll(dataBean.getOrderFlows());
}else { } else {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3)); flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
} }
flowAdapter.notifyDataSetChanged(); flowAdapter.notifyDataSetChanged();
...@@ -224,7 +232,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -224,7 +232,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
tvSendTime.setText(dataBean.getRequireTime()); tvSendTime.setText(dataBean.getRequireTime());
tvDesc.setText(dataBean.getAttrName()); tvDesc.setText(dataBean.getAttrName());
tvOrderDesc.setText(dataBean.getAttrName()); tvOrderDesc.setText(dataBean.getAttrName());
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3)); tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo(); OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
...@@ -252,7 +260,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -252,7 +260,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
startActivity(UseApplyActivity.class, startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(), "orderType", dataBean.getExpandInfo().getOrderType(),
"customerId", dataBean.getCustomerId()+"", "customerId", dataBean.getCustomerId() + "",
"num", proList.get(position).getCanUseProductSum() + "", "num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -321,7 +329,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -321,7 +329,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.ll_see_more,R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree}) @OnClick({R.id.ll_see_more, R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.ll_see_more: case R.id.ll_see_more:
...@@ -489,5 +497,4 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -489,5 +497,4 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ d40f99b3
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
...@@ -121,6 +121,14 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -121,6 +121,14 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
RelativeLayout rlSet; RelativeLayout rlSet;
@BindView(R.id.ll_see_more) @BindView(R.id.ll_see_more)
LinearLayout llSeeMore; LinearLayout llSeeMore;
@BindView(R.id.view_finish_apply)
View viewFinishApply;
@BindView(R.id.fl_finish_apply)
FrameLayout flFinishApply;
@BindView(R.id.view_send_apply)
View viewSendApply;
@BindView(R.id.fl_send_apply)
FrameLayout flSendApply;
private OrderDetail dataBean; private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList; private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter; private OrderProcessAdapter flowAdapter;
...@@ -207,10 +215,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -207,10 +215,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
flowList.clear(); flowList.clear();
flowSheetList.addAll(dataBean.getOrderFlows()); flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged(); flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size()<=3){ if (dataBean.getOrderFlows().size() <= 3) {
llSeeMore.setVisibility(View.GONE); llSeeMore.setVisibility(View.GONE);
flowList.addAll(dataBean.getOrderFlows()); flowList.addAll(dataBean.getOrderFlows());
}else { } else {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3)); flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
} }
flowAdapter.notifyDataSetChanged(); flowAdapter.notifyDataSetChanged();
...@@ -229,7 +237,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -229,7 +237,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
tvTime.setText(dataBean.getCreatedTime()); tvTime.setText(dataBean.getCreatedTime());
tvSendTime.setText(dataBean.getRequireTime()); tvSendTime.setText(dataBean.getRequireTime());
tvOrderDesc.setText(dataBean.getAttrName()); tvOrderDesc.setText(dataBean.getAttrName());
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3)); tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
tvSupplier.setText(dataBean.getSupplierName()); tvSupplier.setText(dataBean.getSupplierName());
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo(); OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
tvClaim1.setText(expandInfo.getDemond4()); tvClaim1.setText(expandInfo.getDemond4());
...@@ -268,19 +276,19 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -268,19 +276,19 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
case 300: case 300:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
rlSet.setVisibility(View.VISIBLE); rlSet.setVisibility(View.VISIBLE);
break; break;
case 410: case 410:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
rlSet.setVisibility(View.VISIBLE); rlSet.setVisibility(View.VISIBLE);
break; break;
case 420: case 420:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
rlSet.setVisibility(View.VISIBLE); rlSet.setVisibility(View.VISIBLE);
break; break;
case 500: case 500:
...@@ -296,7 +304,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -296,7 +304,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
default: default:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
rlSet.setVisibility(View.VISIBLE); rlSet.setVisibility(View.VISIBLE);
break; break;
} }
...@@ -312,7 +320,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -312,7 +320,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
startActivity(UseApplyActivity.class, startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(), "orderType", dataBean.getExpandInfo().getOrderType(),
"customerId", dataBean.getCustomerId()+"", "customerId", dataBean.getCustomerId() + "",
"num", proList.get(position).getCanUseProductSum() + "", "num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -609,6 +617,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -609,6 +617,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
...@@ -625,4 +634,5 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -625,4 +634,5 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
public void refresh(CheckSendEvent event) { public void refresh(CheckSendEvent event) {
getData(); getData();
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ d40f99b3
...@@ -5,6 +5,7 @@ import android.text.TextUtils; ...@@ -5,6 +5,7 @@ import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -20,10 +21,8 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -20,10 +21,8 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.bean.event.CheckSendEvent; import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.event.ModifyCarEvent;
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.activity.bat.store.StoreTradingCarActivity;
import com.wd.workoffice.ui.adapter.OrderDetailProductAdapter; import com.wd.workoffice.ui.adapter.OrderDetailProductAdapter;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter; import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.util.DialogUtils; import com.wd.workoffice.util.DialogUtils;
...@@ -111,6 +110,14 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -111,6 +110,14 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
RelativeLayout rlDep; RelativeLayout rlDep;
@BindView(R.id.ll_see_more) @BindView(R.id.ll_see_more)
LinearLayout llSeeMore; LinearLayout llSeeMore;
@BindView(R.id.view_finish_apply)
View viewFinishApply;
@BindView(R.id.fl_finish_apply)
FrameLayout flFinishApply;
@BindView(R.id.view_send_apply)
View viewSendApply;
@BindView(R.id.fl_send_apply)
FrameLayout flSendApply;
private OrderDetail dataBean; private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList; private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter; private OrderProcessAdapter flowAdapter;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ d40f99b3
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -109,6 +109,14 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity { ...@@ -109,6 +109,14 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
TextView tvClaim6; TextView tvClaim6;
@BindView(R.id.ll_see_more) @BindView(R.id.ll_see_more)
LinearLayout llSeeMore; LinearLayout llSeeMore;
@BindView(R.id.view_finish_apply)
View viewFinishApply;
@BindView(R.id.fl_finish_apply)
FrameLayout flFinishApply;
@BindView(R.id.view_send_apply)
View viewSendApply;
@BindView(R.id.fl_send_apply)
FrameLayout flSendApply;
private OrderDetail dataBean; private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList; private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter; private OrderProcessAdapter flowAdapter;
...@@ -176,7 +184,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity { ...@@ -176,7 +184,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
default: default:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE); llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE); flSendApply.setVisibility(View.GONE);
break; break;
} }
} }
...@@ -267,7 +275,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity { ...@@ -267,7 +275,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
startActivity(UseApplyActivity.class, startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(), "orderType", dataBean.getExpandInfo().getOrderType(),
"customerId", dataBean.getCustomerId()+"", "customerId", dataBean.getCustomerId() + "",
"num", proList.get(position).getCanUseProductSum() + "", "num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -336,7 +344,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity { ...@@ -336,7 +344,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.ll_see_more,R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree}) @OnClick({R.id.ll_see_more, R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.ll_see_more: case R.id.ll_see_more:
......
app/src/main/java/com/wd/workoffice/ui/adapter/CruibleOrderDetailProductAdapter.java
浏览文件 @ d40f99b3
...@@ -55,33 +55,33 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -55,33 +55,33 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
break; break;
case 300: case 300:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_add, true); helper.setGone(R.id.fl_add, true);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
break; break;
case 410: case 410:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.fl_add, false);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
break; break;
case 500: case 500:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_add, true); helper.setGone(R.id.fl_add, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
break; break;
case 600: case 600:
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.CO_ENTER_PAGE.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.CO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.fl_add, false);
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/InsideOrderDetailProductAdapter.java
浏览文件 @ d40f99b3
...@@ -41,7 +41,7 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai ...@@ -41,7 +41,7 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai
helper.addOnClickListener(R.id.tv_flow); helper.addOnClickListener(R.id.tv_flow);
helper.addOnClickListener(R.id.tv_add); helper.addOnClickListener(R.id.tv_add);
helper.addOnClickListener(R.id.tv_quality); helper.addOnClickListener(R.id.tv_quality);
helper.setGone(R.id.tv_quality, true); helper.setGone(R.id.fl_quality, true);
switch (status) { switch (status) {
// "待审核", "待接单", "待生产", "已入库","已交付"}; // "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"}; // "100", "200", "710", "500","600"};
...@@ -51,37 +51,37 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai ...@@ -51,37 +51,37 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai
break; break;
case 300: case 300:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
break; break;
case 410: case 410:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
break; break;
case 420: case 420:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
break; break;
case 500: case 500:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
break; break;
case 600: case 600:
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.IO_ENTER_PAGE.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.IO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.fl_add, false);
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
浏览文件 @ d40f99b3
...@@ -89,14 +89,14 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -89,14 +89,14 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.tv_add, false);
} }
if (WorkUtils.hasPermission(PagePermissionType.SO_RETURN_APPLY_LIST.getPermission())) { if (WorkUtils.hasPermission(PagePermissionType.SO_RETURN_APPLY_LIST.getPermission())) {
helper.setGone(R.id.tv_return, true); helper.setGone(R.id.fl_return, true);
} else { } else {
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
} }
if (WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_LIST.getPermission())) { if (WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_LIST.getPermission())) {
helper.setGone(R.id.tv_get, true); helper.setGone(R.id.fl_get, true);
} else { } else {
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java
浏览文件 @ d40f99b3
...@@ -53,37 +53,37 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O ...@@ -53,37 +53,37 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
break; break;
case 300: case 300:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
break; break;
case 410: case 410:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
break; break;
case 420: case 420:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
if (attr==400){ if (attr==400){
helper.setGone(R.id.ll_btn, false); helper.setGone(R.id.ll_btn, false);
} }
break; break;
case 500: case 500:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
break; break;
case 600: case 600:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.fl_add, false);
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.PO_RETURN_APPLY_LIST.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.PO_RETURN_APPLY_LIST.getPermission())) {
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
} }
if (!WorkUtils.hasPermission(PagePermissionType.PO_ENTER_PAGE.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.PO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.fl_add, false);
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/ProductOrderDetailProductAdapter.java
浏览文件 @ d40f99b3
...@@ -44,14 +44,14 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -44,14 +44,14 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
helper.addOnClickListener(R.id.tv_add); helper.addOnClickListener(R.id.tv_add);
helper.addOnClickListener(R.id.tv_quality); helper.addOnClickListener(R.id.tv_quality);
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.fl_add, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
if (WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_LIST.getPermission())) { if (WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_LIST.getPermission())) {
helper.setGone(R.id.tv_get, true); helper.setGone(R.id.fl_get, true);
} else { } else {
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/SupplierOrderDetailProductAdapter.java
浏览文件 @ d40f99b3
...@@ -41,7 +41,7 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet ...@@ -41,7 +41,7 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
helper.addOnClickListener(R.id.tv_flow); helper.addOnClickListener(R.id.tv_flow);
helper.addOnClickListener(R.id.tv_add); helper.addOnClickListener(R.id.tv_add);
helper.addOnClickListener(R.id.tv_quality); helper.addOnClickListener(R.id.tv_quality);
helper.setGone(R.id.tv_quality, true); helper.setGone(R.id.fl_quality, true);
switch (status) { switch (status) {
// "待审核", "待接单", "待生产", "已入库","已交付"}; // "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"}; // "100", "200", "710", "500","600"};
...@@ -56,29 +56,29 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet ...@@ -56,29 +56,29 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
break; break;
case 300: case 300:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
break; break;
case 400: case 400:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
break; break;
case 500: case 500:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.fl_return, false);
break; break;
case 600: case 600:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.fl_get, false);
break; break;
} }
if (!WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_PAGE.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_PAGE.getPermission())) {
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.fl_quality, false);
} }
if (!WorkUtils.hasPermission(PagePermissionType.FO_ENTER_PAGE.getPermission())) { if (!WorkUtils.hasPermission(PagePermissionType.FO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.tv_add, false); helper.setGone(R.id.fl_add, false);
} }
} }
} }
......
app/src/main/res/layout/activity_crucible_order.xml
浏览文件 @ d40f99b3
...@@ -107,18 +107,31 @@ ...@@ -107,18 +107,31 @@
android:text="生成坩埚销售订单" android:text="生成坩埚销售订单"
android:textColor="@color/white" /> android:textColor="@color/white" />
<TextView <FrameLayout
android:id="@+id/tv_send_apply" android:id="@+id/fl_send_apply"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm" <TextView
android:paddingVertical="5mm" android:id="@+id/tv_send_apply"
android:tag="order:co:out-store-apply:page:list" android:layout_width="wrap_content"
android:text="发货申请" android:layout_height="wrap_content"
android:textColor="@color/white" /> android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:tag="order:co:out-store-apply:page:list"
android:text="发货申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_send_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -142,6 +155,7 @@ ...@@ -142,6 +155,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingVertical="10mm" /> android:paddingVertical="10mm" />
<LinearLayout <LinearLayout
android:id="@+id/ll_see_more" android:id="@+id/ll_see_more"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -159,6 +173,7 @@ ...@@ -159,6 +173,7 @@
android:layout_height="15mm" android:layout_height="15mm"
android:src="@mipmap/arrow_down" /> android:src="@mipmap/arrow_down" />
</LinearLayout> </LinearLayout>
<View style="@style/ViewX" /> <View style="@style/ViewX" />
<LinearLayout <LinearLayout
......
app/src/main/res/layout/activity_inside_order.xml
浏览文件 @ d40f99b3
...@@ -96,27 +96,57 @@ ...@@ -96,27 +96,57 @@
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="gone">
<TextView
android:id="@+id/tv_finish_apply" <FrameLayout
android:id="@+id/fl_finish_apply"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:textColor="@color/white" />
<TextView <TextView
android:id="@+id/tv_send_apply" android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_finish_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_send_apply"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm" <TextView
android:paddingVertical="5mm" android:id="@+id/tv_send_apply"
android:text="发货申请" android:layout_width="wrap_content"
android:textColor="@color/white" /> android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:tag="order:co:out-store-apply:page:list"
android:text="发货申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_send_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_out_order.xml
浏览文件 @ d40f99b3
...@@ -97,29 +97,57 @@ ...@@ -97,29 +97,57 @@
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="gone">
<TextView
android:id="@+id/tv_finish_apply" <FrameLayout
android:id="@+id/fl_finish_apply"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:tag="order:po:advance-finish-apply:page:list"
android:text="提前结束申请"
android:textColor="@color/white" />
<TextView <TextView
android:id="@+id/tv_send_apply" android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_finish_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_send_apply"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm" <TextView
android:paddingVertical="5mm" android:id="@+id/tv_send_apply"
android:tag="order:po:out-store-apply:page:list" android:layout_width="wrap_content"
android:text="发货申请" android:layout_height="wrap_content"
android:textColor="@color/white" /> android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:tag="order:co:out-store-apply:page:list"
android:text="发货申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_send_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_sale_order.xml
浏览文件 @ d40f99b3
...@@ -96,29 +96,60 @@ ...@@ -96,29 +96,60 @@
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="gone">
<TextView
android:id="@+id/tv_finish_apply"
<FrameLayout
android:id="@+id/fl_finish_apply"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:tag="order:so:advance-finish-apply:page:list" android:tag="order:so:advance-finish-apply:page:list"
android:textColor="@color/white" /> android:layout_height="wrap_content"
android:layout_marginRight="10mm">
<TextView <TextView
android:id="@+id/tv_send_apply" android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_finish_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_send_apply"
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:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="发货申请"
android:tag="order:so:out-store-apply:page:list" android:tag="order:so:out-store-apply:page:list"
android:textColor="@color/white" /> android:layout_marginRight="10mm">
<TextView
android:id="@+id/tv_send_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:tag="order:co:out-store-apply:page:list"
android:text="发货申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_send_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_supplier_order.xml
浏览文件 @ d40f99b3
...@@ -96,27 +96,56 @@ ...@@ -96,27 +96,56 @@
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="gone">
<TextView <FrameLayout
android:id="@+id/tv_finish_apply" android:id="@+id/fl_finish_apply"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:textColor="@color/white" />
<TextView <TextView
android:id="@+id/tv_send_apply" android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_finish_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_send_apply"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm" <TextView
android:paddingVertical="5mm" android:id="@+id/tv_send_apply"
android:text="发货申请" android:layout_width="wrap_content"
android:textColor="@color/white" /> android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:tag="order:co:out-store-apply:page:list"
android:text="发货申请"
android:textColor="@color/white" />
<View
android:id="@+id/view_send_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/item_order_product.xml
浏览文件 @ d40f99b3
...@@ -217,9 +217,9 @@ ...@@ -217,9 +217,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone"
android:text="该产品超出安全库存" android:text="该产品超出安全库存"
android:textColor="@color/red" /> android:textColor="@color/red"
android:visibility="gone" />
<LinearLayout <LinearLayout
...@@ -253,59 +253,118 @@ ...@@ -253,59 +253,118 @@
android:layout_marginTop="10mm" android:layout_marginTop="10mm"
android:visibility="gone"> android:visibility="gone">
<TextView <FrameLayout
android:id="@+id/tv_get" android:id="@+id/fl_get"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="领用"
android:textColor="@color/white" />
<TextView <TextView
android:id="@+id/tv_return" android:id="@+id/tv_get"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="领用"
android:textColor="@color/white" />
<View
android:id="@+id/view_get"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_return"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="退货"
android:textColor="@color/white" />
<TextView <TextView
android:id="@+id/tv_quality" android:id="@+id/tv_return"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="退货"
android:textColor="@color/white" />
<View
android:id="@+id/view_return"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_quality"
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_marginRight="10mm"
android:background="@drawable/shape_blue_btn" android:visibility="gone">
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="质检"
android:textColor="@color/white"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/tv_add" android:id="@+id/tv_quality"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="质检"
android:textColor="@color/white" />
<View
android:id="@+id/view_quality"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_add"
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_marginRight="10mm">
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm" <TextView
android:paddingVertical="5mm" android:id="@+id/tv_add"
android:text="入库" android:layout_width="wrap_content"
android:textColor="@color/white" /> android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="入库"
android:textColor="@color/white" />
<View
android:id="@+id/view_add"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<TextView
android:id="@+id/tv_flow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="流水"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_flow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="流水"
android:textColor="@color/white" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论