From 5ccb971c61c702b34d3f1cd79733426c87addc21 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Fri, 13 Mar 2026 15:13:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?=
 =?UTF-8?q?=E6=8F=90=E5=8F=96=E8=AE=B0=E5=BD=95=E8=B4=B9=E7=94=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=88=97=E8=A1=A8=E4=BE=A7?=
 =?UTF-8?q?=E6=BB=91=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 app/src/main/AndroidManifest.xml              |   7 +
 .../lukouguoji/module_base/http/net/Api.kt    |   7 +
 .../IntImpPickUpChargeEditActivity.kt         |  37 ++
 .../activity/IntImpPickUpRecordActivity.kt    |  16 +
 .../holder/IntImpPickUpRecordViewHolder.kt    |   8 +-
 .../IntImpPickUpChargeEditViewModel.kt        |  89 +++
 .../activity_int_imp_pick_up_charge_edit.xml  | 272 +++++++++
 .../activity_int_imp_pick_up_record.xml       |   6 +-
 .../layout/item_int_imp_pick_up_record.xml    | 515 ++++++++++--------
 9 files changed, 711 insertions(+), 246 deletions(-)
 create mode 100644 module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpChargeEditActivity.kt
 create mode 100644 module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpChargeEditViewModel.kt
 create mode 100644 module_gjj/src/main/res/layout/activity_int_imp_pick_up_charge_edit.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3dad8e3..9363612 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -487,6 +487,13 @@
             android:exported="false"
             android:screenOrientation="userLandscape" />
 
+        <!-- 国际进港-费用修改 -->
+        <activity
+            android:name="com.lukouguoji.gjj.activity.IntImpPickUpChargeEditActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
+
         <!-- 国际进港-提取出库 -->
         <activity
             android:name="com.lukouguoji.gjj.activity.IntImpPickUpDLVActivity"
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 9ddf2ed..b066ea4 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
@@ -973,6 +973,13 @@ interface Api {
     @POST("IntImpPickup/clearPickup")
     suspend fun clearIntImpPickUp(@Body data: RequestBody): BaseResultBean<String>
 
+    /**
+     * 国际进港提取记录-修改费用
+     * 接口路径: /IntImpPickup/modifyCharge
+     */
+    @POST("IntImpPickup/modifyCharge")
+    suspend fun modifyIntImpPickUpCharge(@Body data: RequestBody): BaseResultBean<String>
+
     /**
      * 国际进港提取出库-分页查询
      * 接口路径: /IntImpPickUpDlv/pageQuery
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpChargeEditActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpChargeEditActivity.kt
new file mode 100644
index 0000000..ab236ce
--- /dev/null
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpChargeEditActivity.kt
@@ -0,0 +1,37 @@
+package com.lukouguoji.gjj.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.google.gson.Gson
+import com.lukouguoji.gjj.R
+import com.lukouguoji.gjj.databinding.ActivityIntImpPickUpChargeEditBinding
+import com.lukouguoji.gjj.viewModel.IntImpPickUpChargeEditViewModel
+import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.bean.IntImpPickUpRecordBean
+import com.lukouguoji.module_base.common.Constant
+
+/**
+ * 国际进港-费用修改
+ */
+class IntImpPickUpChargeEditActivity :
+    BaseBindingActivity<ActivityIntImpPickUpChargeEditBinding, IntImpPickUpChargeEditViewModel>() {
+
+    override fun layoutId() = R.layout.activity_int_imp_pick_up_charge_edit
+    override fun viewModelClass() = IntImpPickUpChargeEditViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        setBackArrow("国际进港费用修改")
+        binding.viewModel = viewModel
+        viewModel.initOnCreated(intent)
+    }
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context, bean: IntImpPickUpRecordBean) {
+            val starter = Intent(context, IntImpPickUpChargeEditActivity::class.java)
+                .putExtra(Constant.Key.DATA, Gson().toJson(bean))
+            context.startActivity(starter)
+        }
+    }
+}
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpRecordActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpRecordActivity.kt
index 9928356..ace1f83 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpRecordActivity.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpRecordActivity.kt
@@ -13,6 +13,8 @@ import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.impl.observe
+import com.lukouguoji.module_base.interfaces.IOnItemClickListener
+import com.lukouguoji.module_base.ktx.addOnItemClickListener
 import com.lukouguoji.module_base.ktx.commonAdapter
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.model.ConfirmDialogModel
@@ -41,6 +43,20 @@ class IntImpPickUpRecordActivity :
         // 绑定分页
         viewModel.pageModel.bindSmartRefreshLayout(binding.srl, binding.rv, viewModel, this)
 
+        // 设置列表项点击回调（侧滑修改按钮）
+        binding.rv.addOnItemClickListener(object : IOnItemClickListener {
+            override fun onItemClick(position: Int, type: Int) {
+                when (type) {
+                    2000 -> {
+                        // 侧滑修改操作
+                        val list = viewModel.pageModel.rv?.commonAdapter()?.items as? List<*> ?: return
+                        val bean = list.getOrNull(position) as? IntImpPickUpRecordBean ?: return
+                        IntImpPickUpChargeEditActivity.start(this@IntImpPickUpRecordActivity, bean)
+                    }
+                }
+            }
+        })
+
         // 监听刷新事件
         FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).observe(this) {
             viewModel.refresh()
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpPickUpRecordViewHolder.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpPickUpRecordViewHolder.kt
index de2e2e6..cda8b59 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpPickUpRecordViewHolder.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpPickUpRecordViewHolder.kt
@@ -25,8 +25,14 @@ class IntImpPickUpRecordViewHolder(view: View) :
         }
 
         // 列表项点击进入提取详情
-        itemView.setOnClickListener {
+        binding.ll.setOnClickListener {
             IntImpPickUpRecordDetailsActivity.start(itemView.context, bean)
         }
+
+        // 侧滑菜单 - 修改按钮
+        binding.btnEdit.setOnClickListener {
+            binding.swipeMenu.quickClose()
+            clickListener?.onItemClick(position, 2000)  // type=2000表示修改操作
+        }
     }
 }
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpChargeEditViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpChargeEditViewModel.kt
new file mode 100644
index 0000000..df40a7d
--- /dev/null
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpChargeEditViewModel.kt
@@ -0,0 +1,89 @@
+package com.lukouguoji.gjj.viewModel
+
+import android.content.Intent
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.google.gson.Gson
+import com.lukouguoji.module_base.base.BaseViewModel
+import com.lukouguoji.module_base.bean.IntImpPickUpRecordBean
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.http.net.NetApply
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.ktx.launchLoadingCollect
+import com.lukouguoji.module_base.ktx.showToast
+import com.lukouguoji.module_base.ktx.toRequestBody
+import kotlinx.coroutines.launch
+
+/**
+ * 国际进港费用修改 ViewModel
+ */
+class IntImpPickUpChargeEditViewModel : BaseViewModel() {
+
+    val dataBean = MutableLiveData(IntImpPickUpRecordBean())
+
+    // 可编辑费用字段（String 用于双向绑定）
+    val tranChargeStr = MutableLiveData("")       // 信息费
+    val whsChargeStr = MutableLiveData("")        // 仓储费
+    val drawBillChargeStr = MutableLiveData("")   // 抽单费
+    val efrChargeStr = MutableLiveData("")        // 冷藏费
+    val svlChargeStr = MutableLiveData("")        // 铲车费
+    val tallyChargeStr = MutableLiveData("")      // 理货费
+
+    fun initOnCreated(intent: Intent) {
+        val jsonData = intent.getStringExtra(Constant.Key.DATA) ?: ""
+        if (jsonData.isNotEmpty()) {
+            try {
+                val bean = Gson().fromJson(jsonData, IntImpPickUpRecordBean::class.java)
+                dataBean.value = bean
+                // 初始化可编辑费用字段
+                tranChargeStr.value = if (bean.tranCharge != 0.0) bean.tranCharge.toString() else ""
+                whsChargeStr.value = if (bean.whsCharge != 0.0) bean.whsCharge.toString() else ""
+                drawBillChargeStr.value = if (bean.drawBillCharge != 0.0) bean.drawBillCharge.toString() else ""
+                efrChargeStr.value = if (bean.efrCharge != 0.0) bean.efrCharge.toString() else ""
+                svlChargeStr.value = if (bean.svlCharge != 0.0) bean.svlCharge.toString() else ""
+                tallyChargeStr.value = if (bean.tallyCharge != 0.0) bean.tallyCharge.toString() else ""
+            } catch (e: Exception) {
+                showToast("数据解析失败")
+                getTopActivity().finish()
+            }
+        } else {
+            showToast("未接收到数据")
+            getTopActivity().finish()
+        }
+    }
+
+    /**
+     * 保存修改
+     */
+    fun submit() {
+        val bean = dataBean.value ?: return
+
+        // 同步可编辑费用字段回 bean
+        bean.tranCharge = tranChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.whsCharge = whsChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.drawBillCharge = drawBillChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.efrCharge = efrChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.svlCharge = svlChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.tallyCharge = tallyChargeStr.value?.toDoubleOrNull() ?: 0.0
+
+        launchLoadingCollect({
+            NetApply.api.modifyIntImpPickUpCharge(bean.toRequestBody())
+        }) {
+            onSuccess = {
+                showToast("修改成功")
+                viewModelScope.launch {
+                    FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                }
+                getTopActivity().finish()
+            }
+        }
+    }
+
+    /**
+     * 取消
+     */
+    fun cancel() {
+        getTopActivity().finish()
+    }
+}
diff --git a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_charge_edit.xml b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_charge_edit.xml
new file mode 100644
index 0000000..529e82a
--- /dev/null
+++ b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_charge_edit.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <import type="com.lukouguoji.module_base.ui.weight.data.layout.DataLayoutType" />
+
+        <variable
+            name="viewModel"
+            type="com.lukouguoji.gjj.viewModel.IntImpPickUpChargeEditViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_f2"
+        android:orientation="vertical">
+
+        <!-- 标题栏 -->
+        <include layout="@layout/title_tool_bar" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="15dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_white_radius_8"
+                    android:orientation="vertical"
+                    android:padding="15dp">
+
+                    <!-- 第1行：运单号、代理人、特码（只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"运 单 号"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.wbNo}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"代 理 人"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.agentCode}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"特 码"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.spCode}' />
+
+                    </LinearLayout>
+
+                    <!-- 第2行：提货编号、件数、重量（只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"提货编号"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.pkId}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"件数"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.pc)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"重量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.weight)}' />
+
+                    </LinearLayout>
+
+                    <!-- 第3行：计费重量（只读）、信息费（可编辑）、服务费（只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"计费重量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.cashWeight)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入信息费"}'
+                            title='@{"信息费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.tranChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"服务费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.optCharge)}' />
+
+                    </LinearLayout>
+
+                    <!-- 第4行：仓储费、抽单费、冷藏费（可编辑） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入仓储费"}'
+                            title='@{"仓储费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.whsChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入抽单费"}'
+                            title='@{"抽单费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.drawBillChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入冷藏费"}'
+                            title='@{"冷藏费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.efrChargeStr}' />
+
+                    </LinearLayout>
+
+                    <!-- 第5行：铲车费、理货费（可编辑）、总金额（只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入铲车费"}'
+                            title='@{"铲车费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.svlChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入理货费"}'
+                            title='@{"理货费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.tallyChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"总金额"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.amount)}' />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- 底部操作按钮 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center"
+                    android:paddingHorizontal="15dp">
+
+                    <TextView
+                        style="@style/tv_bottom_btn"
+                        android:layout_width="120dp"
+                        android:layout_marginEnd="20dp"
+                        android:onClick="@{()-> viewModel.cancel()}"
+                        android:text="取消" />
+
+                    <TextView
+                        style="@style/tv_bottom_btn"
+                        android:layout_width="120dp"
+                        android:onClick="@{()-> viewModel.submit()}"
+                        android:text="保存" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>
diff --git a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_record.xml b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_record.xml
index 2ead80c..7c7ff10 100644
--- a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_record.xml
+++ b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_record.xml
@@ -169,7 +169,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text='@{"合计:" + viewModel.totalCount + "票"}'
+                    android:text='@{"合计：" + viewModel.totalCount + "票"}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -178,7 +178,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
-                    android:text='@{"总件数:" + viewModel.totalPc}'
+                    android:text='@{"总件数：" + viewModel.totalPc}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -187,7 +187,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
-                    android:text='@{"总重量:" + viewModel.totalWeight}'
+                    android:text='@{"总重量：" + viewModel.totalWeight}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />
diff --git a/module_gjj/src/main/res/layout/item_int_imp_pick_up_record.xml b/module_gjj/src/main/res/layout/item_int_imp_pick_up_record.xml
index d499e29..fc957c0 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_pick_up_record.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_pick_up_record.xml
@@ -13,281 +13,312 @@
             type="Integer" />
     </data>
 
-    <!-- 主列表项容器 -->
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/ll"
+    <!-- 外层容器承载间距 -->
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="15dp"
         android:layout_marginVertical="5dp"
-        android:background="@drawable/bg_item"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:padding="10dp">
+        android:orientation="vertical">
 
-        <!-- 选中图标 -->
-        <ImageView
-            android:id="@+id/iv_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center"
-            loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
-            android:src="@drawable/img_plane" />
+        <!-- 侧滑布局 -->
+        <com.mcxtzhang.swipemenulib.SwipeMenuLayout
+            android:id="@+id/swipe_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <!-- 数据展示区域 -->
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <!-- 第一行：运单号、件数、重量、计费重量、代理 -->
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <!-- 运单号 -->
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        completeSpace="@{4}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="运单号："
-                        android:textSize="16sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{bean.wbNo}"
-                        android:textColor="@color/colorPrimary"
-                        android:textSize="16sp" />
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <!-- 件数 -->
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        completeSpace="@{5}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="件数："
-                        android:textSize="16sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{String.valueOf(bean.pc)}"
-                        android:textSize="16sp" />
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <!-- 重量 -->
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        completeSpace="@{5}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="重量："
-                        android:textSize="16sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{String.valueOf((int)bean.weight)}"
-                        android:textSize="16sp" />
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <!-- 计费重量 -->
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        completeSpace="@{5}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="计费重量："
-                        android:textSize="16sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{String.valueOf((int)bean.cashWeight)}"
-                        android:textSize="16sp" />
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <!-- 代理 -->
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        completeSpace="@{5}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="代理："
-                        android:textSize="16sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{bean.agentCode}"
-                        android:textSize="16sp" />
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <!-- 第二行：特码、服务费、仓储费、总金额、提取时间 -->
+            <!-- 主列表项容器 -->
             <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/ll"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp">
+                android:background="@drawable/bg_item"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="10dp">
 
-                <!-- 特码 -->
+            <!-- 选中图标 -->
+            <ImageView
+                android:id="@+id/iv_icon"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
+                android:src="@drawable/img_plane" />
+
+            <!-- 数据展示区域 -->
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <!-- 第一行：运单号、件数、重量、计费重量、代理 -->
                 <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
-                    android:gravity="center_vertical">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                    <TextView
-                        completeSpace="@{4}"
-                        android:layout_width="wrap_content"
+                    <!-- 运单号 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="特码："
-                        android:textSize="16sp" />
+                        android:layout_weight="1.0"
+                        android:gravity="center_vertical">
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                        <TextView
+                            completeSpace="@{4}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="运单号："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{bean.wbNo}"
+                            android:textColor="@color/colorPrimary"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 件数 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.spCode}"
-                        android:textSize="16sp" />
+                        android:layout_weight="0.7"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            completeSpace="@{5}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="件数："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{String.valueOf(bean.pc)}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 重量 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.7"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            completeSpace="@{5}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="重量："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{String.valueOf((int)bean.weight)}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 计费重量 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.7"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            completeSpace="@{5}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="计费重量："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{String.valueOf((int)bean.cashWeight)}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 代理 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.2"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            completeSpace="@{5}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="代理："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{bean.agentCode}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- 服务费 -->
+                <!-- 第二行：特码、服务费、仓储费、总金额、提取时间 -->
                 <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:gravity="center_vertical">
+                    android:layout_marginTop="10dp">
 
-                    <TextView
-                        completeSpace="@{5}"
-                        android:layout_width="wrap_content"
+                    <!-- 特码 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="服务费："
-                        android:textSize="16sp" />
+                        android:layout_weight="1.0"
+                        android:gravity="center_vertical">
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                        <TextView
+                            completeSpace="@{4}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="特码："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{bean.spCode}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 服务费 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@{String.valueOf((int)bean.optCharge)}"
-                        android:textSize="16sp" />
+                        android:layout_weight="0.7"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            completeSpace="@{5}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="服务费："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{String.valueOf((int)bean.optCharge)}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 仓储费 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.7"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            completeSpace="@{5}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="仓储费："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{String.valueOf((int)bean.whsCharge)}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 总金额 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.7"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            completeSpace="@{5}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="总金额："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{String.valueOf((int)bean.amount)}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 提取时间 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.2"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            completeSpace="@{5}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="提取时间："
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{bean.chargeTime}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- 仓储费 -->
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:gravity="center_vertical">
+            </LinearLayout>
 
-                    <TextView
-                        completeSpace="@{5}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="仓储费："
-                        android:textSize="16sp" />
+            <!-- 右侧箭头 -->
+            <ImageView
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/img_pda_right" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{String.valueOf((int)bean.whsCharge)}"
-                        android:textSize="16sp" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-                </androidx.appcompat.widget.LinearLayoutCompat>
+        <!-- 侧滑菜单区域 -->
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
 
-                <!-- 总金额 -->
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:gravity="center_vertical">
+            <!-- 修改按钮 -->
+            <TextView
+                android:id="@+id/btn_edit"
+                style="@style/tv_item_action"
+                android:background="@color/colorPrimary"
+                android:text="修改" />
 
-                    <TextView
-                        completeSpace="@{5}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="总金额："
-                        android:textSize="16sp" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{String.valueOf((int)bean.amount)}"
-                        android:textSize="16sp" />
+        </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
 
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <!-- 提取时间 -->
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        completeSpace="@{5}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="提取时间："
-                        android:textSize="16sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{bean.chargeTime}"
-                        android:textSize="16sp" />
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-        </LinearLayout>
-
-        <!-- 右侧箭头 -->
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:src="@drawable/img_pda_right" />
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 
 </layout>