diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
index 663daf9..66a9aa6 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
@@ -20,6 +20,7 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect
import com.lukouguoji.module_base.ktx.showToast
import com.lukouguoji.module_base.ktx.toRequestBody
import com.lukouguoji.module_base.model.ScanModel
+import dev.utils.app.info.KeyValue
import dev.utils.common.DateUtils
import com.lukouguoji.module_base.ktx.formatDate
import kotlinx.coroutines.launch
@@ -34,6 +35,16 @@ class IntExpArriveViewModel : BasePageViewModel() {
val flightNo = MutableLiveData("") // 航班号
val waybillNo = MutableLiveData("") // 运单号
val hno = MutableLiveData("") // 分单号
+ val arrivalStatus = MutableLiveData("") // 运抵状态(0:未运抵,1:已运抵)
+
+ // 运抵状态下拉列表
+ val arrivalStatusList = MutableLiveData(
+ listOf(
+ KeyValue("全部", ""),
+ KeyValue("已运抵", "1"),
+ KeyValue("未运抵", "0")
+ )
+ )
// ========== 统计信息 ==========
val totalCount = MutableLiveData("0") // 合计票数
@@ -301,7 +312,8 @@ class IntExpArriveViewModel : BasePageViewModel() {
"fdate" to flightDate.value?.ifEmpty { null },
"fno" to flightNo.value?.ifEmpty { null },
"wbNo" to waybillNo.value?.ifEmpty { null },
- "hno" to hno.value?.ifEmpty { null }
+ "hno" to hno.value?.ifEmpty { null },
+ "arrivalStatus" to arrivalStatus.value?.ifEmpty { null }
)
// 列表参数 (含分页)
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml b/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml
index 8d05466..62875d2 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml
@@ -79,6 +79,16 @@
android:layout_height="wrap_content"
android:layout_weight="1" />
+
+
+