提交 02b4225d authored 作者: lgd's avatar lgd

1.修改remark

2.//TODO 坩埚下单,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级 acc4f80f
......@@ -1367,6 +1367,14 @@ public interface ApiService {
@PUT("/useApply/ao/audit/{applyId}")
Observable<BaseBean> useAoApplyCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
/**
* step8_3-领用申请审核
*
* @return
*/
@PUT("/useApply/po/audit/{applyId}")
Observable<BaseBean> usePoApplyCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
/**
* step7_7-退货申请流水列表
*
......
......@@ -216,22 +216,7 @@ public class AddCrucibleConfirmActivity extends WorkToolBarActivity {
* @param tv
*/
private void addNumListener(EditText et, TextView tv) {
et.addTextChangedListener(new TextWatcher() {
@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) {
tv.setText(s.length() + "/140");
}
});
WorkUtils.addNumListener(et,tv);
}
@Override
......
......@@ -383,22 +383,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -460,22 +445,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -172,22 +172,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -344,22 +344,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -420,22 +405,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -27,6 +27,7 @@ import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.ui.adapter.OutOrderDetailProductAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -385,26 +386,11 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
View view = LayoutInflater.from(this).inflate(R.layout.view_check_order, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvPrice = view.findViewById(R.id.tv_price);
tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -505,22 +491,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -142,22 +142,7 @@ public class ProductConfirmActivity extends WorkToolBarActivity {
* @param tv
*/
private void addNumListener(EditText et, TextView tv) {
et.addTextChangedListener(new TextWatcher() {
@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) {
tv.setText(s.length() + "/140");
}
});
WorkUtils.addNumListener(et,tv);
}
@Override
......
......@@ -210,22 +210,7 @@ public class ProductOrderApplyDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -322,22 +322,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -25,6 +25,7 @@ import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.ui.adapter.SupplierOrderDetailProductAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -356,26 +357,11 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
View view = LayoutInflater.from(this).inflate(R.layout.view_check_order, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvPrice = view.findViewById(R.id.tv_price);
tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -436,22 +422,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -174,7 +174,9 @@ public class UseApplyDetailActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().useApplyCheck(id + "", WorkUtils.convertMapToBody(checkParam));
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
observable = RtfUtils.getRtf().useAoApplyCheck(id + "", WorkUtils.convertMapToBody(checkParam));
} else {
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().usePoApplyCheck(id + "", WorkUtils.convertMapToBody(checkParam));
}else {
observable = RtfUtils.getRtf().useApplyCheck(id + "", WorkUtils.convertMapToBody(checkParam));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......
......@@ -232,22 +232,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
* @param tv
*/
private void addNumListener(EditText et, TextView tv) {
et.addTextChangedListener(new TextWatcher() {
@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) {
tv.setText(s.length() + "/140");
}
});
WorkUtils.addNumListener(et,tv);
}
@Override
......
......@@ -254,22 +254,7 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -106,22 +106,7 @@ public class DeviceBuyRepairConfirmActivity extends WorkToolBarActivity {
* @param tv
*/
private void addNumListener(EditText et, TextView tv) {
et.addTextChangedListener(new TextWatcher() {
@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) {
tv.setText(s.length() + "/140");
}
});
WorkUtils.addNumListener(et,tv);
}
@Override
......
......@@ -254,22 +254,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -147,22 +147,7 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -98,6 +98,7 @@ public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
}
});
}
WorkUtils.addNumListener(etRemark,tvRemarkNum);
}
@Override
......@@ -142,22 +143,6 @@ public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
@Override
protected void initEvent() {
etRemark.addTextChangedListener(new TextWatcher() {
@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) {
tvRemarkNum.setText(s.length() + "/140");
}
});
}
@Override
......
......@@ -199,22 +199,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -86,22 +86,7 @@ public class WorkFinancialReceiveTicketSubmitActivity extends WorkToolBarActivit
@Override
protected void initEvent() {
etRemark.addTextChangedListener(new TextWatcher() {
@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) {
tvRemarkNum.setText(s.length() + "/140");
}
});
WorkUtils.addNumListener(etRemark,tvRemarkNum);
}
@Override
......
......@@ -157,22 +157,7 @@ public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -90,22 +90,7 @@ public class WorkFinancialTicketSubmitActivity extends WorkToolBarActivity {
@Override
protected void initEvent() {
etRemark.addTextChangedListener(new TextWatcher() {
@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) {
tvRemarkNum.setText(s.length() + "/140");
}
});
WorkUtils.addNumListener(etRemark,tvRemarkNum);
}
@Override
......
......@@ -178,22 +178,7 @@ public class MesProcessFragment extends WorkBaseFg {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -182,22 +182,7 @@ public class MesServiceFragment extends WorkBaseFg {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
etRemark.addTextChangedListener(new TextWatcher() {
@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");
}
});
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......
......@@ -16,6 +16,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.UseApplyBean;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.bean.event.CheckUseEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
......@@ -244,7 +245,9 @@ public class UseApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().useApplyCheck(id + "", WorkUtils.convertMapToBody(checkParam));
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
observable = RtfUtils.getRtf().useAoApplyCheck(id + "", WorkUtils.convertMapToBody(checkParam));
} else {
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().usePoApplyCheck(id + "", WorkUtils.convertMapToBody(checkParam));
}else {
observable = RtfUtils.getRtf().useApplyCheck(id + "", WorkUtils.convertMapToBody(checkParam));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......@@ -266,9 +269,7 @@ public class UseApplyFragment extends WorkBaseFg {
return;
}
toast("操作成功");
page = 1;
param.put("current", page);
getData();
EventBus.getDefault().post(new CheckUseEvent());
}
});
}
......
......@@ -216,12 +216,12 @@
<View style="@style/dividerX" />
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
......@@ -238,7 +238,7 @@
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
</LinearLayout>
<View style="@style/dividerX" />
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论