Commit dde1c7c5 by han xu

在线填写验收报告

parent e83195de
......@@ -385,6 +385,8 @@
<string name="payer_dialog_title">未选择费用承担方</string>
<string name="payer_select_title">确认操作</string>
<string name="payer_select_content">提交后费用承担方将不能修改,确认提交吗?</string>
<string name="repor_content">请确认验收报告已正确完整填写\n以免影响该单验收</string>
<string name="report_select_title">确认提交验收</string>
<string name="failed_get_address">获取地址失败</string>
<string name="check_initial_state">查看初始状态</string>
<string name="reassignment_reason">改派原因</string>
......
......@@ -329,6 +329,7 @@ public class Spu implements Serializable, Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(this.checkReportH5);
dest.writeValue(this.accreditPrice);
dest.writeInt(this.categoryThreeId);
dest.writeInt(this.finNum);
......@@ -358,6 +359,7 @@ public class Spu implements Serializable, Parcelable {
}
protected Spu(Parcel in) {
this.checkReportH5 = in.readString();
this.accreditPrice = (Double) in.readValue(Double.class.getClassLoader());
this.categoryThreeId = in.readInt();
this.finNum = in.readInt();
......@@ -382,6 +384,8 @@ public class Spu implements Serializable, Parcelable {
this.needSerialNumPic = (Integer) in.readValue(Integer.class.getClassLoader());
this.serialNumPicUrl = in.readString();
this.ordersRelationSpuId = in.readInt();
}
public static final Creator<Spu> CREATOR = new Creator<Spu>() {
......
......@@ -41,6 +41,8 @@ public interface MultipleProcessContract {
void showSelectPayerDialog(OnCloseListener listener);
void showReportDialog(OnCloseListener listener);
void showNoPayerDialog();
boolean getSelectPayer();
......
......@@ -10,6 +10,8 @@ import androidx.databinding.ObservableField;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.managercenter.api.ManagerApiFactory;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderDetail;
......@@ -112,7 +114,15 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
// });
// } else {
commitePhoto(path);
if (mOrderDetail.getSpus().get(0).getNeedCheckReport() == 1){
mView.showReportDialog((dialog, confirm) -> {
if (confirm) {
commitePhoto(path);
}
});
}else {
commitePhoto(path);
}
// }
}
}
......@@ -247,14 +257,20 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
mView.setPayBackGround(detail.getPayType());
}
Spu spu = mOrderDetail.getSpus().get(0);
if (spu.getNeedCheckReport() == 1){
String url = spu.getCheckReportH5()+ "token=" + UserManager.getInstance().getUser().getToken() + "&created=" + mOrderDetail.getCreated();
mView.setReport(url);
ArrayList<Spu> data = new ArrayList<Spu>();
data.add(spu);
mDatas.set(data);
}
UserInfo info = UserManager.getInstance().getUser();
OrderApiFactory.getOrderInfo(orderId, Integer.parseInt(info.getAccountId())).subscribe(baseObserver(
orderDetail -> {
Spu spu = orderDetail.getSpus().get(0);
if (spu.getNeedCheckReport() == 1){
String url = spu.getCheckReportH5()+ "token=" + UserManager.getInstance().getUser().getToken() + "&created=" + mOrderDetail.getCreated();
mView.setReport(url);
ArrayList<Spu> data = new ArrayList<Spu>();
data.add(spu);
mDatas.set(data);
}
},
responeThrowable -> {
}));
}));
}
......
......@@ -635,10 +635,19 @@ 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);
});
}
public void showReportDialog(OnCloseListener listener) {
CustomDialog customDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.repor_content)
, listener);
customDialog.setTitle("重要提醒")
.setNegativeButton(getString(R.string.cancle))
.setPositiveButton(getString(R.string.report_select_title));
customDialog.show();
}
}
......@@ -127,7 +127,7 @@ public class OrderServerClockAdapter extends CoreAdapter<OrderDetail.RecordBean,
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, "验收报告,请认真完填写");
// bundle.putString(Constants.TITLE, "验收报告,请认真完填写");
Intent intent = new Intent(mContext, CommeWebViewActivity.class);
intent.putExtras(bundle);
mContext.startActivity(intent);
......
......@@ -84,7 +84,6 @@
android:layout_height="22dp"
android:gravity="center"
tools:text="验收报告"
android:visibility="gone"
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