From bd8d6f683a8072c02bcf307928a996683a5b447e Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Tue, 16 Dec 2025 10:21:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF=20?=
 =?UTF-8?q?=E6=94=B6=E8=BF=90=E6=A3=80=E6=9F=A5=20=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../viewModel/GjcInspectionDetailsViewModel.kt  | 17 +++++++++++------
 .../layout/activity_gjc_inspection_details.xml  |  6 +++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt
index f2f5da4..80061bf 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionDetailsViewModel.kt
@@ -31,6 +31,9 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
     // 详情数据
     val dataBean = MutableLiveData<GjcInspectionBean>()
 
+    // 退回原因（独立字段，初始为空）
+    val returnReason = MutableLiveData("")
+
     /**
      * 初始化数据
      */
@@ -63,7 +66,7 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
     fun auditPass() {
         val bean = dataBean.value ?: return
         getTopActivity().showConfirmDialog("确定要通过该单证吗？") {
-            performAudit(bean, true, "通过")
+            performAudit(bean, true, "通过", "")
         }
     }
 
@@ -72,12 +75,13 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
      */
     fun auditReject() {
         val bean = dataBean.value ?: return
-        if (TextUtils.isEmpty(bean.remark)) {
-            showToast("请在备注中输入退回原因")
+        val reason = returnReason.value ?: ""
+        if (reason.isEmpty()) {
+            showToast("请输入退回原因")
             return
         }
         getTopActivity().showConfirmDialog("确定要退回该单证吗？") {
-            performAudit(bean, false, "退回")
+            performAudit(bean, false, "退回", reason)
         }
     }
 
@@ -86,8 +90,9 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
      * @param bean 数据
      * @param isPass true:通过, false:退回
      * @param action 操作名称（用于提示）
+     * @param reason 退回原因（仅退回时使用）
      */
-    private fun performAudit(bean: GjcInspectionBean, isPass: Boolean, action: String) {
+    private fun performAudit(bean: GjcInspectionBean, isPass: Boolean, action: String, reason: String) {
         // 构建请求参数：数组对象，包含 maWbId、wbNo、prefix、no、reviewStatus（必传）
         // 使用数据自身的 reviewStatus 值
         val requestData = listOf(
@@ -105,7 +110,7 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
             if (isPass) {
                 NetApply.api.passGjcInspection(requestData)
             } else {
-                NetApply.api.backGjcInspection(bean.remark, requestData)
+                NetApply.api.backGjcInspection(reason, requestData)
             }
         }) {
             onSuccess = {
diff --git a/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml b/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
index 4a5ee3a..4da1bfa 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_inspection_details.xml
@@ -297,15 +297,15 @@
 
                     </LinearLayout>
 
-                    <!-- 备注 -->
+                    <!-- 退回原因 -->
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{true}"
                         inputHeight="@{80}"
                         title='@{"原因"}'
                         titleLength="@{5}"
-                        hint=""
+                        hint='@{"请输入退回原因"}'
                         type="@{DataLayoutType.INPUT}"
-                        value='@={viewModel.dataBean.remark}'
+                        value='@={viewModel.returnReason}'
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp" />