diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt index 04026ba..04e8fd8 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.lukouguoji.gjj.R import dev.utils.common.DateUtils -import com.lukouguoji.module_base.ktx.formatDate +import com.lukouguoji.module_base.ktx.formatDate import com.lukouguoji.gjj.holder.IntArrAirManifestViewHolder import com.lukouguoji.module_base.base.BasePageViewModel import com.lukouguoji.module_base.bean.GjjAirManifest @@ -267,19 +267,7 @@ class IntArrAirManifestViewModel : BasePageViewModel() { // 获取列表（带Loading） launchLoadingCollect({ NetApply.api.getIntArrAirManifestList(listParams) }) { onSuccess = { result -> - // 处理PageInfo结构 - val pageInfo = result.data - if (pageInfo != null) { - val list = pageInfo.list ?: emptyList() - val pages = pageInfo.pages ?: 1 - - // 处理分页数据 - pageModel.handleDataList(list) - pageModel.haveMore.postValue(pages > pageModel.page) - } else { - pageModel.handleDataList(emptyList()) - pageModel.haveMore.postValue(false) - } + pageModel.handleListBean(result.data?.toBaseListBean()) } } diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt index ee7b0da..ab6a3f4 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt @@ -1,12 +1,10 @@ package com.lukouguoji.gjj.viewModel -import android.app.Activity -import androidx.appcompat.app.AlertDialog import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.lukouguoji.gjj.R import dev.utils.common.DateUtils -import com.lukouguoji.module_base.ktx.formatDate +import com.lukouguoji.module_base.ktx.formatDate import com.lukouguoji.gjj.activity.GjjManifestAddActivity import com.lukouguoji.gjj.holder.IntImpManifestViewHolder import com.lukouguoji.module_base.base.BasePageViewModel @@ -21,6 +19,8 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect import com.lukouguoji.module_base.ktx.noNull import com.lukouguoji.module_base.ktx.showToast import com.lukouguoji.module_base.ktx.toRequestBody +import com.lukouguoji.module_base.model.ConfirmDialogModel +import dev.utils.app.info.KeyValue import com.lukouguoji.module_base.model.ScanModel import kotlinx.coroutines.launch @@ -32,7 +32,9 @@ class IntImpManifestViewModel : BasePageViewModel() { // ========== 搜索条件 ========== val flightDate = MutableLiveData(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 - val fdep = MutableLiveData("") // 始发站 + val sendAddress = MutableLiveData("") // 始发站 + val sendAddressList = MutableLiveData>(emptyList()) + val fdep = MutableLiveData("") // 目的站 val waybillNo = MutableLiveData("") // 运单号 // ========== 统计信息 ========== @@ -129,28 +131,26 @@ class IntImpManifestViewModel : BasePageViewModel() { * 删除单个舱单 */ private fun deleteManifest(bean: GjjManifest) { - AlertDialog.Builder(getTopActivity()) - .setTitle("提示") - .setMessage("确定要删除运单号 ${bean.getWaybillNo()} 的舱单吗？") - .setPositiveButton("确定") { _, _ -> - val params = mapOf("mfId" to bean.mfId).toRequestBody() + ConfirmDialogModel( + message = "确定要删除运单号 ${bean.getWaybillNo()} 的舱单吗？", + title = "提示" + ) { + val params = mapOf("mfId" to bean.mfId).toRequestBody() - launchLoadingCollect({ NetApply.api.gjjManifestDelete(params) }) { - onSuccess = { - if (it.verifySuccess()) { - showToast("删除成功") - viewModelScope.launch { - FlowBus.with(ConstantEvent.EVENT_REFRESH).emit("refresh") - } - refresh() - } else { - showToast(it.msg.noNull("删除失败")) + launchLoadingCollect({ NetApply.api.gjjManifestDelete(params) }) { + onSuccess = { + if (it.verifySuccess()) { + showToast("删除成功") + viewModelScope.launch { + FlowBus.with(ConstantEvent.EVENT_REFRESH).emit("refresh") } + refresh() + } else { + showToast(it.msg.noNull("删除失败")) } } } - .setNegativeButton("取消", null) - .show() + }.show() } /** @@ -199,6 +199,7 @@ class IntImpManifestViewModel : BasePageViewModel() { val filterParams = mapOf( "fdate" to flightDate.value?.ifEmpty { null }, "fno" to flightNo.value?.ifEmpty { null }, + "sendAddress" to sendAddress.value?.ifEmpty { null }, "fdep" to fdep.value?.ifEmpty { null }, "wbNo" to waybillNo.value?.ifEmpty { null } ) @@ -215,19 +216,7 @@ class IntImpManifestViewModel : BasePageViewModel() { // 获取列表（带Loading） launchLoadingCollect({ NetApply.api.getIntImpManifestList(listParams) }) { onSuccess = { result -> - // 处理PageInfo结构 - val pageInfo = result.data - if (pageInfo != null) { - val list = pageInfo.list ?: emptyList() - val pages = pageInfo.pages ?: 1 - - // 处理分页数据 - pageModel.handleDataList(list) - pageModel.haveMore.postValue(pages > pageModel.page) - } else { - pageModel.handleDataList(emptyList()) - pageModel.haveMore.postValue(false) - } + pageModel.handleListBean(result.data?.toBaseListBean()) } } diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt index 907f0d7..4707b8d 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt @@ -15,6 +15,7 @@ import com.lukouguoji.module_base.ktx.commonAdapter import com.lukouguoji.module_base.ktx.launchLoadingCollect import com.lukouguoji.module_base.ktx.showToast import com.lukouguoji.module_base.ktx.toRequestBody +import dev.utils.app.info.KeyValue import kotlinx.coroutines.launch /** @@ -26,8 +27,10 @@ class IntImpMsgParseViewModel : BasePageViewModel() { val flightDate = MutableLiveData(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val sendAddress = MutableLiveData("") // 发站（择始发站） + val sendAddressList = MutableLiveData>(emptyList()) val receiveAddress = MutableLiveData("HFE") // 收报地址（目的站） val msgType = MutableLiveData("") // 报文类型 + val msgTypeList = MutableLiveData>(emptyList()) // ========== 统计信息 ========== val totalCount = MutableLiveData("0") // 合计条数 @@ -117,23 +120,9 @@ class IntImpMsgParseViewModel : BasePageViewModel() { // 获取列表（带Loading） launchLoadingCollect({ NetApply.api.getIntImpMsgList(listParams) }) { onSuccess = { result -> - // 处理PageInfo结构 val pageInfo = result.data - if (pageInfo != null) { - val list = pageInfo.list ?: emptyList() - val pages = pageInfo.pages ?: 1 - - // 更新统计信息 - totalCount.value = (pageInfo.total ?: 0).toString() - - // 处理分页数据 - pageModel.handleDataList(list) - pageModel.haveMore.postValue(pages > pageModel.page) - } else { - pageModel.handleDataList(emptyList()) - pageModel.haveMore.postValue(false) - totalCount.value = "0" - } + pageModel.handleListBean(pageInfo?.toBaseListBean()) + totalCount.value = (pageInfo?.total ?: 0).toString() } } } diff --git a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml index 7eb438d..18f09e5 100644 --- a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml +++ b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml @@ -115,7 +115,7 @@ diff --git a/module_gjj/src/main/res/layout/activity_int_imp_manifest.xml b/module_gjj/src/main/res/layout/activity_int_imp_manifest.xml index af8b1cc..da33709 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_manifest.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_manifest.xml @@ -50,6 +50,16 @@ android:layout_weight="1" /> + + +