feat: 删除原因

2025-12-15 12:34:00 +08:00
parent 5c7284e617
commit 23185616d1
5 changed files with 83 additions and 83 deletions
--- 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
@@ -12,6 +12,7 @@ import com.lukouguoji.module_base.bean.BoxDetailsForCarIdBean
 import com.lukouguoji.module_base.bean.CarBarBean
 import com.lukouguoji.module_base.bean.CarOrUldBean
 import com.lukouguoji.module_base.bean.DiBangChannelBean
+import com.lukouguoji.module_base.bean.DictBean
 import com.lukouguoji.module_base.bean.DictIdValueBean
 import com.lukouguoji.module_base.bean.DictListBean
 import com.lukouguoji.module_base.bean.DictLocationBean
@@ -1448,6 +1449,11 @@ interface Api {
    @POST("flt/searchHandoverPage")
    suspend fun getDocumentHandoverList(@Body data: RequestBody): BaseListBean<DocumentHandoverBean>

+    /**
+     * 获取删除原因列表
+     */
+    @GET("typeCode/delReason")
+    suspend fun getDelReasonList(@Query("needFormat") needFormat: Boolean = true): BaseResultBean<List<DictBean>>

    @GET("file/verifyVersion")
    suspend fun getAppUpdate(@Query("versionCode") versionCode: Int): AppUpdateResponse<AppUpdateResponseInfo>
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
@@ -125,40 +125,38 @@ class IntExpArriveViewModel : BasePageViewModel() {
 //            return
 //        }

-        // 准备变更原因列表（示例数据，可根据实际需求调整）
-        val changeReasonList = listOf(
-            KeyValue("01", "运单号错误"),
-            KeyValue("02", "件数或重量错误"),
-            KeyValue("03", "货物信息错误"),
-            KeyValue("04", "航班信息错误"),
-            KeyValue("99", "其他原因")
-        )
+        // 从接口获取删除原因列表
+        launchLoadingCollect({ NetApply.api.getDelReasonList() }) {
+            onSuccess = { result ->
+                val changeReasonList = result.data?.map { it.toKeyValue() } ?: emptyList()

-        // 创建并显示弹框
-        val dialog = IntExpArriveDeleteDialogModel(changeReasonList) { dialogModel ->
-            // 弹框确认后的回调
-            val param = GjcDeclareParam(
-                dcode = dialogModel.changeReason.value,
-                dcontactsName = dialogModel.contactName.value,
-                dcontactsTel = dialogModel.contactPhone.value,
-                maWbList = selectedItems
-            )
+                // 创建并显示弹框
+                val dialog = IntExpArriveDeleteDialogModel(changeReasonList) { dialogModel ->
+                    // 弹框确认后的回调
+                    val param = GjcDeclareParam(
+                        dcode = dialogModel.changeReason.value,
+                        dcontactsName = dialogModel.contactName.value,
+                        dcontactsTel = dialogModel.contactPhone.value,
+                        maWbList = selectedItems
+                    )

-            val requestData = param.toRequestBody()
+                    val requestData = param.toRequestBody()

-            // 调用删除接口
-            launchLoadingCollect({ NetApply.api.deleteArriveDeclare(requestData) }) {
-                onSuccess = {
-                    showToast("删除申报成功")
-                    viewModelScope.launch {
-                        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                    // 调用删除接口
+                    launchLoadingCollect({ NetApply.api.deleteArriveDeclare(requestData) }) {
+                        onSuccess = {
+                            showToast("删除申报成功")
+                            viewModelScope.launch {
+                                FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                            }
+                            refresh()
+                        }
                    }
-                    refresh()
                }
+
+                dialog.show()
            }
        }
-
-        dialog.show()
    }

    /**
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt
@@ -153,40 +153,38 @@ class IntExpLoadViewModel : BasePageViewModel() {
 //            return
 //        }

-        // 准备变更原因列表（示例数据，可根据实际需求调整）
-        val changeReasonList = listOf(
-            KeyValue("01", "运单号错误"),
-            KeyValue("02", "件数或重量错误"),
-            KeyValue("03", "货物信息错误"),
-            KeyValue("04", "航班信息错误"),
-            KeyValue("99", "其他原因")
-        )
+        // 从接口获取删除原因列表
+        launchLoadingCollect({ NetApply.api.getDelReasonList() }) {
+            onSuccess = { result ->
+                val changeReasonList = result.data?.map { it.toKeyValue() } ?: emptyList()

-        // 创建并显示弹框
-        val dialog = IntExpLoadDeleteDialogModel(changeReasonList) { dialogModel ->
-            // 弹框确认后的回调
-            val param = GjcDeclareParam(
-                dcode = dialogModel.changeReason.value,
-                dcontactsName = dialogModel.contactName.value,
-                dcontactsTel = dialogModel.contactPhone.value,
-                loadList = selectedItems
-            )
+                // 创建并显示弹框
+                val dialog = IntExpLoadDeleteDialogModel(changeReasonList) { dialogModel ->
+                    // 弹框确认后的回调
+                    val param = GjcDeclareParam(
+                        dcode = dialogModel.changeReason.value,
+                        dcontactsName = dialogModel.contactName.value,
+                        dcontactsTel = dialogModel.contactPhone.value,
+                        loadList = selectedItems
+                    )

-            val requestData = param.toRequestBody()
+                    val requestData = param.toRequestBody()

-            // 调用删除接口
-            launchLoadingCollect({ NetApply.api.deleteLoadDeclare(requestData) }) {
-                onSuccess = {
-                    showToast("删除申报成功")
-                    viewModelScope.launch {
-                        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                    // 调用删除接口
+                    launchLoadingCollect({ NetApply.api.deleteLoadDeclare(requestData) }) {
+                        onSuccess = {
+                            showToast("删除申报成功")
+                            viewModelScope.launch {
+                                FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                            }
+                            refresh()
+                        }
                    }
-                    refresh()
                }
+
+                dialog.show()
            }
        }
-
-        dialog.show()
    }

    /**
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt
@@ -151,40 +151,38 @@ class IntExpTallyViewModel : BasePageViewModel() {
 //            return
 //        }

-        // 准备变更原因列表（示例数据，可根据实际需求调整）
-        val changeReasonList = listOf(
-            KeyValue("01", "运单号错误"),
-            KeyValue("02", "件数或重量错误"),
-            KeyValue("03", "货物信息错误"),
-            KeyValue("04", "航班信息错误"),
-            KeyValue("99", "其他原因")
-        )
+        // 从接口获取删除原因列表
+        launchLoadingCollect({ NetApply.api.getDelReasonList() }) {
+            onSuccess = { result ->
+                val changeReasonList = result.data?.map { it.toKeyValue() } ?: emptyList()

-        // 创建并显示弹框
-        val dialog = IntExpTallyDeleteDialogModel(changeReasonList) { dialogModel ->
-            // 弹框确认后的回调
-            val param = GjcDeclareParam(
-                dcode = dialogModel.changeReason.value,
-                dcontactsName = dialogModel.contactName.value,
-                dcontactsTel = dialogModel.contactPhone.value,
-                maWbList = selectedItems
-            )
+                // 创建并显示弹框
+                val dialog = IntExpTallyDeleteDialogModel(changeReasonList) { dialogModel ->
+                    // 弹框确认后的回调
+                    val param = GjcDeclareParam(
+                        dcode = dialogModel.changeReason.value,
+                        dcontactsName = dialogModel.contactName.value,
+                        dcontactsTel = dialogModel.contactPhone.value,
+                        maWbList = selectedItems
+                    )

-            val requestData = param.toRequestBody()
+                    val requestData = param.toRequestBody()

-            // 调用删除接口
-            launchLoadingCollect({ NetApply.api.deleteTallyDeclare(requestData) }) {
-                onSuccess = {
-                    showToast("删除申报成功")
-                    viewModelScope.launch {
-                        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                    // 调用删除接口
+                    launchLoadingCollect({ NetApply.api.deleteTallyDeclare(requestData) }) {
+                        onSuccess = {
+                            showToast("删除申报成功")
+                            viewModelScope.launch {
+                                FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                            }
+                            refresh()
+                        }
                    }
-                    refresh()
                }
+
+                dialog.show()
            }
        }
-
-        dialog.show()
    }

    /**
--- a/module_gjc/src/main/res/layout/activity_gjc_handover.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_handover.xml
@@ -97,7 +97,7 @@
                                android:layout_weight="2"
                                android:background="@drawable/bg_table_cell"
                                android:gravity="center"
-                                android:text="2025 年  12月 20 日"
+                                tools:text="2025年12月20日"
                                android:textColor="@color/color_33"
                                android:textSize="14sp" />
                        </LinearLayout>
@@ -136,7 +136,7 @@
                                android:gravity="center"
                                android:text="计划班期(航班号/日期/目的地)"
                                android:textColor="@color/color_33"
-                                android:textSize="14sp" />
+                                android:textSize="13sp" />

                            <TextView
                                android:layout_width="0dp"