feat: 国际出港 出港移库

This commit is contained in:
2026-01-13 11:49:38 +08:00
parent ab4b1618c8
commit 4e34a8f406

View File

@@ -31,18 +31,17 @@ class IntExpMoveViewModel : BasePageViewModel(), IOnItemClickListener {
// ========== 运单类型下拉数据 ==========
val awbTypeList = MutableLiveData<List<KeyValue>>().apply {
value = listOf(
KeyValue("", "全部"),
KeyValue("IOCO", "国际出港(经国内航班出境)"),
KeyValue("IOSO", "国际出港(国际航班出境)")
KeyValue("全部", ""),
KeyValue("转国内出港", "IOCO")
)
}
// ========== 移库状态下拉数据 ==========
val moveStateList = MutableLiveData<List<KeyValue>>().apply {
value = listOf(
KeyValue("", "全部"),
KeyValue("0", "未移交"),
KeyValue("1", "已移交")
KeyValue("全部", ""),
KeyValue("未移库", "0"),
KeyValue("已移库", "1")
)
}
@@ -146,14 +145,14 @@ class IntExpMoveViewModel : BasePageViewModel(), IOnItemClickListener {
* 获取列表数据
*/
override fun getData() {
// 构建筛选参数
val filterParams = mapOf(
"awbType" to awbType.value.noNull(),
"by1" to by1.value.noNull(),
"dest1" to dest1.value.noNull(),
"moveState" to moveState.value.noNull(),
"wbNo" to waybillNo.value.noNull()
)
// 构建筛选参数(只传递非空值)
val filterParams = mutableMapOf<String, Any>()
awbType.value?.takeIf { it.isNotEmpty() }?.let { filterParams["awbType"] = it }
by1.value?.takeIf { it.isNotEmpty() }?.let { filterParams["by1"] = it }
dest1.value?.takeIf { it.isNotEmpty() }?.let { filterParams["dest1"] = it }
moveState.value?.takeIf { it.isNotEmpty() }?.let { filterParams["moveState"] = it }
waybillNo.value?.takeIf { it.isNotEmpty() }?.let { filterParams["wbNo"] = it }
// 列表参数(含分页)
val listParams = (filterParams + mapOf(