diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt index 9c74f60..d50e1fd 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt @@ -36,7 +36,6 @@ class GjcWeighingViewModel : BasePageViewModel() { val totalCount = MutableLiveData("0") // 合计票数 val totalPc = MutableLiveData("0") // 总件数 val totalWeight = MutableLiveData("0") // 总重量 - val cargoWeight = MutableLiveData("0") // 总货重 /////////////////////////////////////////////////////////////////////////// // 方法区 @@ -79,6 +78,13 @@ class GjcWeighingViewModel : BasePageViewModel() { GjcWeighingRecordListActivity.start(getTopActivity()) } + /** + * 提前运抵 + */ + fun arrivedAhead() { + + } + /** * 获取列表数据 */ @@ -121,7 +127,6 @@ class GjcWeighingViewModel : BasePageViewModel() { totalCount.value = (data?.wbNumber ?: 0).toString() totalPc.value = (data?.totalPc ?: 0).toString() totalWeight.value = (data?.totalWeight ?: 0.0).toString() - cargoWeight.value = (data?.cargoWeight ?: 0.0).toString() } } } diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml index bac435f..4595e2e 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml @@ -31,73 +31,77 @@ + value="@={viewModel.flightDate}" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + value="@={viewModel.flightNo}" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + value="@={viewModel.agentCode}" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + value="@={viewModel.spCode}" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + value="@={viewModel.waybillNo}" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + android:gravity="center_vertical|start" + android:orientation="horizontal" + android:paddingHorizontal="24dp"> @@ -113,10 +117,10 @@ @@ -167,18 +171,15 @@ android:textStyle="bold" tools:text="总重量:100" /> - + + +