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 93fd9f1..c166f41 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 @@ -60,6 +60,9 @@ class GjcQueryViewModel : BasePageViewModel() { // 运单类型列表(字典接口 typeCode/awb,type=IO 国际出港) val awbTypeList = MutableLiveData>(emptyList()) + // 特码列表(与国际出港待记重页面同源:flag=1 国际,ieFlag 为空) + val spCodeList = MutableLiveData>(emptyList()) + // 业务类型列表 val businessTypeList = MutableLiveData( listOf( @@ -141,7 +144,7 @@ class GjcQueryViewModel : BasePageViewModel() { } /** - * 初始化筛选下拉列表(运单类型从字典接口获取,type=IO 国际出港) + * 初始化筛选下拉列表(运单类型、特码均从字典接口获取) */ fun initFilterLists() { DictUtils.getWaybillTypeList( @@ -151,6 +154,15 @@ class GjcQueryViewModel : BasePageViewModel() { ) { awbTypeList.postValue(it) } + + // 特码列表(参数与国际出港待记重页面一致) + DictUtils.getSpecialCodeList( + flag = 1, // 国际 + ieFlag = "", // 空字符串 + parentcode = "" // 无父级 + ) { + spCodeList.postValue(it) + } } /** 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 86b9aee..f72b94b 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 @@ -56,15 +56,16 @@ android:layout_height="wrap_content" android:orientation="vertical"> - +