diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt index 861143c..33b85e9 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt @@ -205,11 +205,17 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { * 加载探板收口列表 */ private fun loadPiCloseList() { - // 探板收口选项(是/否) - piCloseList.value = listOf( - KeyValue("1", "是"), - KeyValue("0", "否") - ) + launchCollect({ + NetApply.api.getDictList("PICLOSE") + }) { + onSuccess = { + // 将 DictIdValueBean 转换为 KeyValue + // 显示和提交都使用 value 字段 + piCloseList.value = (it.data ?: emptyList()).map { b -> + KeyValue(b.value, b.value) + } + } + } } /** diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml index 0d51b05..c0bd130 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml @@ -75,6 +75,7 @@ titleLength="@{5}" type="@{DataLayoutType.SPINNER}" value='@={viewModel.channel}' + required="@{true}" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="15dp" @@ -342,33 +343,21 @@ - + - - + android:layout_width="match_parent" + android:layout_height="wrap_content" />