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

1.修改审核提交,备注是否需要填写规则

2.//TODO 坩埚下单,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级 ef9d44e6
...@@ -142,13 +142,13 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -142,13 +142,13 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
// "", "100", "200", "710", "500", // "", "100", "200", "710", "500",
// "600"}; // "600"};
case 100: case 100:
if (WorkUtils.orderCheckPermission(1,dataBean.getLaunchDeptId())){ if (WorkUtils.orderCheckPermission(1, dataBean.getLaunchDeptId())) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE); llCheck.setVisibility(View.VISIBLE);
} }
break; break;
case 200: case 200:
if (WorkUtils.orderReceivePermission(1,dataBean.getReceiveDeptId())){ if (WorkUtils.orderReceivePermission(1, dataBean.getReceiveDeptId())) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE); llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单"); tvAgree.setText("接单");
...@@ -238,7 +238,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -238,7 +238,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
tvDesc.setText(dataBean.getAttrName()); tvDesc.setText(dataBean.getAttrName());
tvStatus.setText(dataBean.getStatusName()); tvStatus.setText(dataBean.getStatusName());
status=dataBean.getStatus(); status = dataBean.getStatus();
changView(dataBean.getStatus()); changView(dataBean.getStatus());
} }
}); });
...@@ -277,7 +277,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -277,7 +277,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"identity", identity, "identity", identity,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"num", proList.get(position).getCanUseProductSum() + "", "num", proList.get(position).getCanUseProductSum() + "",
"enterStockType",dataBean.getEnterStockType(), "enterStockType", dataBean.getEnterStockType(),
"returnNum", proList.get(position).getCanUseProductSum() + "", "returnNum", proList.get(position).getCanUseProductSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType(), "orderType", dataBean.getExpandInfo().getOrderType(),
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
...@@ -312,16 +312,16 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -312,16 +312,16 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.tv_refuse: case R.id.tv_refuse:
if (status==200){ if (status == 200) {
checkReceiveDialog(2,dataBean.getId()); checkReceiveDialog(2, dataBean.getId());
}else { } else {
checkDialog(2); checkDialog(2);
} }
break; break;
case R.id.tv_agree: case R.id.tv_agree:
if (status==200){ if (status == 200) {
checkReceiveDialog(1,dataBean.getId()); checkReceiveDialog(1, dataBean.getId());
}else { } else {
checkDialog(1); checkDialog(1);
} }
break; break;
...@@ -434,28 +434,13 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -434,28 +434,13 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num); TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel); TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content); EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() { WorkUtils.addNumListener(etRemark, tvNum);
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view); builder.setView(view);
AlertDialog addCartDialog = builder.create(); AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() { tvOk.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) { if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注"); toast("请填写备注");
return; return;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论