hh преди 2 седмици
родител
ревизия
a974b9e37d

+ 78 - 21
entry/src/main/ets/pages/Index.ets

@@ -138,6 +138,8 @@ struct Index {
   @State noticeNum: number = 100
   // 扫描或手动输入的物料编码
   @State scanCode: string = ''
+  // 当前流转卡号
+  @State seqNo: string = ''
 
   pageNo: number = 1
   pageSize: number = 9
@@ -411,33 +413,22 @@ struct Index {
       Stack() {
         Column() {
           Blank()
-          Row() {
-            Row() {
-
-            }
-            .width('50%')
-            .height('100%')
-            .borderWidth(1)
-            Row(){
-
-            }.width('50%')
-            .height('100%')
-            .borderWidth(1)
-            // Image($r('app.media.process_drawer_switch'))
-            //   .width($r('app.float.virtualSize_48'))
-            //   .height($r('app.float.virtualSize_48'))
-            //   .fillColor($r('app.color.60FFFFFF'))
+          Stack() {
+            Image($r('app.media.process_drawer_thumbnail'))
+              .width('100%')
+              .height('100%')
+            Image($r('app.media.process_drawer_switch'))
+              .width($r('app.float.virtualSize_48'))
+              .height($r('app.float.virtualSize_48'))
+              .fillColor($r('app.color.60FFFFFF'))
           }
           .width('100%')
           .height('47%')
-          .justifyContent(FlexAlign.Center)
-          .backgroundImage($r('app.media.process_drawer_thumbnail'), ImageRepeat.XY)
         }
         .width('100%')
         .height('100%')
 
         Row() {
-          Row().width('2.6%')
           Row({space: 4}) {
             Image($r('app.media.process_work_instruction'))
               .width($r('app.float.virtualSize_24'))
@@ -455,11 +446,60 @@ struct Index {
           .borderRadius($r('app.float.fontSize_16'))
           Row().width('1.5%')
           Row({space: 4}) {
-            Image($r('app.media.process_work_instruction'))
+            Image($r('app.media.process_complete_reception'))
               .width($r('app.float.virtualSize_24'))
               .height($r('app.float.virtualSize_24'))
               .fillColor($r('app.color.0A84FF'))
-            Text('作业指导')
+            Text('齐套接收')
+              .fontColor($r('app.color.0A84FF'))
+              .fontSize($r('app.float.fontSize_24'))
+              .fontWeight(FontWeight.Medium)
+          }
+          .width('10%')
+          .height('58.3%')
+          .justifyContent(FlexAlign.Center)
+          .backgroundColor($r('app.color.20FFFFFF'))
+          .borderRadius($r('app.float.fontSize_16'))
+
+          Blank()
+          Column({space: 2}) {
+            Row() {
+              Text((this.selectWorkOder && this.selectWorkOder.workOrderCode) ? parseInt(this.selectWorkOder.completeNum!) + '/' + parseInt(this.selectWorkOder.planNum) : '')
+                .fontColor($r('app.color.FFFFFF'))
+                .fontSize($r('app.float.fontSize_16'))
+                .fontWeight(FontWeight.Lighter)
+            }
+            .width('100%')
+            .height('50%')
+            .justifyContent(FlexAlign.End)
+            .alignItems(VerticalAlign.Bottom)
+
+            Row() {
+              if (this.seqNo.length > 0 ) {
+                Text('S/N ')
+                  .fontColor($r('app.color.FFFFFF'))
+                  .fontSize($r('app.float.fontSize_16'))
+                  .fontWeight(FontWeight.Lighter)
+                Text(this.seqNo)
+                  .fontColor($r('app.color.FFFFFF'))
+                  .fontSize($r('app.float.fontSize_16'))
+                  .fontWeight(FontWeight.Bold)
+              }
+            }
+            .width('100%')
+            .height('50%')
+            .justifyContent(FlexAlign.End)
+            .alignItems(VerticalAlign.Top)
+          }
+          .width('10.8%')
+          .height('100%')
+          Row().width('1%')
+          Row({space: 4}) {
+            Image($r('app.media.process_switch'))
+              .width($r('app.float.virtualSize_24'))
+              .height($r('app.float.virtualSize_24'))
+              .fillColor($r('app.color.0A84FF'))
+            Text('切换产品')
               .fontColor($r('app.color.0A84FF'))
               .fontSize($r('app.float.fontSize_24'))
               .fontWeight(FontWeight.Medium)
@@ -469,9 +509,26 @@ struct Index {
           .justifyContent(FlexAlign.Center)
           .backgroundColor($r('app.color.20FFFFFF'))
           .borderRadius($r('app.float.fontSize_16'))
+          Row().width('1.5%')
+          Row({space: 4}) {
+            Image($r('app.media.process_start_work'))
+              .width($r('app.float.virtualSize_24'))
+              .height($r('app.float.virtualSize_24'))
+              .fillColor($r('app.color.FFFFFF'))
+            Text('工序开工')
+              .fontColor($r('app.color.FFFFFF'))
+              .fontSize($r('app.float.fontSize_24'))
+              .fontWeight(FontWeight.Medium)
+          }
+          .width('10%')
+          .height('58.3%')
+          .justifyContent(FlexAlign.Center)
+          .backgroundColor($r('app.color.0A84FF'))
+          .borderRadius($r('app.float.fontSize_16'))
         }
         .height('90.6%')
         .width('100%')
+        .padding({left: '2.6%', right: '2.6%'})
       }
       .width('100%')
       .height('9.8%')

+ 6 - 0
entry/src/main/resources/base/media/process_complete_reception.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+  <path d="m18.167 1.75.086.005a.75.75 0 0 1 .507.286l2.533 3.275.044.064a.75.75 0 0 1-1.18.913l-.05-.059L17.8 3.25H6.2L3.885 6.235a.75.75 0 0 1-1.186-.92L5.241 2.04l.057-.064a.75.75 0 0 1 .535-.226h12.334Z"/>
+  <path d="M20.25 6.5a.25.25 0 0 0-.25-.25H4a.25.25 0 0 0-.25.25V20c0 .414.336.75.75.75h15a.75.75 0 0 0 .75-.75V6.5Zm1.5 13.5a2.25 2.25 0 0 1-2.25 2.25h-15A2.25 2.25 0 0 1 2.25 20V6.5c0-.967.784-1.75 1.75-1.75h16c.966 0 1.75.783 1.75 1.75V20Z"/>
+  <path d="M15.526 12.918a.75.75 0 0 1 1.056 1.056l-.052.056-4 4a.75.75 0 0 1-1.004.052l-.056-.052-4-4-.052-.056a.75.75 0 0 1 1.056-1.056l.056.052L12 16.44l3.47-3.47.056-.052Z"/>
+  <path d="M11.246 17.5v-8a.75.75 0 0 1 1.5 0v8a.75.75 0 1 1-1.5 0Z"/>
+</svg>

+ 3 - 0
entry/src/main/resources/base/media/process_start_work.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+  <path d="M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1Zm0 1.5a9.5 9.5 0 1 0 0 19 9.5 9.5 0 0 0 0-19Zm4.149 10.58-5.27 3.073A1.25 1.25 0 0 1 9 15.073V8.927a1.25 1.25 0 0 1 1.88-1.08l5.269 3.074a1.25 1.25 0 0 1 0 2.16Z"/>
+</svg>

+ 3 - 0
entry/src/main/resources/base/media/process_switch.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+  <path d="M20.75 14.5a.75.75 0 0 1 0 1.5l-15.001-.001v1.294a.5.5 0 0 1-.853.353l-2.293-2.293a.5.5 0 0 1 .354-.853H20.75Zm-2-8.043a.5.5 0 0 1 .354.146l2.292 2.293a.5.5 0 0 1-.353.854H3.25a.75.75 0 1 1 0-1.5l14.999-.001V6.957a.5.5 0 0 1 .5-.5Z"/>
+</svg>