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 d800c7a..714e402 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 @@ -432,7 +432,8 @@ interface Api { * 接口路径: /IntExpCheckInCheck/pass */ @POST("IntExpCheckInCheck/pass") - suspend fun passGjcInspection(@Body data: RequestBody): BaseResultBean + suspend fun passGjcInspection( + @Query("reason") reason: String, @Body data: RequestBody): BaseResultBean /** * 国际出港收运审核-退回(运单列表maWbId、wbNo必填) 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 80061bf..374059a 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 @@ -65,8 +65,9 @@ class GjcInspectionDetailsViewModel : BaseViewModel() { */ fun auditPass() { val bean = dataBean.value ?: return + val reason = returnReason.value ?: "" getTopActivity().showConfirmDialog("确定要通过该单证吗?") { - performAudit(bean, true, "通过", "") + performAudit(bean, true, "通过", reason) } } @@ -108,7 +109,7 @@ class GjcInspectionDetailsViewModel : BaseViewModel() { // 根据审核状态调用不同接口 launchLoadingCollect({ if (isPass) { - NetApply.api.passGjcInspection(requestData) + NetApply.api.passGjcInspection(reason, requestData) } else { NetApply.api.backGjcInspection(reason, requestData) } 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 0612773..dbf906e 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 @@ -213,7 +213,7 @@ class GjcInspectionViewModel : BasePageViewModel() { // 根据审核状态调用不同接口 launchLoadingCollect({ if (isPass) { - NetApply.api.passGjcInspection(requestData) + NetApply.api.passGjcInspection("", requestData) } else { NetApply.api.backGjcInspection(reason, requestData) } 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 4da1bfa..abc8e72 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 @@ -303,7 +303,7 @@ inputHeight="@{80}" title='@{"原因"}' titleLength="@{5}" - hint='@{"请输入退回原因"}' + hint='@{"请输入内容"}' type="@{DataLayoutType.INPUT}" value='@={viewModel.returnReason}' android:layout_width="match_parent" 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 b90d9b0..b9bdb22 100644 --- a/module_gjc/src/main/res/layout/item_gjc_weighing.xml +++ b/module_gjc/src/main/res/layout/item_gjc_weighing.xml @@ -45,11 +45,11 @@ @@ -67,7 +67,7 @@ @@ -88,11 +91,11 @@ @@ -159,7 +162,7 @@ @@ -201,7 +204,7 @@