eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 国际出港 出港组装 开始组装

Browse Source
This commit is contained in:
杨建宽
2025-12-09 17:58:25 +08:00
parent 2871cbf784
commit 7d39cbf70f
8 changed files with 200 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
View File

@@ -74,7 +74,7 @@
android:id="@+id/rv_assemble_info"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_weight="0.6"
android:layout_marginBottom="16dp" />
<!-- 组装位置标题 -->
@@ -93,11 +93,12 @@
android:layout_marginBottom="8dp"
app:dividerColor="@color/line" />
<!-- 组装位置列表 -->
<!-- 组装位置列表 - 固定高度2/5，支持滚动 -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_assemble_position"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="0dp"
android:layout_weight="0.4" />
</LinearLayout>
</LinearLayout>
@@ -122,12 +123,16 @@
<!-- 搜索框 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayoutNew
android:id="@+id/tvWbSearch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="4dp"
hint='@{"请输入搜索内容"}'
type="@{SearchLayoutType.INPUT}"
value="@={viewModel.searchText}" />
value="@={viewModel.searchText}"
icon="@{@drawable/img_search}"
setSearchIconClickListener="@{viewModel::loadWaitingAssembleWaybills}"
setOnSearchListener="@{viewModel::loadWaitingAssembleWaybills}" />
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
@@ -135,6 +140,68 @@
android:layout_marginBottom="8dp"
app:dividerColor="@color/line" />
<!-- 运单列表表头 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="4dp"
android:orientation="horizontal"
android:background="@color/color_f2"
android:gravity="center_vertical"
android:paddingHorizontal="8dp">
<!-- 序号 -->
<TextView
android:layout_width="40dp"
android:layout_height="wrap_content"
android:text="序号"
android:textColor="@color/text_normal"
android:textSize="14sp"
android:textStyle="bold"
android:gravity="center" />
<!-- 运单号 -->
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="运单号"
android:textColor="@color/text_normal"
android:textSize="14sp"
android:textStyle="bold" />
<!-- 件数 -->
<TextView
android:layout_width="60dp"
android:layout_height="wrap_content"
android:text="件数"
android:textColor="@color/text_normal"
android:textSize="14sp"
android:textStyle="bold"
android:gravity="center" />
<!-- 重量 -->
<TextView
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="重量"
android:textColor="@color/text_normal"
android:textSize="14sp"
android:textStyle="bold"
android:gravity="end" />
<!-- 配载航班 -->
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:text="配载航班"
android:textColor="@color/text_normal"
android:textSize="14sp"
android:textStyle="bold"
android:gravity="center" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_waybill_list"
android:layout_width="match_parent"

10
module_gjc/src/main/res/layout/item_assemble_waybill.xml
View File

@@ -55,5 +55,15 @@
android:textColor="@{bean.isMarked ? @color/text_red : @color/text_normal}"
android:textSize="14sp"
android:gravity="end" />
<!-- 配载航班 -->
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:text="@{bean.flight}"
android:textColor="@{bean.isMarked ? @color/text_red : @color/text_normal}"
android:textSize="14sp"
android:gravity="center" />
</LinearLayout>
</layout>