图标+创建临时收发物单

build-profile.json5

 {
   "app": {
-    "signingConfigs": [],
+    "signingConfigs": [
+      {
+        "name": "default",
+        "type": "HarmonyOS",
+        "material": {
+          "certpath": "C:\\Users\\Administrator\\.ohos\\config\\auto_debug_StoreManagement_com.junmp.store_management_80086000137761574.cer",
+          "storePassword": "0000001AA1F94F9275E69E7D71EA60FFFDA63D0E446A208F4D7F23681A4628CFA87B62A93422A8EE005F",
+          "keyAlias": "debugKey",
+          "keyPassword": "0000001A3460D9B6DDA73B29063AD7DC6F583D3E33894F3F1EB87E0B2760DFE66191403E13815EFA7BF2",
+          "profile": "C:\\Users\\Administrator\\.ohos\\config\\auto_debug_StoreManagement_com.junmp.store_management_80086000137761574.p7b",
+          "signAlg": "SHA256withECDSA",
+          "storeFile": "C:\\Users\\Administrator\\.ohos\\config\\auto_debug_StoreManagement_com.junmp.store_management_80086000137761574.p12"
+        }
+      }
+    ],
     "compileSdkVersion": 9,
     "compatibleSdkVersion": 9,
     "products": [

common/src/main/ets/components/StatusBarManager.ts

@@ -63,7 +63,7 @@ export class StatusBarManager {
           windowClass.setWindowSystemBarEnable(['status']).then(() => {
             //4、设置状态栏透明背景
             const systemBarProperties: window.SystemBarProperties = {
-              statusBarColor: '#0FA983'
+              statusBarColor: '#00000000'
             };
             //设置窗口内导航栏、状态栏的属性
             windowClass.setWindowSystemBarProperties(systemBarProperties)
@@ -149,6 +149,7 @@ export class StatusBarManager {
     if (this.mConfig.hasKey(this.CONFIG_SYSTEM_BAR_HEIGHT)) {
       height = this.mConfig.get(this.CONFIG_SYSTEM_BAR_HEIGHT) as number;
     }
+    console.log("偏移量"+height)
     return height;
   }
 

entry/oh-package.json5

 {
-  "name": "entry",
-  "version": "1.0.0",
+  "license": "entry",
   "devDependencies": {},
-  "repository": {},
+  "author": "",
+  "name": "entry",
   "description": "Please describe the basic information.",
   "main": "",
-  "author": "",
-  "license": "entry",
+  "repository": {},
+  "version": "1.0.0",
   "dependencies": {
-    "@ohos/common": "file:../common",
-    "@ohos/direct": "file:../features/DirectConnect",
     "@ohos/material": "file:../features/MaterialManagement",
+    "@ohos/direct": "file:../features/DirectConnect",
     "@ohos/pagemanagement": "file:../features/PageManagement",
-    "@ohos/system": "file:../features/SystemMaintenance"
+    "@ohos/system": "file:../features/SystemMaintenance",
+    "@ohos/common": "file:../common"
   }
 }
-

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

@@ -257,21 +257,20 @@ struct AddConversionPage {
   build() {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资换位" })
+        TitleBar({ title: "物资换位" }).padding({bottom:10})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){
               this.VoucherRow()
-            }.width("100%").margin({top:15})
+            }.width("100%")
 
           }.tabBar(this.TabBuilder(0, '凭证信息'))
           TabContent() {
             Column(){
               this.WzInfoRow()
-            }.width("100%").margin({top:15})
+            }.width("100%")
           }.tabBar(this.TabBuilder(1, '物资信息'))
-        }
-        .margin(15)
+        }.margin({left:15,right:15})
         .onChange((index: number) => {
           this.currentIndex = index
         })

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import router from '@ohos.router';
+
+@Extend(Button) function bottomBtnSty() {
+  .borderWidth(1)
+  .padding({top:1,bottom:1,right:7,left:7})
+  .borderColor('#0fa983')
+  .backgroundColor('#fff')
+  .fontColor('#0fa983')
+  .borderRadius(7)
+  .type(ButtonType.Normal)
+  .stateEffect(true)
+
+}
 @Entry
 @Component
 export struct WzInPage {
@@ -15,7 +28,7 @@ export struct WzInPage {
         .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
         .fontSize(16)
         .lineHeight(22)
-        .margin({ top: 17, bottom: 7 })
+        .margin({bottom: 7 })
       Divider()
         .strokeWidth(2)
         .color('#fff')
@@ -23,6 +36,39 @@ export struct WzInPage {
         .opacity(this.currentIndex === index ? 1 : 0)
     }.width('100%')
   }
+  @Builder bottomButtons() {
+    Row() {
+      Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
+        Button("临时收物")
+          .visibility(this.currentIndex === 1 ? Visibility.Visible:Visibility.None)
+          .bottomBtnSty()
+          .onClick( () => {
+            router.pushUrl({
+              url: "pages/metailmange/AddTemporaryInPage",
+            })
+          })
+          .fontColor("#0fa983")
+          .fontSize("14vp")
+        Button("设置状态")
+          .bottomBtnSty()
+          .onClick(() => {
+          })
+          .fontColor("#0fa983")
+          .fontSize("14vp")
+        Button("导出数据包")
+          .bottomBtnSty()
+          .onClick(() => {
+          }).fontColor("#0fa983") .fontSize("14vp")
+        Button("全选")
+          .bottomBtnSty().fontColor("#0fa983") .fontSize("14vp")
+        Button("清空选择")
+          .bottomBtnSty()
+          .onClick(() =>{
+
+          }).fontColor("#0fa983") .fontSize("14vp")
+      }
+    }.height(80)
+  }
   build(){
     Column() {
       Flex({direction:FlexDirection.Column}){
@@ -72,18 +118,15 @@ export struct WzInPage {
                 right:10
               })
           }
-        }.margin({top:-15})
+        }.margin({top:-30})
         .width("100%")
         .padding('15vp')
         Column(){
           BasicTable({dataSource:[]})
         }.flexGrow(1)
         Row(){
-          Flex({justifyContent:FlexAlign.SpaceAround}){
-            Button("打印面单").width("15%")
-            Button("扫码取件").width("15%")
-            Button("手动取件").width("15%")
-          }
+          // 底部按钮
+          this.bottomButtons();
         }.backgroundColor("#97c6a6").width("100%").height(80)
       }
     }.linearGradient({

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import router from '@ohos.router';
 @Extend(Button) function bottomBtnSty() {
-  .borderWidth(2)
+  .borderWidth(1)
+  .padding({top:1,bottom:1,right:7,left:7})
   .borderColor('#0fa983')
   .backgroundColor('#fff')
   .fontColor('#0fa983')
-  .borderRadius(10)
+  .borderRadius(7)
   .type(ButtonType.Normal)
   .stateEffect(true)
 
@@ -36,9 +38,19 @@ export struct WzOutPage {
   @Builder bottomButtons() {
     Row() {
       Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
+        Button("临时发物")
+          .visibility(this.currentIndex === 1 ? Visibility.Visible:Visibility.None)
+          .bottomBtnSty()
+          .onClick( () => {
+            router.pushUrl({
+              url: "pages/metailmange/AddTemporaryOutPage",
+            })
+          })
+          .fontColor("#0fa983")
+          .fontSize("14vp")
         Button("设置状态")
           .bottomBtnSty()
-          .onClick(async () => {
+          .onClick(() => {
           })
           .fontColor("#0fa983")
           .fontSize("14vp")
@@ -50,7 +62,7 @@ export struct WzOutPage {
           .bottomBtnSty().fontColor("#0fa983") .fontSize("14vp")
         Button("清空选择")
           .bottomBtnSty()
-          .onClick(async () =>{
+          .onClick(() =>{
 
           }).fontColor("#0fa983") .fontSize("14vp")
       }

entry/src/main/resources/base/profile/main_pages.json

@@ -12,7 +12,8 @@
     "pages/metailmange/WzPositionPage",
     "pages/metailmange/WzReversePage",
     "pages/metailmange/AddConversionPage",
-    "pages/metailmange/WzReversePage",
+    "pages/metailmange/AddTemporaryInPage",
+    "pages/metailmange/AddTemporaryOutPage",
     "pages/sub_systemMaintenance/Unit",
     "pages/sub_systemMaintenance/Warehouse",
     "pages/sub_systemMaintenance/GoodsShelf",

features/DirectConnect/oh-package.json5

 {
-  "name": "directconnect",
-  "version": "1.0.0",
+  "license": "Apache-2.0",
+  "devDependencies": {},
+  "author": "",
+  "name": "@ohos/direct",
   "description": "Please describe the basic information.",
   "main": "index.ets",
-  "name": "@ohos/direct",
-  "author": "",
-  "license": "Apache-2.0",
+  "version": "1.0.0",
   "dependencies": {
     "@ohos/common": "file:../../common"
   }

features/MaterialManagement/oh-package.json5

 {
-  "version": "1.0.0",
+  "license": "Apache-2.0",
+  "devDependencies": {},
+  "author": "",
+  "name": "@ohos/material",
   "description": "Please describe the basic information.",
   "main": "index.ets",
-  "name": "@ohos/material",
-  "author": "",
-  "license": "Apache-2.0",
+  "version": "1.0.0",
   "dependencies": {
     "@ohos/common": "file:../../common"
   }

features/MaterialManagement/src/main/ets/viewModel/GridWordViewModel.ets

@@ -8,13 +8,13 @@ export class GridWordViewModel {
    */
   getGridWorkData(): Array<ItemData> {
     let secondGridData: ItemData[] = [
-      new ItemData($r('app.string.wz_out'), $r('app.media.font'), 'out'),
-      new ItemData($r('app.string.wz_in'), $r('app.media.font'), 'in'),
-      new ItemData($r('app.string.wz_exchange'), $r('app.media.font'), 'exchange'),
-      new ItemData($r('app.string.wz_reverse'), $r('app.media.font'), 'reverse'),
-      new ItemData($r('app.string.wz_inv'), $r('app.media.font'), 'inv'),
-      new ItemData($r('app.string.wz_conversion'), $r('app.media.font'), 'conversion'),
-      new ItemData($r('app.string.wz_position'), $r('app.media.font'), 'position')
+      new ItemData($r('app.string.wz_out'), $r('app.media.icon_hr_out'), 'out'),
+      new ItemData($r('app.string.wz_in'), $r('app.media.icon_hr_in'), 'in'),
+      new ItemData($r('app.string.wz_exchange'), $r('app.media.icon_hr_th'), 'exchange'),
+      new ItemData($r('app.string.wz_reverse'), $r('app.media.icon_hr_tiaohao'), 'reverse'),
+      new ItemData($r('app.string.wz_inv'), $r('app.media.icon_hr_inv'), 'inv'),
+      new ItemData($r('app.string.wz_conversion'), $r('app.media.icon_hr_conversion'), 'conversion'),
+      new ItemData($r('app.string.wz_position'), $r('app.media.icon_hr_position'), 'position')
     ]
     ;
     return secondGridData;

features/PageManagement/oh-package.json5

 {
-  "name": "pagemanagement",
-  "version": "1.0.0",
+  "license": "Apache-2.0",
+  "devDependencies": {},
+  "author": "",
+  "name": "@ohos/pagemanagement",
   "description": "Please describe the basic information.",
   "main": "index.ets",
-  "name": "@ohos/pagemanagement",
-  "author": "",
-  "license": "Apache-2.0",
+  "version": "1.0.0",
   "dependencies": {
     "@ohos/common": "file:../../common"
   }

features/SystemMaintenance/oh-package.json5

 {
-  "name": "systemmaintenance",
-  "version": "1.0.0",
+  "license": "Apache-2.0",
+  "devDependencies": {},
+  "author": "",
+  "name": "@ohos/system",
   "description": "Please describe the basic information.",
   "main": "index.ets",
-  "name": "@ohos/system",
-  "author": "",
-  "license": "Apache-2.0",
+  "version": "1.0.0",
   "dependencies": {}
 }

oh-package.json5

 {
-  "name": "storemanagement",
-  "version": "1.0.0",
-  "description": "Please describe the basic information.",
-  "main": "",
-  "author": "",
   "license": "",
-  "dependencies": {
-  },
   "devDependencies": {
     "@ohos/hypium": "1.0.6"
-  }
+  },
+  "author": "",
+  "name": "storemanagement",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "version": "1.0.0",
+  "dependencies": {}
 }