Skip to content

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

1.修改订单审核备注 

2.修改权限单词
3.修改外采购样式
上级 f2b44969
显示空白字符变更
内嵌 并排
正在显示 包含 21 行增加 和 17 行删除
app/src/main/java/com/wd/workoffice/bean/workEnum/PagePermissionType.java
浏览文件 @ 5c813642
......@@ -107,7 +107,7 @@ public enum PagePermissionType {
PO_RETURN_SAVE("order:po:return-apply:apply:save", "发起退货申请"),
//供应订单
FO_SUPPLIER_LIST("app:order:supplier-order:page:list", "订单列表"),
FO_SUPPLIER_DETAILS("order:supplier-order:details", "订单详情"),
FO_SUPPLIER_DETAILS("order:suppplier-order:details", "订单详情"),
FO_SUPPLIER_START("order:supplier-order:start", "下单"),
FO_SUPPLIER_AUDIT("order:supplier-order:audit", "-审核"),
FO_SUPPLIER_APPLY("order:supplier-order:apply", "接单"),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 5c813642
......@@ -175,7 +175,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
tvRefuse.setText("拒单");
}else {
} else {
llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.GONE);
}
......@@ -331,8 +331,8 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"usedStore", dataBean.getUsedStore(),
"usedStoreName", dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......@@ -481,7 +481,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString())) {
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
......@@ -593,6 +593,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
/**
* 获取按钮红点显示
*
* @param id
*/
private void getProCheckStatus(String id) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 5c813642
......@@ -288,8 +288,8 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"usedStore", dataBean.getUsedStore(),
"usedStoreName", dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......@@ -412,7 +412,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString())) {
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 5c813642
......@@ -274,7 +274,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
tvRefuse.setText("拒单");
}else {
} else {
llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.GONE);
}
......@@ -344,8 +344,8 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"usedStore", dataBean.getUsedStore(),
"usedStoreName", dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......@@ -489,7 +489,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString())) {
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
......@@ -636,8 +636,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
}
});
}
/**
* 获取按钮红点显示
*
* @param id
*/
private void getProCheckStatus(String id) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 5c813642
......@@ -304,8 +304,8 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"usedStore", dataBean.getUsedStore(),
"usedStoreName", dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......@@ -454,7 +454,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString())) {
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyAddActivity.java
浏览文件 @ 5c813642
......@@ -231,8 +231,9 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
} else {
submit();
}
}else{
submit();
}
break;
case R.id.ll_stock:
if (TextUtils.equals(orderType, OrderType.SALE.getCode()) || TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())
......
app/src/main/res/layout/activity_out_order.xml
浏览文件 @ 5c813642
......@@ -108,7 +108,7 @@
android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论