Merge remote-tracking branch 'origin/master'

entry/src/main/ets/pages/metailmange/AddConversionPage.ets

@@ -170,21 +170,28 @@ struct AddConversionPage {
   @Builder WzInfoRow() {
     Flex({ direction: FlexDirection.Column }) {
       Column() {
-        Row() {
-          Divider()
-            .vertical(true)
-            .height(14)
-            .strokeWidth(3)
-            .color('#19ac88')
-            .opacity(0.6)
-            .margin({ left: 8, right: 8 })
-          Text("单位/库房信息")
+        Flex({justifyContent:FlexAlign.SpaceBetween, alignItems: ItemAlign.Center}){
+          Row() {
+            Divider()
+              .vertical(true)
+              .height(14)
+              .strokeWidth(3)
+              .color('#19ac88')
+              .opacity(0.6)
+              .margin({ left: 8, right: 8 })
+            Text("单位/库房信息")
+              .fontWeight(FontWeight.Medium)
+              .fontSize(14)
+              .fontColor($r("app.color.item_color_black"))
+          }
+          .width("40%")
+          Text("浙江钧普科技股份有限公司1号库房")
             .fontWeight(FontWeight.Medium)
-            .fontSize(14)
-            .fontColor($r("app.color.item_color_black"))
-
-        }.padding({left:2,bottom:20})
-        .width("100%")
+            .fontSize(21)
+            .fontColor($r("app.color.title_background"))
+            .width("60%")
+            .textAlign(TextAlign.Start)
+        }.width("100%").padding({left:2,bottom:20})
         Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
           Row(){
             Divider()
@@ -268,7 +275,7 @@ struct AddConversionPage {
               this.WzInfoRow()
             }.width("100%")
           }.tabBar(this.TabBuilder(1, '物资信息'))
-        }.margin({left:15,right:15,top:15})
+        }.margin({left:10,right:10,top:15})
         .onChange((index: number) => {
           this.currentIndex = index
         })

entry/src/main/ets/pages/metailmange/AddTemporaryInPage.ets

@@ -205,22 +205,30 @@ export struct AddTemporaryInPage {
    @Builder WzInfoRow() {
       Flex({ direction: FlexDirection.Column }) {
          Column() {
-            Row() {
-               Divider()
-                  .vertical(true)
-                  .height(14)
-                  .strokeWidth(3)
-                  .color('#19ac88')
-                  .opacity(0.6)
-                  .margin({ left: 8, right: 8 })
-               Text("单位/库房信息")
+            Flex({justifyContent:FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center}){
+               Row() {
+                  Divider()
+                     .vertical(true)
+                     .height(14)
+                     .strokeWidth(3)
+                     .color('#19ac88')
+                     .opacity(0.6)
+                     .margin({ left: 8, right: 8 })
+                  Text("单位/库房信息")
+                     .fontWeight(FontWeight.Medium)
+                     .fontSize(14)
+                     .fontColor($r("app.color.item_color_black"))
+               }
+               .width("40%")
+               Text("浙江钧普科技股份有限公司1号库房")
                   .fontWeight(FontWeight.Medium)
-                  .fontSize(14)
-                  .fontColor($r("app.color.item_color_black"))
-            }.padding({left:2})
-            .width("100%")
-            .height(40)
-         }
+                  .fontSize(21)
+                  .fontColor($r("app.color.title_background"))
+                  .width("60%")
+                  .textAlign(TextAlign.Start)
+                  .padding({left:2,bottom:20})
+            }.width("100%")
+         }.padding({bottom:20,top:20})
          .borderRadius(5)
          .width("100%")
          .backgroundColor("#fff")

entry/src/main/ets/pages/metailmange/AddTemporaryOutPage.ets

@@ -205,26 +205,33 @@ struct AddTemporaryOutPage{
   @Builder WzInfoRow() {
     Flex({ direction: FlexDirection.Column }) {
       Column() {
-        Row() {
-          Divider()
-            .vertical(true)
-            .height(14)
-            .strokeWidth(3)
-            .color('#19ac88')
-            .opacity(0.6)
-            .margin({ left: 8, right: 8 })
-          Text("单位/库房信息")
+        Flex({justifyContent:FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center}){
+          Row() {
+            Divider()
+              .vertical(true)
+              .height(14)
+              .strokeWidth(3)
+              .color('#19ac88')
+              .opacity(0.6)
+              .margin({ left: 8, right: 8 })
+            Text("单位/库房信息")
+              .fontWeight(FontWeight.Medium)
+              .fontSize(14)
+              .fontColor($r("app.color.item_color_black"))
+          }
+          .width("40%")
+          Text("浙江钧普科技股份有限公司1号库房")
             .fontWeight(FontWeight.Medium)
-            .fontSize(14)
-            .fontColor($r("app.color.item_color_black"))
-        }.padding({left:2})
-        .width("100%")
-        .height(40)
-      }
+            .fontSize(21)
+            .fontColor($r("app.color.title_background"))
+            .width("60%")
+            .textAlign(TextAlign.Start)
+            .padding({left:2,bottom:20})
+        }.width("100%")
+      }.padding({bottom:20,top:20})
       .borderRadius(5)
       .width("100%")
       .backgroundColor("#fff")
-      .backgroundColor("#fff")
       Flex({ direction: FlexDirection.Column}) {
         Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }){
           Row() {