feat: opt 国际出港

This commit is contained in:
2026-01-05 13:19:21 +08:00
parent c3c700c111
commit ac0ade9eab
5 changed files with 19 additions and 14 deletions

View File

@@ -432,7 +432,8 @@ interface Api {
* 接口路径: /IntExpCheckInCheck/pass * 接口路径: /IntExpCheckInCheck/pass
*/ */
@POST("IntExpCheckInCheck/pass") @POST("IntExpCheckInCheck/pass")
suspend fun passGjcInspection(@Body data: RequestBody): BaseResultBean<Boolean> suspend fun passGjcInspection(
@Query("reason") reason: String, @Body data: RequestBody): BaseResultBean<Boolean>
/** /**
* 国际出港收运审核-退回运单列表maWbId、wbNo必填 * 国际出港收运审核-退回运单列表maWbId、wbNo必填

View File

@@ -65,8 +65,9 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
*/ */
fun auditPass() { fun auditPass() {
val bean = dataBean.value ?: return val bean = dataBean.value ?: return
val reason = returnReason.value ?: ""
getTopActivity().showConfirmDialog("确定要通过该单证吗?") { getTopActivity().showConfirmDialog("确定要通过该单证吗?") {
performAudit(bean, true, "通过", "") performAudit(bean, true, "通过", reason)
} }
} }
@@ -108,7 +109,7 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
// 根据审核状态调用不同接口 // 根据审核状态调用不同接口
launchLoadingCollect({ launchLoadingCollect({
if (isPass) { if (isPass) {
NetApply.api.passGjcInspection(requestData) NetApply.api.passGjcInspection(reason, requestData)
} else { } else {
NetApply.api.backGjcInspection(reason, requestData) NetApply.api.backGjcInspection(reason, requestData)
} }

View File

@@ -213,7 +213,7 @@ class GjcInspectionViewModel : BasePageViewModel() {
// 根据审核状态调用不同接口 // 根据审核状态调用不同接口
launchLoadingCollect({ launchLoadingCollect({
if (isPass) { if (isPass) {
NetApply.api.passGjcInspection(requestData) NetApply.api.passGjcInspection("", requestData)
} else { } else {
NetApply.api.backGjcInspection(reason, requestData) NetApply.api.backGjcInspection(reason, requestData)
} }

View File

@@ -303,7 +303,7 @@
inputHeight="@{80}" inputHeight="@{80}"
title='@{"原因"}' title='@{"原因"}'
titleLength="@{5}" titleLength="@{5}"
hint='@{"请输入退回原因"}' hint='@{"请输入内容"}'
type="@{DataLayoutType.INPUT}" type="@{DataLayoutType.INPUT}"
value='@={viewModel.returnReason}' value='@={viewModel.returnReason}'
android:layout_width="match_parent" android:layout_width="match_parent"

View File

@@ -45,11 +45,11 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1.0" android:layout_weight="1.2"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
completeSpace="@{4}" completeSpace="@{5}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="运单号:" /> android:text="运单号:" />
@@ -67,7 +67,7 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.6" android:layout_weight="1"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
@@ -79,6 +79,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1"
android:lines="1"
android:ellipsize="end"
android:text='@{bean.agentName}' android:text='@{bean.agentName}'
tools:text="SF" /> tools:text="SF" />
@@ -88,11 +91,11 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.8" android:layout_weight="1"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
completeSpace="@{3}" completeSpace="@{5}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="特码:" /> android:text="特码:" />
@@ -159,7 +162,7 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1.0" android:layout_weight="1.2"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
@@ -180,11 +183,11 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.6" android:layout_weight="1"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
completeSpace="@{3}" completeSpace="@{4}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="航程:" /> android:text="航程:" />
@@ -201,7 +204,7 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.8" android:layout_weight="1"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView