eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: opt 国际出港

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt
View File

@@ -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)
}

2
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt
View File

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

2
module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
View File

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

21
module_gjc/src/main/res/layout/item_gjc_weighing.xml
View File

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