feat: opt form

This commit is contained in:
2026-03-18 22:36:05 +08:00
parent aac2c860c6
commit 8b666364ae
5 changed files with 276 additions and 143 deletions

View File

@@ -50,7 +50,7 @@
android:layout_weight="1"
enable="@{false}"
title='@{"运 单 号"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.wbNo}' />
@@ -60,7 +60,7 @@
android:layout_weight="1"
enable="@{false}"
title='@{"代 理 人"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.agentCode}' />
@@ -70,7 +70,7 @@
android:layout_weight="1"
enable="@{false}"
title='@{"特 码"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.spCode}' />
@@ -89,7 +89,7 @@
android:layout_weight="1"
enable="@{false}"
title='@{"提货编号"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.pkId}' />
@@ -99,7 +99,7 @@
android:layout_weight="1"
enable="@{false}"
title='@{"件数"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.pc)}' />
@@ -109,7 +109,7 @@
android:layout_weight="1"
enable="@{false}"
title='@{"重量"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.weight)}' />
@@ -128,7 +128,7 @@
android:layout_weight="1"
enable="@{false}"
title='@{"计费重量"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.cashWeight)}' />
@@ -139,7 +139,7 @@
enable="@{true}"
hint='@{"请输入信息费"}'
title='@{"信息费"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.tranChargeStr}' />
@@ -149,13 +149,13 @@
android:layout_weight="1"
enable="@{false}"
title='@{"服务费"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.optCharge)}' />
</LinearLayout>
<!-- 第4行仓储费、抽单费、冷藏费(可编辑) -->
<!-- 第4行仓储费、文件处理费、叉车费(可编辑) -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -169,7 +169,7 @@
enable="@{true}"
hint='@{"请输入仓储费"}'
title='@{"仓储费"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.whsChargeStr}' />
@@ -178,9 +178,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{true}"
hint='@{"请输入抽单费"}'
title='@{"抽单费"}'
titleLength="@{5}"
hint='@{"请输入文件处理费"}'
title='@{"文件处理费"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.drawBillChargeStr}' />
@@ -189,32 +189,21 @@
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{true}"
hint='@{"请输入冷藏费"}'
title='@{"冷藏费"}'
titleLength="@{5}"
hint='@{"请输入叉车费"}'
title='@{"叉车费"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.efrChargeStr}' />
value='@={viewModel.svlChargeStr}' />
</LinearLayout>
<!-- 第5行铲车费、理货费(可编辑)、总金额(只读 -->
<!-- 第5行理货费、精密仪器处理费、活体动物处理费(可编辑 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{true}"
hint='@{"请输入铲车费"}'
title='@{"铲车费"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.svlChargeStr}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -222,7 +211,7 @@
enable="@{true}"
hint='@{"请输入理货费"}'
title='@{"理货费"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.tallyChargeStr}' />
@@ -230,11 +219,64 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"总金额"}'
titleLength="@{5}"
enable="@{true}"
hint='@{"请输入精密仪器处理费"}'
title='@{"精密仪器处理费"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.amount)}' />
value='@={viewModel.precisionChargeStr}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{true}"
hint='@{"请输入活体动物处理费"}'
title='@{"活体动物处理费"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.animalChargeStr}' />
</LinearLayout>
<!-- 第6行总费用只读实时计算 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"总费用"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.totalAmountStr}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="invisible"
enable="@{false}"
title='@{""}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{""}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="invisible"
enable="@{false}"
title='@{""}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{""}' />
</LinearLayout>

View File

@@ -41,34 +41,34 @@
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"运单号"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.wbNo}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{viewModel.dataBean.wbNo}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"代理人"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.agentCode}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{viewModel.dataBean.agentCode}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
enable="@{false}"
title='@{"特码"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.spCode}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
enable="@{false}"
title='@{"特码"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.spCode}' />
</LinearLayout>
@@ -80,34 +80,34 @@
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"提货编号"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.pkId}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{viewModel.dataBean.pkId}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"件数"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.pc)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{String.valueOf(viewModel.dataBean.pc)}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
enable="@{false}"
title='@{"重量"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.weight)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
enable="@{false}"
title='@{"重量"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.weight)}' />
</LinearLayout>
@@ -119,38 +119,38 @@
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"计费重量"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.cashWeight)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{String.valueOf(viewModel.dataBean.cashWeight)}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"信息费"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.tranCharge)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{String.valueOf(viewModel.dataBean.tranCharge)}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"服务费"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.optCharge)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{String.valueOf(viewModel.dataBean.optCharge)}' />
</LinearLayout>
<!-- 第4行仓储费、抽单费、冷藏-->
<!-- 第4行仓储费、文件处理费、叉车-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -158,38 +158,38 @@
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"仓储费"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.whsCharge)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{String.valueOf(viewModel.dataBean.whsCharge)}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
enable="@{false}"
title='@{"抽单费"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.drawBillCharge)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
enable="@{false}"
title='@{"文件处理费"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.drawBillCharge)}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
enable="@{false}"
title='@{"冷藏费"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.efrCharge)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
enable="@{false}"
title='@{"叉车费"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.svlCharge)}' />
</LinearLayout>
<!-- 第5行铲车费、理货费、总金额 -->
<!-- 第5行理货费、精密仪器处理费、活体动物处理费 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -197,38 +197,38 @@
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
enable="@{false}"
title='@{"铲车费"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.svlCharge)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_weight="1"
enable="@{false}"
title='@{"理货费"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.tallyCharge)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{String.valueOf(viewModel.dataBean.tallyCharge)}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
enable="@{false}"
title='@{"总金额"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.amount)}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
enable="@{false}"
title='@{"精密仪器处理费"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.precisionCharge)}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"活体动物处理费"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.animalCharge)}' />
</LinearLayout>
<!-- 第6行提取时间、办理人、出库时间 -->
<!-- 第6行总费用、提取时间、办理人 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -236,34 +236,75 @@
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"总费用"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{String.valueOf(viewModel.dataBean.amount)}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"提取时间"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.chargeTime}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{viewModel.dataBean.chargeTime}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
enable="@{false}"
title='@{"办理人"}'
titleLength="@{5}"
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.chargeName}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
value='@{viewModel.dataBean.chargeName}' />
</LinearLayout>
<!-- 第7行出库时间 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
enable="@{false}"
title='@{"出库时间"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.dlvTime}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
enable="@{false}"
title='@{"出库时间"}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{viewModel.dataBean.dlvTime}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="invisible"
enable="@{false}"
title='@{""}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{""}' />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="invisible"
enable="@{false}"
title='@{""}'
titleLength="@{7}"
type="@{DataLayoutType.INPUT}"
value='@{""}' />
</LinearLayout>