Commit 528a3328 by han xu

在线填写验收报告

parent 4852a727
......@@ -261,7 +261,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
orderDetail -> {
Spu spu = orderDetail.getSpus().get(0);
if (spu.getNeedCheckReport() == 1){
String url = spu.getCheckReportH5()+ "token=" + UserManager.getInstance().getUser().getToken() + "&created=" + mOrderDetail.getCreated();
String url = spu.getCheckReportH5()+ "&token=" + UserManager.getInstance().getUser().getToken() + "&created=" + mOrderDetail.getCreated();
mView.setReport(url);
ArrayList<Spu> data = new ArrayList<Spu>();
data.add(spu);
......
......@@ -635,7 +635,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mBind.recyclerView.setOnItemClickListener((item, bind) -> {
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, url);
// bundle.putString(Constants.TITLE, "验收报告,请认真完整填写");
bundle.putString(Constants.TITLE, " ");
startActivity(CommeWebViewActivity.class,bundle);
});
}
......
package com.dayu.order.ui.adapter;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
......@@ -12,8 +13,10 @@ import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.ServeDatailsItemBinding;
import com.dayu.order.presenter.orderserver.OrderServerPresenter;
import com.dayu.usercenter.ui.activity.CommeWebViewActivity;
import com.dayu.utils.LogUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import java.util.ArrayList;
......@@ -110,6 +113,21 @@ public class OrderServerAdapter extends CoreAdapter<OrderDetail.RecordBean, Serv
holder.serverCheck.setText("验收视频");
holder.serverCheck.setVisibility(View.VISIBLE);
holder.serverTimeComment.setVisibility(View.GONE);
if (mDetail.getSpus().get(0) != null && mDetail.getSpus().get(0).getNeedCheckReport() == 1){
holder.acceptanceReport.setVisibility(View.VISIBLE);
holder.acceptanceReport.setOnClickListener(v -> {
String url = mDetail.getSpus().get(0).getCheckReportH5() + "&token=" + UserManager.getInstance().getUser().getToken() + "&created=" + mDetail.getCreated();
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, url);
bundle.putString(Constants.TITLE, " ");
Intent intent = new Intent(mContext, CommeWebViewActivity.class);
intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent);
});
}else {
// holder.acceptanceReport.setVisibility(View.GONE);
}
}
......
......@@ -122,21 +122,6 @@ public class OrderServerClockAdapter extends CoreAdapter<OrderDetail.RecordBean,
holder.serverCheck.setVisibility(View.VISIBLE);
}
holder.serverCheck.setOnClickListener(v -> presenter.dumpCheckContent(position));
if (mDetail.getSpus().get(0) != null && mDetail.getSpus().get(0).getNeedCheckReport() == 1){
holder.acceptanceReport.setVisibility(View.VISIBLE);
holder.acceptanceReport.setOnClickListener(v -> {
String url = mDetail.getSpus().get(0).getCheckReportH5()+ "token=" + UserManager.getInstance().getUser().getToken() + "&created=" + mDetail.getCreated();
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, url);
// bundle.putString(Constants.TITLE, "验收报告,请认真完整填写");
Intent intent = new Intent(mContext, CommeWebViewActivity.class);
intent.putExtras(bundle);
mContext.startActivity(intent);
});
}else {
holder.acceptanceReport.setVisibility(View.GONE);
}
}
if (UIUtils.getString(R.string.user_chcek).equals(item.getOperation())) {
holder.serverCheck.setOnClickListener(v -> {
......@@ -146,7 +131,6 @@ public class OrderServerClockAdapter extends CoreAdapter<OrderDetail.RecordBean,
intent.putStringArrayListExtra(Constants.BUNDLE_KEY_ID, list);
mContext.startActivity(intent);
});
}
if (UIUtils.getString(R.string.order_remark).equals(item.getCommentName())) {
holder.serverCheck.setOnClickListener(v -> presenter.dumpCheckContent(position));
......
......@@ -82,8 +82,9 @@
android:id="@+id/acceptance_report"
android:layout_width="60dp"
android:layout_height="22dp"
android:gravity="center"
tools:text="验收报告"
android:gravity="right"
android:text="验收报告"
android:visibility="gone"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="@dimen/sp_12" />
......@@ -92,7 +93,7 @@
android:id="@+id/server_check"
android:layout_width="84dp"
android:layout_height="22dp"
android:gravity="center"
android:gravity="right"
tools:text="随机发冷风机"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="@dimen/sp_12" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment