feat: 国际出港仓库清仓弹窗增加备注输入框
清仓操作弹窗在「清仓正常」下拉基础上新增选填备注,提交时随 clearRemark 字段传给 updateClear 接口 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -79,7 +79,8 @@ class IntExpStorageUseActivity :
|
||||
IntExpMoveClearDialogModel { dialog ->
|
||||
// 用户点击保存后,执行清仓操作
|
||||
val clearNormal = dialog.clearNormal.value ?: ""
|
||||
viewModel.performClear(clearNormal, maWbListForClear)
|
||||
val clearRemark = dialog.clearRemark.value ?: ""
|
||||
viewModel.performClear(clearNormal, clearRemark, maWbListForClear)
|
||||
}.show(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,9 @@ class IntExpMoveClearDialogModel(
|
||||
// 清仓正常(存储的是 code:"0" 或 "1")
|
||||
val clearNormal = MutableLiveData("")
|
||||
|
||||
// 清仓备注(选填)
|
||||
val clearRemark = MutableLiveData("")
|
||||
|
||||
// 清仓正常选项列表
|
||||
val clearNormalList = MutableLiveData<List<KeyValue>>().apply {
|
||||
value = listOf(
|
||||
|
||||
@@ -140,9 +140,10 @@ class IntExpStorageUseViewModel : BasePageViewModel() {
|
||||
/**
|
||||
* 执行清仓操作
|
||||
* @param clearNormal 清仓正常("0"或"1")
|
||||
* @param clearRemark 清仓备注(选填)
|
||||
* @param maWbListForClear 包含选中子列表项的主列表数据
|
||||
*/
|
||||
fun performClear(clearNormal: String, maWbListForClear: List<GjcMaWb>) {
|
||||
fun performClear(clearNormal: String, clearRemark: String, maWbListForClear: List<GjcMaWb>) {
|
||||
if (maWbListForClear.isEmpty()) {
|
||||
showToast("请至少选择一个库位")
|
||||
return
|
||||
@@ -151,6 +152,7 @@ class IntExpStorageUseViewModel : BasePageViewModel() {
|
||||
// 构建请求参数:完整的主子列表结构
|
||||
val params = mapOf(
|
||||
"clearNormal" to clearNormal,
|
||||
"clearRemark" to clearRemark.ifEmpty { null },
|
||||
"maWbList" to maWbListForClear
|
||||
).toRequestBody()
|
||||
|
||||
|
||||
@@ -61,6 +61,32 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- 备注 -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="15dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
completeSpace="@{5}"
|
||||
android:text="备注:"
|
||||
android:textColor="@color/text_normal"
|
||||
android:textSize="16sp" />
|
||||
|
||||
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
hint='@{"请输入备注"}'
|
||||
type="@{SearchLayoutType.INPUT}"
|
||||
value="@={model.clearRemark}" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- 底部按钮 -->
|
||||
|
||||
Reference in New Issue
Block a user