hh 1 тиждень тому
батько
коміт
b1d1b0daef
1 змінених файлів з 3 додано та 118 видалено
  1. 3 118
      entry/src/main/ets/view/process/MaterialCollectView.ets

+ 3 - 118
entry/src/main/ets/view/process/MaterialCollectView.ets

@@ -48,122 +48,6 @@ export struct MaterialCollectView {
     operationId:'679',
     processId:'',
     workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-1210ZJ10',
-    itemModel:'Y11P-1210ZJ10',
-    itemName:'控制连接器插座',
-    needNum:6.0,
-    operationId:'679',
-    processId:'',
-    realNum:1.0,
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-0804ZJ10-2',
-    itemModel:'Y11P-0804ZJ10-2',
-    itemName:'电源连接器插座',
-    needNum:5.0,
-    operationId:'679',
-    processId:'',
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-1210ZJ10',
-    itemModel:'Y11P-1210ZJ10',
-    itemName:'控制连接器插座',
-    needNum:6.0,
-    operationId:'679',
-    processId:'',
-    realNum:1.0,
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-0804ZJ10-2',
-    itemModel:'Y11P-0804ZJ10-2',
-    itemName:'电源连接器插座',
-    needNum:5.0,
-    operationId:'679',
-    processId:'',
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-1210ZJ10',
-    itemModel:'Y11P-1210ZJ10',
-    itemName:'控制连接器插座',
-    needNum:6.0,
-    operationId:'679',
-    processId:'',
-    realNum:1.0,
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-0804ZJ10-2',
-    itemModel:'Y11P-0804ZJ10-2',
-    itemName:'电源连接器插座',
-    needNum:5.0,
-    operationId:'679',
-    processId:'',
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-1210ZJ10',
-    itemModel:'Y11P-1210ZJ10',
-    itemName:'控制连接器插座',
-    needNum:6.0,
-    operationId:'679',
-    processId:'',
-    realNum:1.0,
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-0804ZJ10-2',
-    itemModel:'Y11P-0804ZJ10-2',
-    itemName:'电源连接器插座',
-    needNum:5.0,
-    operationId:'679',
-    processId:'',
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-1210ZJ10',
-    itemModel:'Y11P-1210ZJ10',
-    itemName:'控制连接器插座',
-    needNum:6.0,
-    operationId:'679',
-    processId:'',
-    realNum:5.0,
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-0804ZJ10-2',
-    itemModel:'Y11P-0804ZJ10-2',
-    itemName:'电源连接器插座',
-    needNum:5.0,
-    realNum:5.0,
-    operationId:'679',
-    processId:'',
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-1210ZJ10',
-    itemModel:'Y11P-1210ZJ10',
-    itemName:'控制连接器插座',
-    needNum:6.0,
-    operationId:'679',
-    processId:'',
-    realNum:5.0,
-    workOrderCode:'10.25.0022'
-  },{
-    batchNo:'',
-    itemCode:'Y11P-0804ZJ10-2',
-    itemModel:'Y11P-0804ZJ10-2',
-    itemName:'电源连接器插座',
-    needNum:5.0,
-    realNum:5.0,
-    operationId:'679',
-    processId:'',
-    workOrderCode:'10.25.0022'
   },
   ]
   // 总需求数
@@ -198,7 +82,7 @@ export struct MaterialCollectView {
     }
     for (const element of this.itemArray) {
       this.needNum += element.needNum ? element.needNum : 0
-      this.realNum += element.realNum ? element.needNum : 0
+      this.realNum += element.realNum ? element.realNum : 0
     }
   }
   
@@ -268,7 +152,7 @@ export struct MaterialCollectView {
       .justifyContent(FlexAlign.SpaceBetween)
       // 动态排列容器
       Scroll() {
-        Flex({ wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start, alignItems: ItemAlign.Start}) {
+        Flex({ wrap: FlexWrap.Wrap, direction: FlexDirection.Row, justifyContent: FlexAlign.Start, alignItems: ItemAlign.Start}) {
           ForEach(this.itemArray, (item: OperationItem, index: number) => {
             Column() {
               Row() {
@@ -320,6 +204,7 @@ export struct MaterialCollectView {
       .scrollBar(BarState.Auto)
       .width('93%')
       .height('84%')
+      .align(Alignment.Top)
     }
     .width('100%')
     .height('100%')