diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt index 4969100..93fd9f1 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt @@ -44,15 +44,6 @@ class GjcQueryViewModel : BasePageViewModel() { // 代理下拉列表(从API获取) val agentList = MutableLiveData(listOf(KeyValue("全部", ""))) - // 出库状态下拉列表 - val outStatusList = MutableLiveData( - listOf( - KeyValue("全部", ""), - KeyValue("未出库", "0"), - KeyValue("已出库", "1") - ) - ) - // ==================== 适配器配置 ==================== val itemViewHolder = GjcQueryViewHolder::class.java val itemLayoutId = R.layout.item_gjc_query @@ -80,7 +71,6 @@ class GjcQueryViewModel : BasePageViewModel() { // ==================== 筛选条件 ==================== val spCode = MutableLiveData("") // 特码 - val outStatus = MutableLiveData("") // 出库状态 val dest = MutableLiveData("") // 目的港 val awbType = MutableLiveData("") // 运单类型 val businessType = MutableLiveData("") // 业务类型 @@ -89,11 +79,10 @@ class GjcQueryViewModel : BasePageViewModel() { // 是否有筛选条件(任意一个非空则为 true,用于筛选按钮红点) val hasFilter: MediatorLiveData = MediatorLiveData().apply { val update = { _: Any? -> - value = listOf(spCode, outStatus, dest, awbType, businessType, goodsCn) + value = listOf(spCode, dest, awbType, businessType, goodsCn) .any { !it.value.isNullOrEmpty() } } addSource(spCode, update) - addSource(outStatus, update) addSource(dest, update) addSource(awbType, update) addSource(businessType, update) @@ -137,7 +126,6 @@ class GjcQueryViewModel : BasePageViewModel() { */ fun resetFilter() { spCode.value = "" - outStatus.value = "" dest.value = "" awbType.value = "" businessType.value = "" @@ -181,7 +169,6 @@ class GjcQueryViewModel : BasePageViewModel() { "wbNo" to waybillNo.value?.ifEmpty { null }, // 筛选面板条件 "spCode" to spCode.value?.ifEmpty { null }, - "outState" to outStatus.value?.ifEmpty { null }?.toIntOrNull(), "dest" to dest.value?.ifEmpty { null }, "awbType" to awbType.value?.ifEmpty { null }, "businessType" to businessType.value?.ifEmpty { null }, diff --git a/module_gjc/src/main/res/layout/layout_gjc_query_filter.xml b/module_gjc/src/main/res/layout/layout_gjc_query_filter.xml index d692d6c..86b9aee 100644 --- a/module_gjc/src/main/res/layout/layout_gjc_query_filter.xml +++ b/module_gjc/src/main/res/layout/layout_gjc_query_filter.xml @@ -67,18 +67,6 @@ type="@{DataLayoutType.INPUT}" value='@={viewModel.spCode}' /> - - -