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

feat: opt 货物交接单

Browse Source
This commit is contained in:
杨建宽
2025-12-15 16:53:35 +08:00
parent 7650a835f2
commit 54ea9dbe75
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcHandoverViewModel.kt
View File

@@ -41,10 +41,10 @@ class GjcHandoverViewModel : BaseViewModel() {
val cbEcFlag = MutableLiveData("1") // 默认选中"是"
/**
* 跨境电商RadioButton点击
* 跨境电商RadioButton点击（已禁用，仅根据expressName自动判断）
*/
fun onCbEcFlagClick(value: String) {
cbEcFlag.value = value
// 不允许手动点击修改，仅根据expressName自动判断
}
// ========== 防止隐含危险品检查单 ==========
@@ -132,8 +132,9 @@ class GjcHandoverViewModel : BaseViewModel() {
* 根据Bean数据更新CheckBox状态
*/
private fun updateCheckBoxState(bean: GjcHandoverSheetBean) {
// 跨境电商
cbEcFlag.value = bean.cbEcFlag ?: "1"
// 跨境电商 - 根据expressName自动判断
// 当expressName不为null且不为空时，为"是"(1)，否则为"否"(0)
cbEcFlag.value = if (!bean.expressName.isNullOrEmpty()) "1" else "0"
// 防止隐含危险品检查单
goodsNameYes.value = (bean.goodsName == "1")

46
module_gjc/src/main/res/layout/activity_gjc_handover.xml
View File

@@ -256,7 +256,7 @@
android:layout_weight="1"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="计重重量"
android:text="计费重量"
android:textColor="@color/color_33"
android:textSize="14sp" />
@@ -378,18 +378,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="@{viewModel.cbEcFlag.equals(`0`)}"
android:onClick="@{() -> viewModel.onCbEcFlagClick(`0`)}"
android:clickable="false"
android:focusable="false"
android:text="否"
android:textSize="14sp" />
android:textSize="14sp"
android:alpha="1.0" />
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:checked="@{viewModel.cbEcFlag.equals(`1`)}"
android:onClick="@{() -> viewModel.onCbEcFlagClick(`1`)}"
android:clickable="false"
android:focusable="false"
android:text="是"
android:textSize="14sp" />
android:textSize="14sp"
android:alpha="1.0" />
</RadioGroup>
</LinearLayout>
@@ -449,7 +453,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.dataBean.saleAgentCode ?? ``}"
android:minWidth="100dp"
android:textColor="@color/color_33"
tools:text="李某某" />
</LinearLayout>
@@ -486,7 +490,6 @@
android:layout_weight="2"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@{viewModel.displayAgentName}"
android:textColor="@color/color_33"
android:textSize="14sp" />
@@ -500,7 +503,7 @@
android:textColor="@color/color_33"
android:textSize="14sp" />
<EditText
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
@@ -526,7 +529,7 @@
android:textColor="@color/color_33"
android:textSize="14sp" />
<EditText
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
@@ -606,7 +609,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="0.7"
android:background="@drawable/bg_table_cell"
android:orientation="vertical">
@@ -636,7 +639,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="5.3"
android:orientation="vertical">
<LinearLayout
@@ -647,7 +650,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:layout_weight="3.3"
android:background="@drawable/bg_table_cell"
android:gravity="start|center_vertical"
android:padding="5dp"
@@ -694,7 +697,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:layout_weight="3.3"
android:background="@drawable/bg_table_cell"
android:gravity="start|center_vertical"
android:padding="5dp"
@@ -742,7 +745,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:layout_weight="3.3"
android:background="@drawable/bg_table_cell"
android:gravity="start|center_vertical"
android:padding="5dp"
@@ -789,7 +792,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:layout_weight="3.3"
android:background="@drawable/bg_table_cell"
android:gravity="start|center_vertical"
android:padding="5dp"
@@ -836,7 +839,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:layout_weight="3.3"
android:background="@drawable/bg_table_cell"
android:gravity="start|center_vertical"
android:padding="5dp"
@@ -1218,7 +1221,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="货站收运人员检查签字盖章:"
android:text='@{"货站收运人员检查签字盖章：" + viewModel.dataBean.staOpName ?? ""}'
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -1277,13 +1280,12 @@
android:textColor="@color/color_33"
android:textSize="14sp" />
<EditText
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@={viewModel.securityChannel}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>
@@ -1295,13 +1297,12 @@
android:orientation="horizontal">
<EditText
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@={viewModel.securityStartTime}"
android:textColor="@color/color_33"
android:textSize="14sp" />
@@ -1315,13 +1316,12 @@
android:textColor="@color/color_33"
android:textSize="14sp" />
<EditText
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_table_cell"
android:gravity="center"
android:text="@={viewModel.securityEndTime}"
android:textColor="@color/color_33"
android:textSize="14sp" />
</LinearLayout>