From 128b7c3e4e5e05cc5a2006617a51d5c9e20eecaa Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Sat, 20 Jun 2026 12:44:54 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF/?=
 =?UTF-8?q?=E8=BF=9B=E6=B8=AF=E5=B0=8F=E5=BC=B9=E7=AA=97=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=8F=8A=E5=8F=96=E6=B6=88=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

表单式小弹窗统一为480dp宽，底部按钮统一取消/确定；
分配人员弹窗去掉航班行、分配人下拉改为铺满。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../layout/dialog_gjc_assemble_allocate.xml   | 25 +++++++------------
 .../layout/dialog_int_exp_arrive_delete.xml   |  4 +--
 .../layout/dialog_int_exp_arrive_reset.xml    |  4 +--
 .../res/layout/dialog_int_exp_in_storage.xml  |  4 +--
 .../res/layout/dialog_int_exp_load_delete.xml |  4 +--
 .../res/layout/dialog_int_exp_load_reset.xml  |  4 +--
 .../layout/dialog_int_exp_modify_storage.xml  |  4 +--
 .../res/layout/dialog_int_exp_move_clear.xml  |  4 +--
 .../dialog_int_exp_out_waiting_trans.xml      |  2 +-
 .../layout/dialog_int_exp_tally_delete.xml    |  4 +--
 .../res/layout/dialog_int_exp_tally_reset.xml |  4 +--
 .../layout/dialog_int_arr_manifest_delete.xml |  4 +--
 .../res/layout/dialog_int_imp_in_storage.xml  |  4 +--
 .../layout/dialog_int_imp_modify_storage.xml  |  4 +--
 .../res/layout/dialog_int_imp_move_clear.xml  |  4 +--
 .../layout/dialog_int_imp_tally_delete.xml    |  4 +--
 .../res/layout/dialog_int_imp_tally_reset.xml |  4 +--
 17 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/module_gjc/src/main/res/layout/dialog_gjc_assemble_allocate.xml b/module_gjc/src/main/res/layout/dialog_gjc_assemble_allocate.xml
index 0043380..1078be8 100644
--- a/module_gjc/src/main/res/layout/dialog_gjc_assemble_allocate.xml
+++ b/module_gjc/src/main/res/layout/dialog_gjc_assemble_allocate.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="500dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_radius_10"
         android:gravity="center_horizontal"
@@ -28,33 +28,26 @@
             android:textSize="18sp"
             android:textStyle="bold" />
 
-        <!-- 航班信息显示 -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="15dp"
-            android:layout_marginTop="15dp"
-            android:text='@{"航班：" + model.flightInfo}'
-            android:textColor="@color/text_normal"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
         <!-- 分配人下拉选择 -->
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center_vertical">
+            android:layout_marginHorizontal="30dp"
+            android:layout_marginTop="30dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="分配人："
+                android:textColor="@color/text_normal"
                 android:textSize="16sp" />
 
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
-                android:layout_width="240dp"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 type="@{SearchLayoutType.SPINNER}"
                 list="@{model.assembleCompanyList}"
                 value="@={model.allocator}" />
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml b/module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml
index 5487fef..a8f4ec4 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_arrive_delete.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onConfirmClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_arrive_reset.xml b/module_gjc/src/main/res/layout/dialog_int_exp_arrive_reset.xml
index f2ff822..de6675c 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_arrive_reset.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_arrive_reset.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_in_storage.xml b/module_gjc/src/main/res/layout/dialog_int_exp_in_storage.xml
index 8b64f3b..0d6fee6 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_in_storage.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_in_storage.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml b/module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml
index 6535df8..b21a76f 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_load_delete.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onConfirmClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_load_reset.xml b/module_gjc/src/main/res/layout/dialog_int_exp_load_reset.xml
index d17a181..b7f0192 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_load_reset.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_load_reset.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_modify_storage.xml b/module_gjc/src/main/res/layout/dialog_int_exp_modify_storage.xml
index ab52d8f..31919b7 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_modify_storage.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_modify_storage.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml b/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml
index 213c10a..88206ec 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -78,7 +78,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_out_waiting_trans.xml b/module_gjc/src/main/res/layout/dialog_int_exp_out_waiting_trans.xml
index 45733b6..e56f877 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_out_waiting_trans.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_out_waiting_trans.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml b/module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml
index 738ec77..53a2237 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_tally_delete.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onConfirmClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_tally_reset.xml b/module_gjc/src/main/res/layout/dialog_int_exp_tally_reset.xml
index 9256b5f..b9808fb 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_tally_reset.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_tally_reset.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjj/src/main/res/layout/dialog_int_arr_manifest_delete.xml b/module_gjj/src/main/res/layout/dialog_int_arr_manifest_delete.xml
index 4d58efe..b234784 100644
--- a/module_gjj/src/main/res/layout/dialog_int_arr_manifest_delete.xml
+++ b/module_gjj/src/main/res/layout/dialog_int_arr_manifest_delete.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onConfirmClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjj/src/main/res/layout/dialog_int_imp_in_storage.xml b/module_gjj/src/main/res/layout/dialog_int_imp_in_storage.xml
index 48c5bce..2dba956 100644
--- a/module_gjj/src/main/res/layout/dialog_int_imp_in_storage.xml
+++ b/module_gjj/src/main/res/layout/dialog_int_imp_in_storage.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjj/src/main/res/layout/dialog_int_imp_modify_storage.xml b/module_gjj/src/main/res/layout/dialog_int_imp_modify_storage.xml
index f4fcb1f..d3bc331 100644
--- a/module_gjj/src/main/res/layout/dialog_int_imp_modify_storage.xml
+++ b/module_gjj/src/main/res/layout/dialog_int_imp_modify_storage.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml b/module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml
index 6832dc3..52dc564 100644
--- a/module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml
+++ b/module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -78,7 +78,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjj/src/main/res/layout/dialog_int_imp_tally_delete.xml b/module_gjj/src/main/res/layout/dialog_int_imp_tally_delete.xml
index dd5e3c1..b13f94f 100644
--- a/module_gjj/src/main/res/layout/dialog_int_imp_tally_delete.xml
+++ b/module_gjj/src/main/res/layout/dialog_int_imp_tally_delete.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -130,7 +130,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onConfirmClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>
 
diff --git a/module_gjj/src/main/res/layout/dialog_int_imp_tally_reset.xml b/module_gjj/src/main/res/layout/dialog_int_imp_tally_reset.xml
index 338827a..357ad15 100644
--- a/module_gjj/src/main/res/layout/dialog_int_imp_tally_reset.xml
+++ b/module_gjj/src/main/res/layout/dialog_int_imp_tally_reset.xml
@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="600dp"
+        android:layout_width="480dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_dialog_f2_radius_10"
         android:gravity="center_horizontal"
@@ -79,7 +79,7 @@
             <TextView
                 style="@style/tv_bottom_btn"
                 android:onClick="@{()->model.onSaveClick()}"
-                android:text="保存" />
+                android:text="确定" />
 
         </LinearLayout>