diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt index c8fe4e8..dd97ed4 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt @@ -38,8 +38,9 @@ class IntImpPickUpDLVActivity : viewModel.refresh() } - // 初始化代理人列表 + // 初始化代理人、特码下拉列表 viewModel.initAgentList() + viewModel.initSpecialCodeList() // 初始加载数据 viewModel.refresh() diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt index c1f6d7b..17175b7 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt @@ -20,6 +20,7 @@ import com.lukouguoji.module_base.ktx.formatDate import com.lukouguoji.module_base.ktx.toRequestBody import com.lukouguoji.module_base.model.ConfirmDialogModel import com.lukouguoji.module_base.model.ScanModel +import com.lukouguoji.module_base.util.DictUtils import dev.utils.app.info.KeyValue import dev.utils.common.DateUtils import kotlinx.coroutines.launch @@ -38,6 +39,7 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() { // ========== 下拉列表数据源 ========== val agentList = MutableLiveData(listOf(KeyValue("全部", ""))) + val spCodeList = MutableLiveData>(emptyList()) // ========== 统计信息 ========== val totalCount = MutableLiveData("0") // 合计票数 @@ -75,6 +77,19 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() { } } + /** + * 初始化特码列表(与国际进港查询筛选栏一致:国际、不区分进出港) + */ + fun initSpecialCodeList() { + DictUtils.getSpecialCodeList( + flag = 1, + ieFlag = "", + parentcode = "" + ) { + spCodeList.value = it + } + } + /** * 搜索按钮点击 */ @@ -89,13 +104,6 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() { ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL) } - /** - * 扫码特码 - */ - fun scanSpCode() { - ScanModel.startScan(getTopActivity(), Constant.RequestCode.gnj_chu_ku_list) - } - /** * 全选按钮点击 */ @@ -181,10 +189,6 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() { wbNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) refresh() } - Constant.RequestCode.gnj_chu_ku_list -> { - spCode.value = data.getStringExtra(Constant.Result.CODED_CONTENT) - refresh() - } } } } diff --git a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml index b50335f..71bf416 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml @@ -78,10 +78,9 @@