diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/page/move/IntExpMoveEditActivity.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/page/move/IntExpMoveEditActivity.kt
index 81efe26..e66ea72 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/page/move/IntExpMoveEditActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/page/move/IntExpMoveEditActivity.kt
@@ -41,6 +41,9 @@ class IntExpMoveEditActivity :
binding.viewModel = viewModel
+ // 手机主信息卡:按圆角裁切子 View,让左侧蓝色装饰条贴合卡片圆角(平板布局无该 id)
+ binding.cardWaybill?.clipToOutline = true
+
// 绑定图片 RecyclerView 引用
viewModel.rvImages = binding.rvImages
diff --git a/module_gjc/src/main/res/drawable/bg_move_edit_card.xml b/module_gjc/src/main/res/drawable/bg_move_edit_card.xml
new file mode 100644
index 0000000..3b9cf05
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/bg_move_edit_card.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
diff --git a/module_gjc/src/main/res/drawable/bg_move_edit_card_main.xml b/module_gjc/src/main/res/drawable/bg_move_edit_card_main.xml
new file mode 100644
index 0000000..857d7aa
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/bg_move_edit_card_main.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
diff --git a/module_gjc/src/main/res/drawable/bg_move_edit_dot_done.xml b/module_gjc/src/main/res/drawable/bg_move_edit_dot_done.xml
new file mode 100644
index 0000000..2eaea09
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/bg_move_edit_dot_done.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/module_gjc/src/main/res/drawable/bg_move_edit_dot_pending.xml b/module_gjc/src/main/res/drawable/bg_move_edit_dot_pending.xml
new file mode 100644
index 0000000..2814948
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/bg_move_edit_dot_pending.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/module_gjc/src/main/res/drawable/bg_move_edit_tag_red.xml b/module_gjc/src/main/res/drawable/bg_move_edit_tag_red.xml
new file mode 100644
index 0000000..5880d4e
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/bg_move_edit_tag_red.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml b/module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml
index be22b06..735eb57 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml
@@ -5,17 +5,16 @@
详情(DetailsPageType.Details):列表卡片「查看详情」进入,全部只读;
编辑(DetailsPageType.Modify):列表卡片「编辑」进入(对应平板侧滑「编辑」),仅备注与交接图片可改。
- 样式沿用设计稿 05_出港移库「运单详情」:蓝色表头卡片 + 两列字段网格;移库人/移库时间取列表数据(listBean)。
+ 样式取自「移库编辑」HTML 原型:主信息卡左侧蓝色装饰条,分区卡白底表头 + 分割线,两列字段网格;移库人/移库时间取列表数据(listBean)。
-->
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
-
-
+
-
+
+
+ android:background="@drawable/bg_move_edit_card_main"
+ android:elevation="6dp"
+ android:outlineAmbientShadowColor="@color/move_edit_shadow_main"
+ android:outlineSpotShadowColor="@color/move_edit_shadow_main"
+ tools:targetApi="28"
+ android:orientation="horizontal">
+
+
-
+ android:layout_weight="1"
+ android:orientation="vertical">
-
+
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:paddingVertical="12dp"
+ android:paddingStart="17dp"
+ android:paddingEnd="16dp">
+
+
+
+
+
+
+
+
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:background="@color/move_edit_card_border" />
-
+ android:orientation="vertical"
+ android:paddingStart="17dp"
+ android:paddingTop="16dp"
+ android:paddingEnd="16dp"
+ android:paddingBottom="16dp">
-
+
+
-
+
+
-
-
+
+
-
-
-
-
-
+ android:orientation="vertical">
-
+
+
+
+
+
+
+ android:layout_marginStart="16dp"
+ android:orientation="vertical">
+
+
+
+
+
+
-
-
+ android:orientation="vertical">
-
+
+
+
+
+
+
+ android:layout_marginStart="16dp"
+ android:orientation="vertical">
+
+
+
+
+
+
-
-
+ android:orientation="vertical">
-
+
+
+
+
+
+
+ android:layout_marginStart="16dp"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
@@ -194,66 +335,122 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:background="@drawable/bg_phone_card"
+ android:background="@drawable/bg_move_edit_card"
+ android:elevation="2dp"
+ android:outlineAmbientShadowColor="@color/move_edit_shadow"
+ android:outlineSpotShadowColor="@color/move_edit_shadow"
+ tools:targetApi="28"
android:orientation="vertical"
android:visibility="@{viewModel.listBean != null && viewModel.listBean.isMoved ? View.VISIBLE : View.GONE}">
+
+
+ android:orientation="vertical"
+ android:padding="16dp">
-
+ android:orientation="horizontal">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
-
-
+
+
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:padding="16dp">
+
+
+
+
+
+
diff --git a/module_gjc/src/main/res/values/colors_move_edit.xml b/module_gjc/src/main/res/values/colors_move_edit.xml
new file mode 100644
index 0000000..74fc227
--- /dev/null
+++ b/module_gjc/src/main/res/values/colors_move_edit.xml
@@ -0,0 +1,19 @@
+
+
+
+ #3B6FE0
+ #E6EBF2
+ #DCE4F0
+ #1B3F8F
+ #132239
+ #6B7A8D
+ #5A6B84
+ #1F2A3C
+ #6B7280
+ #D93025
+ #F5A623
+ #10B981
+
+ #80101E33
+ #50101E33
+