|
@@ -267,7 +267,7 @@ export struct OperationMaterialKitTwoStep {
|
|
|
.fontColor($r('app.color.FFFFFF'))
|
|
|
.maxLines(1)
|
|
|
|
|
|
- Text('已齐套/需求:' + item.kitNum! + '/' + item.num!)
|
|
|
+ Text('已齐套/需求:' + item.kitNum! + '/' + item.num! + item.unit!)
|
|
|
.fontSize($r('app.float.fontSize_16'))
|
|
|
.fontWeight(FontWeight.Lighter)
|
|
|
.fontColor($r('app.color.FFFFFF'))
|
|
@@ -306,7 +306,7 @@ export struct OperationMaterialKitTwoStep {
|
|
|
})
|
|
|
}
|
|
|
.width('100%')
|
|
|
- .height('90%')
|
|
|
+ .height('83%')
|
|
|
.alignListItem(ListItemAlign.Center)
|
|
|
}
|
|
|
.height('100%')
|
|
@@ -432,7 +432,7 @@ export struct OperationMaterialKitTwoStep {
|
|
|
.fontColor($r('app.color.FFFFFF'))
|
|
|
.maxLines(1)
|
|
|
|
|
|
- Text(item.num ? item.num.toString() : '0')
|
|
|
+ Text((item.num ? item.num.toString() : '0') + item.unit!)
|
|
|
.fontSize($r('app.float.fontSize_16'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
.fontColor($r('app.color.FFFFFF'))
|
|
@@ -593,7 +593,7 @@ struct SelectMaterialBoxDialog {
|
|
|
.fontWeight(FontWeight.Lighter)
|
|
|
.fontColor($r('app.color.FFFFFF'))
|
|
|
.maxLines(1)
|
|
|
- Text('数量:' + item.materials?.[0]?.num!)
|
|
|
+ Text('数量:' + item.materials?.[0]?.num! + item.unit!)
|
|
|
.fontSize($r('app.float.fontSize_16'))
|
|
|
.fontWeight(FontWeight.Lighter)
|
|
|
.fontColor($r('app.color.FFFFFF'))
|
|
@@ -741,7 +741,7 @@ struct ThisScanDialog {
|
|
|
.fontWeight(FontWeight.Lighter)
|
|
|
.fontColor($r('app.color.FFFFFF'))
|
|
|
.maxLines(1)
|
|
|
- Text('数量:' + item.num!)
|
|
|
+ Text('数量:' + item.num! + item.unit!)
|
|
|
.fontSize($r('app.float.fontSize_16'))
|
|
|
.fontWeight(FontWeight.Lighter)
|
|
|
.fontColor($r('app.color.FFFFFF'))
|