diff --git a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt index cdef4d7..fa8aba3 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt @@ -411,7 +411,7 @@ interface Api { * 接口路径: /IntExpCheckInCheck/back */ @POST("IntExpCheckInCheck/back") - suspend fun backGjcInspection(@Body data: RequestBody): BaseResultBean + suspend fun backGjcInspection(@Query("reason") reason: String, @Body data: RequestBody): BaseResultBean /** * 条件查询-国际出港-收运审核-统计数据(总件数、总重量、运单总数) diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt index 763163f..f2f5da4 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt @@ -3,6 +3,7 @@ package com.lukouguoji.gjc.viewModel import android.content.Intent import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope +import com.alibaba.android.arouter.utils.TextUtils import com.lukouguoji.module_base.base.BaseViewModel import com.lukouguoji.module_base.bean.ComAttach import com.lukouguoji.module_base.bean.FileBean @@ -71,6 +72,10 @@ class GjcInspectionDetailsViewModel : BaseViewModel() { */ fun auditReject() { val bean = dataBean.value ?: return + if (TextUtils.isEmpty(bean.remark)) { + showToast("请在备注中输入退回原因") + return + } getTopActivity().showConfirmDialog("确定要退回该单证吗?") { performAudit(bean, false, "退回") } @@ -100,7 +105,7 @@ class GjcInspectionDetailsViewModel : BaseViewModel() { if (isPass) { NetApply.api.passGjcInspection(requestData) } else { - NetApply.api.backGjcInspection(requestData) + NetApply.api.backGjcInspection(bean.remark, requestData) } }) { onSuccess = { diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt index 6111cde..209427a 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt @@ -200,7 +200,8 @@ class GjcInspectionViewModel : BasePageViewModel() { if (isPass) { NetApply.api.passGjcInspection(requestData) } else { - NetApply.api.backGjcInspection(requestData) + // TODO: impl reason dialog + NetApply.api.backGjcInspection("test reason", requestData) } }) { onSuccess = { diff --git a/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml b/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml index 39296a3..4a5ee3a 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml @@ -301,10 +301,11 @@ diff --git a/module_gjc/src/main/res/layout/item_gjc_weighing.xml b/module_gjc/src/main/res/layout/item_gjc_weighing.xml index 29ce361..b1e6f4d 100644 --- a/module_gjc/src/main/res/layout/item_gjc_weighing.xml +++ b/module_gjc/src/main/res/layout/item_gjc_weighing.xml @@ -43,7 +43,7 @@ @@ -65,7 +65,7 @@ @@ -232,7 +232,7 @@ @@ -247,7 +247,7 @@