eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: opt del reason

Browse Source
This commit is contained in:
杨建宽
2025-12-15 14:10:08 +08:00
parent 23185616d1
commit 2fa567f2d2
8 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt
View File

@@ -1452,7 +1452,7 @@ interface Api {
/**
* 获取删除原因列表
*/
@GET("typeCode/delReason")
@POST("typeCode/delReason")
suspend fun getDelReasonList(@Query("needFormat") needFormat: Boolean = true): BaseResultBean<List<DictBean>>
@GET("file/verifyVersion")

5
module_base/src/main/res/drawable/bg_dialog_f2_radius_10.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/backgroud_gray" />
<corners android:radius="10dp" />
</shape>

8
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
View File

@@ -120,10 +120,10 @@ class IntExpArriveViewModel : BasePageViewModel() {
val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
val selectedItems = list.filter { it.isSelected }
// if (selectedItems.isEmpty()) {
// showToast("请选择要删除申报的记录")
// return
// }
if (selectedItems.isEmpty()) {
showToast("请选择要删除申报的记录")
return
}
// 从接口获取删除原因列表
launchLoadingCollect({ NetApply.api.getDelReasonList() }) {

8
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt
View File

@@ -148,10 +148,10 @@ class IntExpLoadViewModel : BasePageViewModel() {
val list = pageModel.rv?.commonAdapter()?.items as? List<GjcExportLoad> ?: return
val selectedItems = list.filter { it.isSelected }
// if (selectedItems.isEmpty()) {
// showToast("请选择要删除申报的记录")
// return
// }
if (selectedItems.isEmpty()) {
showToast("请选择要删除申报的记录")
return
}
// 从接口获取删除原因列表
launchLoadingCollect({ NetApply.api.getDelReasonList() }) {

8
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt
View File

@@ -146,10 +146,10 @@ class IntExpTallyViewModel : BasePageViewModel() {
val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
val selectedItems = list.filter { it.isSelected }
// if (selectedItems.isEmpty()) {
// showToast("请选择要删除申报的记录")
// return
// }
if (selectedItems.isEmpty()) {
showToast("请选择要删除申报的记录")
return
}
// 从接口获取删除原因列表
launchLoadingCollect({ NetApply.api.getDelReasonList() }) {

5
module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml
View File

@@ -13,7 +13,7 @@
<LinearLayout
android:layout_width="600dp"
android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_radius_10"
android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal"
android:orientation="vertical">
@@ -46,6 +46,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
completeSpace="@{6}"
android:text="变更原因："
android:textColor="@color/text_normal"
android:textSize="16sp" />
@@ -71,6 +72,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
completeSpace="@{6}"
android:text="联系人姓名："
android:textColor="@color/text_normal"
android:textSize="16sp" />
@@ -96,6 +98,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
completeSpace="@{6}"
android:text="联系人电话："
android:textColor="@color/text_normal"
android:textSize="16sp" />

5
module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml
View File

@@ -13,7 +13,7 @@
<LinearLayout
android:layout_width="600dp"
android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_radius_10"
android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal"
android:orientation="vertical">
@@ -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" />

5
module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml
View File

@@ -13,7 +13,7 @@
<LinearLayout
android:layout_width="600dp"
android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_radius_10"
android:background="@drawable/bg_dialog_f2_radius_10"
android:gravity="center_horizontal"
android:orientation="vertical">
@@ -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" />