diff --git a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt index 0e43e35..d897eb7 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt @@ -1452,7 +1452,7 @@ interface Api { /** * 获取删除原因列表 */ - @GET("typeCode/delReason") + @POST("typeCode/delReason") suspend fun getDelReasonList(@Query("needFormat") needFormat: Boolean = true): BaseResultBean> @GET("file/verifyVersion") diff --git a/module_base/src/main/res/drawable/bg_dialog_f2_radius_10.xml b/module_base/src/main/res/drawable/bg_dialog_f2_radius_10.xml new file mode 100644 index 0000000..92faaa5 --- /dev/null +++ b/module_base/src/main/res/drawable/bg_dialog_f2_radius_10.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt index 94e3e53..7d8d1dc 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt @@ -120,10 +120,10 @@ class IntExpArriveViewModel : BasePageViewModel() { val list = pageModel.rv?.commonAdapter()?.items as? List ?: return val selectedItems = list.filter { it.isSelected } -// if (selectedItems.isEmpty()) { -// showToast("请选择要删除申报的记录") -// return -// } + if (selectedItems.isEmpty()) { + showToast("请选择要删除申报的记录") + return + } // 从接口获取删除原因列表 launchLoadingCollect({ NetApply.api.getDelReasonList() }) { diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt index 32e3048..1176951 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt @@ -148,10 +148,10 @@ class IntExpLoadViewModel : BasePageViewModel() { val list = pageModel.rv?.commonAdapter()?.items as? List ?: return val selectedItems = list.filter { it.isSelected } -// if (selectedItems.isEmpty()) { -// showToast("请选择要删除申报的记录") -// return -// } + if (selectedItems.isEmpty()) { + showToast("请选择要删除申报的记录") + return + } // 从接口获取删除原因列表 launchLoadingCollect({ NetApply.api.getDelReasonList() }) { diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt index 9c50b1e..93516f0 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt @@ -146,10 +146,10 @@ class IntExpTallyViewModel : BasePageViewModel() { val list = pageModel.rv?.commonAdapter()?.items as? List ?: return val selectedItems = list.filter { it.isSelected } -// if (selectedItems.isEmpty()) { -// showToast("请选择要删除申报的记录") -// return -// } + if (selectedItems.isEmpty()) { + showToast("请选择要删除申报的记录") + return + } // 从接口获取删除原因列表 launchLoadingCollect({ NetApply.api.getDelReasonList() }) { diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml b/module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml index d1e4ca1..5487fef 100644 --- a/module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml +++ b/module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml @@ -13,7 +13,7 @@ @@ -46,6 +46,7 @@ @@ -71,6 +72,7 @@ @@ -96,6 +98,7 @@ diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml b/module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml index ea38ac7..6535df8 100644 --- a/module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml +++ b/module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml @@ -13,7 +13,7 @@ @@ -47,6 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="变更原因:" + completeSpace="@{6}" android:textColor="@color/text_normal" android:textSize="16sp" /> @@ -72,6 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="联系人姓名:" + completeSpace="@{6}" android:textColor="@color/text_normal" android:textSize="16sp" /> @@ -97,6 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="联系人电话:" + completeSpace="@{6}" android:textColor="@color/text_normal" android:textSize="16sp" /> diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml b/module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml index 7e3c088..738ec77 100644 --- a/module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml +++ b/module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml @@ -13,7 +13,7 @@ @@ -47,6 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="变更原因:" + completeSpace="@{6}" android:textColor="@color/text_normal" android:textSize="16sp" /> @@ -72,6 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="联系人姓名:" + completeSpace="@{6}" android:textColor="@color/text_normal" android:textSize="16sp" /> @@ -97,6 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="联系人电话:" + completeSpace="@{6}" android:textColor="@color/text_normal" android:textSize="16sp" />