From 36d74c3f0d3f39c5708fac708bdaa2e5246c6548 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <timyih@icloud.com>
Date: Wed, 14 Oct 2026 20:21:18 -0700
Subject: [PATCH] =?UTF-8?q?fix(phone):=20=E5=87=BA=E6=B8=AF/=E8=BF=9B?=
 =?UTF-8?q?=E6=B8=AF=E4=BB=93=E5=BA=93=E5=8D=A1=E7=89=87=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E8=A1=8C=E5=89=8D=E8=A1=A5=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

备注行原为纯文字，与上方带 14dp 图标的字段行不一致；改为 ic_phone_clipboard 图标 + 文字，
进港仓库卡片同步（#630 排查确认进港备注行本身正常，仅清仓时填了备注才显示）。

Refs: 禅道 Bug #629, #630

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../res/layout/item_int_exp_storage_use.xml   | 30 ++++++++++++++-----
 .../res/layout/item_int_imp_storage_use.xml   | 30 ++++++++++++++-----
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/module_gjc/src/main/res/layout/item_int_exp_storage_use.xml b/module_gjc/src/main/res/layout/item_int_exp_storage_use.xml
index 7e5f463..5d291be 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_storage_use.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_storage_use.xml
@@ -212,16 +212,32 @@
 
         </LinearLayout>
 
-        <!-- 清仓备注（与平板列表第三行一致，无备注时不显示） -->
-        <TextView
+        <!-- 清仓备注（与平板列表第三行一致，无备注时不显示；图标与上方字段行同规格） -->
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:text='@{"备注：" + bean.clearRemark}'
-            android:textColor="@color/phone_text_body"
-            android:textSize="13sp"
-            android:visibility="@{bean.clearRemark == null || bean.clearRemark.empty ? View.GONE : View.VISIBLE}"
-            tools:text="备注：正常清仓" />
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:visibility="@{bean.clearRemark == null || bean.clearRemark.empty ? View.GONE : View.VISIBLE}">
+
+            <ImageView
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:src="@drawable/ic_phone_clipboard"
+                android:tint="@color/phone_text_body" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:layout_weight="1"
+                android:text='@{"备注：" + bean.clearRemark}'
+                android:textColor="@color/phone_text_body"
+                android:textSize="13sp"
+                tools:text="备注：正常清仓" />
+
+        </LinearLayout>
 
         <!-- ==================== 操作按钮行：清仓 / 修改库位 / 出库 / 入库 ==================== -->
         <LinearLayout
diff --git a/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml b/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
index df42734..521c3d0 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
@@ -212,16 +212,32 @@
 
         </LinearLayout>
 
-        <!-- 清仓备注（与平板列表第三行一致，无备注时不显示） -->
-        <TextView
+        <!-- 清仓备注（与平板列表第三行一致，无备注时不显示；图标与上方字段行同规格） -->
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:text='@{"备注：" + bean.clearRemark}'
-            android:textColor="@color/phone_text_body"
-            android:textSize="13sp"
-            android:visibility="@{bean.clearRemark == null || bean.clearRemark.empty ? View.GONE : View.VISIBLE}"
-            tools:text="备注：正常清仓" />
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:visibility="@{bean.clearRemark == null || bean.clearRemark.empty ? View.GONE : View.VISIBLE}">
+
+            <ImageView
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:src="@drawable/ic_phone_clipboard"
+                android:tint="@color/phone_text_body" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:layout_weight="1"
+                android:text='@{"备注：" + bean.clearRemark}'
+                android:textColor="@color/phone_text_body"
+                android:textSize="13sp"
+                tools:text="备注：正常清仓" />
+
+        </LinearLayout>
 
         <!-- ==================== 操作按钮行：清仓 / 修改库位 / 出库 / 入库 ==================== -->
         <LinearLayout