Skip to content

android / dayu

Go to a project
Commit dde1c7c5 by han xu
Options

在线填写验收报告

parent e83195de
Inline Side-by-side
Showing with 36 additions and 4 deletions
baseSDK/src/main/res/values/strings.xml
...@@ -385,6 +385,8 @@ ...@@ -385,6 +385,8 @@
<string name="payer_dialog_title">未选择费用承担方</string> <string name="payer_dialog_title">未选择费用承担方</string>
<string name="payer_select_title">确认操作</string> <string name="payer_select_title">确认操作</string>
<string name="payer_select_content">提交后费用承担方将不能修改，确认提交吗？</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="failed_get_address">获取地址失败</string>
<string name="check_initial_state">查看初始状态</string> <string name="check_initial_state">查看初始状态</string>
<string name="reassignment_reason">改派原因</string> <string name="reassignment_reason">改派原因</string>
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java
...@@ -329,6 +329,7 @@ public class Spu implements Serializable, Parcelable { ...@@ -329,6 +329,7 @@ public class Spu implements Serializable, Parcelable {
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeString(this.checkReportH5);
dest.writeValue(this.accreditPrice); dest.writeValue(this.accreditPrice);
dest.writeInt(this.categoryThreeId); dest.writeInt(this.categoryThreeId);
dest.writeInt(this.finNum); dest.writeInt(this.finNum);
...@@ -358,6 +359,7 @@ public class Spu implements Serializable, Parcelable { ...@@ -358,6 +359,7 @@ public class Spu implements Serializable, Parcelable {
} }
protected Spu(Parcel in) { protected Spu(Parcel in) {
this.checkReportH5 = in.readString();
this.accreditPrice = (Double) in.readValue(Double.class.getClassLoader()); this.accreditPrice = (Double) in.readValue(Double.class.getClassLoader());
this.categoryThreeId = in.readInt(); this.categoryThreeId = in.readInt();
this.finNum = in.readInt(); this.finNum = in.readInt();
...@@ -382,6 +384,8 @@ public class Spu implements Serializable, Parcelable { ...@@ -382,6 +384,8 @@ public class Spu implements Serializable, Parcelable {
this.needSerialNumPic = (Integer) in.readValue(Integer.class.getClassLoader()); this.needSerialNumPic = (Integer) in.readValue(Integer.class.getClassLoader());
this.serialNumPicUrl = in.readString(); this.serialNumPicUrl = in.readString();
this.ordersRelationSpuId = in.readInt(); this.ordersRelationSpuId = in.readInt();
} }
public static final Creator<Spu> CREATOR = new Creator<Spu>() { public static final Creator<Spu> CREATOR = new Creator<Spu>() {
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessContract.java
...@@ -41,6 +41,8 @@ public interface MultipleProcessContract { ...@@ -41,6 +41,8 @@ public interface MultipleProcessContract {
void showSelectPayerDialog(OnCloseListener listener); void showSelectPayerDialog(OnCloseListener listener);
void showReportDialog(OnCloseListener listener);
void showNoPayerDialog(); void showNoPayerDialog();
boolean getSelectPayer(); boolean getSelectPayer();
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
...@@ -10,6 +10,8 @@ import androidx.databinding.ObservableField; ...@@ -10,6 +10,8 @@ import androidx.databinding.ObservableField;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.BaseApiFactory; import com.dayu.base.api.BaseApiFactory;
import com.dayu.common.Constants; 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.R;
import com.dayu.order.api.OrderApiFactory; import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderDetail; import com.dayu.order.api.protocol.OrderDetail;
...@@ -112,7 +114,15 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -112,7 +114,15 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
// }); // });
// } else { // } else {
if (mOrderDetail.getSpus().get(0).getNeedCheckReport() == 1){
mView.showReportDialog((dialog, confirm) -> {
if (confirm) {
commitePhoto(path); commitePhoto(path);
}
});
}else {
commitePhoto(path);
}
// } // }
} }
} }
...@@ -247,7 +257,10 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -247,7 +257,10 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
mView.setPayBackGround(detail.getPayType()); mView.setPayBackGround(detail.getPayType());
} }
Spu spu = mOrderDetail.getSpus().get(0); 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){ 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); mView.setReport(url);
...@@ -255,6 +268,9 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -255,6 +268,9 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
data.add(spu); data.add(spu);
mDatas.set(data); mDatas.set(data);
} }
},
responeThrowable -> {
}));
})); }));
} }
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
...@@ -635,10 +635,19 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent ...@@ -635,10 +635,19 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mBind.recyclerView.setOnItemClickListener((item, bind) -> { mBind.recyclerView.setOnItemClickListener((item, bind) -> {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.URL, url); bundle.putString(Constants.URL, url);
// bundle.putString(Constants.TITLE, "验收报告，请认真完成填写"); // bundle.putString(Constants.TITLE, "验收报告，请认真完整填写");
startActivity(CommeWebViewActivity.class,bundle); 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();
}
} }
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerClockAdapter.java
...@@ -127,7 +127,7 @@ public class OrderServerClockAdapter extends CoreAdapter<OrderDetail.RecordBean, ...@@ -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(); String url = mDetail.getSpus().get(0).getCheckReportH5()+ "token=" + UserManager.getInstance().getUser().getToken() + "&created=" + mDetail.getCreated();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.URL, url); bundle.putString(Constants.URL, url);
// bundle.putString(Constants.TITLE, "验收报告，请认真完成填写"); // bundle.putString(Constants.TITLE, "验收报告，请认真完整填写");
Intent intent = new Intent(mContext, CommeWebViewActivity.class); Intent intent = new Intent(mContext, CommeWebViewActivity.class);
intent.putExtras(bundle); intent.putExtras(bundle);
mContext.startActivity(intent); mContext.startActivity(intent);
......
orderCenter/src/main/res/layout/serve_datails_item.xml
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
android:layout_height="22dp" android:layout_height="22dp"
android:gravity="center" android:gravity="center"
tools:text="验收报告" tools:text="验收报告"
android:visibility="gone"
android:textColor="@color/cl_receiving_order_item_data" android:textColor="@color/cl_receiving_order_item_data"
android:textSize="@dimen/sp_12" /> 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