From 0d7367cdc8952ab2cdfcdf88a3c9eea6b47ea268 Mon Sep 17 00:00:00 2001 From: zxj <275873859@qq.com> Date: Thu, 21 Aug 2025 18:31:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=A1=AB=E5=85=85=E5=90=8E=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sw/inbound/model/request/GoodsAddParam.kt | 5 +++++ .../com/sw/inbound/ui/page/SelfProcurementScreen.kt | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/sw/inbound/model/request/GoodsAddParam.kt b/app/src/main/java/com/sw/inbound/model/request/GoodsAddParam.kt index ae7a177..a4faa5d 100644 --- a/app/src/main/java/com/sw/inbound/model/request/GoodsAddParam.kt +++ b/app/src/main/java/com/sw/inbound/model/request/GoodsAddParam.kt @@ -101,6 +101,11 @@ data class GoodsAddParam( return GlobalData.unitTypeList.find { it.id == unitId }?.value ?: "" } + val unitIdStrPlace: String + get() { + return if (unitIdStr.isEmpty()) "-" else unitIdStr + } + val purchasePriceStr: String get() { if (purchasePrice == null) { diff --git a/app/src/main/java/com/sw/inbound/ui/page/SelfProcurementScreen.kt b/app/src/main/java/com/sw/inbound/ui/page/SelfProcurementScreen.kt index ec52064..c9e2052 100644 --- a/app/src/main/java/com/sw/inbound/ui/page/SelfProcurementScreen.kt +++ b/app/src/main/java/com/sw/inbound/ui/page/SelfProcurementScreen.kt @@ -500,10 +500,14 @@ private fun DialogRightEditView(viewModel: SelfProcurementViewModel) { viewModel.updateGoodsAddParam(goodsAddParam.copy(purchaseValue = it.toSafeFloat())) }, inputType = InputType.Decimal ) - Spacer(modifier = Modifier.width(24.dp)) - Text(goodsAddParam.unitIdStr, style = AppTypography.gray96a0aaTextStyle) +// Spacer(modifier = Modifier.width(24.dp)) + Text( + goodsAddParam.unitIdStrPlace, style = AppTypography.blackTextStyle.copy( + textAlign = TextAlign.Center + ), modifier = Modifier.width(72.dp) + ) - Spacer(modifier = Modifier.width(111.dp)) + Spacer(modifier = Modifier.width(38.dp)) Text("单价", style = AppTypography.black141428TextStyle) Spacer(modifier = Modifier.width(24.dp))