diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpMoveViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpMoveViewModel.kt
index 1262d9d..ccdf2bf 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpMoveViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpMoveViewModel.kt
@@ -152,7 +152,7 @@ class IntExpMoveViewModel : BasePageViewModel(), IOnItemClickListener {
"by1" to by1.value.noNull(),
"dest1" to dest1.value.noNull(),
"moveState" to moveState.value.noNull(),
- "likeNo" to waybillNo.value.noNull()
+ "wbNo" to waybillNo.value.noNull()
)
// 列表参数(含分页)
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_move.xml b/module_gjc/src/main/res/layout/activity_int_exp_move.xml
index 1d347b0..95b066c 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_move.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_move.xml
@@ -121,6 +121,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
+ itemLayoutId="@{viewModel.itemLayoutId}"
+ viewHolder="@{viewModel.itemViewHolder}"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="3"
tools:listitem="@layout/item_int_exp_move" />
diff --git a/module_gjc/src/main/res/layout/item_int_exp_move.xml b/module_gjc/src/main/res/layout/item_int_exp_move.xml
index 81f469c..4b81406 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_move.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_move.xml
@@ -17,135 +17,282 @@
+ android:layout_marginHorizontal="10dp"
+ android:layout_marginTop="10dp"
+ android:orientation="vertical">
-
-
-
-
+
+ android:background="@drawable/bg_white_radius_8"
+ android:orientation="horizontal"
+ android:padding="15dp"
+ android:gravity="center_vertical">
-
+
+
+
+
+ android:layout_marginLeft="15dp"
+ android:layout_weight="1"
+ android:orientation="vertical">
-
+
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_marginTop="10dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+