wzinfo

entry/src/main/ets/pages/metailmange/Common/Dialog/HwDetailDialog.ets

+import { DividerTitle } from '../../../../view/DividerTitle/DividerTitle'
+
+@CustomDialog
+@Component
+export struct HwDetailDialog {
+  controller: CustomDialogController
+
+  build() {
+    Column() {
+      Flex({ justifyContent: FlexAlign.Start }) {
+        DividerTitle({title: "推荐货位"})
+          .padding({ top: 10, bottom: 10 })
+      }.padding(15)
+
+    }
+    .width('50%')
+    .height('100%')
+    .borderRadius(5)
+    .backgroundColor('#fff')
+  }
+}
\ No newline at end of file

entry/src/main/ets/pages/metailmange/Common/Dialog/WzScanInfoDialog.ets

+import { DividerTitle } from '../../../../view/DividerTitle/DividerTitle'
+import { HwDetailDialog } from './HwDetailDialog'
+
+@CustomDialog
+@Component
+export struct WzScanInfoDialog {
+  controller: CustomDialogController
+  @Link defaultHwh: string
+  @Link pageType: string
+  @Link currentHwh: string
+  @Link currentWZInfo: Array<any>
+  handleDefaultHwDetail: () => void
+
+  @BuilderParam container: () => void
+
+  // hwDetailDialog: CustomDialogController = new CustomDialogController({
+  //   builder: HwDetailDialog(),
+  //   autoCancel: true,
+  //   alignment: DialogAlignment.Default,
+  //   customStyle: true
+  // })
+  //
+  //
+  // handleDefaultHwDetail() {
+  //   if (this.hwDetailDialog != undefined) {
+  //     this.hwDetailDialog.open()
+  //   }
+  // }
+
+  build() {
+    Column() {
+      Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+        DividerTitle({title: "扫描信息"})
+        .padding({ top: 10, bottom: 10 })
+        Image($rawfile('scan/close.png'))
+          .width(28)
+          .height(28)
+          .onClick(() => {
+            this.controller.close()
+          })
+      }.padding(15)
+
+      this.container()
+      Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+        Text("推荐货位: " + this.defaultHwh).fontSize(16).lineHeight(18)
+        Image($rawfile("scan/eye.png")).width(24).height(24).onClick(() => {
+          // if (this.hwDetailDialog != undefined) {
+          //   this.hwDetailDialog.open()
+          // }
+        })
+      }.padding(15)
+    }
+    .margin({top: 80})
+    .width('100%')
+    .borderRadius(5)
+    .backgroundColor('#fff')
+  }
+}
\ No newline at end of file

entry/src/main/ets/pages/metailmange/Common/WzInfo.ets

+import router from '@ohos.router';
+import { Logger } from '@ohos/common';
+import gldwModel from '../../../model/GldwModel';
+import kfModel from '../../../model/KfModel';
+import { DividerTitle } from '../../../view/DividerTitle/DividerTitle';
+import { WzClass, WzmxClass } from './Wzcrk.data';
+import { WzList } from '../WzInPage/WzinDetail/WzList';
+import { pzForm } from  './action'
+import { WzScanInfoDialog } from './Dialog/WzScanInfoDialog';
+
+
+@Extend(Button) function CommonButtonStyle() {
+  .borderWidth(2)
+  .borderColor('#0fa983')
+  .backgroundColor('#97c6a6')
+  .fontColor('#fff')
+  .borderRadius(5)
+  .type(ButtonType.Normal)
+  .stateEffect(true)
+}
+
+@Component
+@Entry
+  // 物资信息
+export struct WzInfo {
+  private searchcontroller: SearchController = new SearchController()
+  @State currentHwh: string = '' // 当前货位
+  @State pageType: string = "" //当前凭证的类型
+  @State currentModel: boolean = false //倒出:true/倒入:false
+  @State currentWZInfo: Array<any> = []//当前扫描物资信息
+  @State defaultArr: Array<any> = []
+  @State dataType: boolean = false // 导入是true, 其他false 根据单据状态控制提交按钮显示隐藏
+  @State isHaveButton: boolean = false // 完成状态, 未完成是true, 其他false
+  @State isAutomation: boolean = true //控制扫描提示显示隐藏
+  @State defaultHwh: string = this.convertionDefaultHwh()
+
+
+  @State currentDw: string = ''
+  @State kfmc: string = ''
+  @State wzmx: WzmxClass[] = []
+
+  @ObjectLink wzcrk: WzClass
+  getDetail: (wzpm?:string) => void
+
+  @Builder container() {
+    Column() {
+      Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+        Text("当前扫描货位号:").fontSize(16).lineHeight(18)
+        Text(this.currentHwh || "请扫描货位").fontSize(20).fontColor("#0fa983").fontWeight(700)
+      }.padding(15)
+      if (this.pageType == "倒库") {
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Text("当前倒库模式:").fontSize(16).lineHeight(18)
+          Text(this.currentModel ? "倒出" : "倒入").fontSize(20).fontColor("#0fa983").fontWeight(700)
+        }.padding(15)
+      }
+      if (this.pageType == "调号") {
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Text("当前调号模式:").fontSize(16).lineHeight(18)
+          Text(this.currentModel ? "调出" : "调入").fontSize(20).fontColor("#0fa983").fontWeight(700)
+        }.padding(15)
+      }
+      if (this.pageType == "换位") {
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Text("当前换位模式:").fontSize(16).lineHeight(18)
+          Text(this.currentModel ? "换出" : "换入").fontSize(20).fontColor("#0fa983").fontWeight(700)
+        }.padding(15)
+      }
+      Flex({ justifyContent: FlexAlign.Start }) {
+        Text("当前扫描物资信息: ").fontSize(16).lineHeight(18)
+        if (this.currentWZInfo.length == 0) {
+          Text("请扫描物资信息").fontSize(14)
+        }
+      }.padding(15)
+      if (this.currentWZInfo.length >  0) {
+        Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+          Text("品名代码").width("25%").textAlign(TextAlign.Start)
+          Text("物资品名").width("25%").textAlign(TextAlign.Center)
+          Text("号型名称").width("25%").textAlign(TextAlign.Center)
+          Text("数量").width("25%").textAlign(TextAlign.Center)
+        }.padding(15)
+        Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
+          ForEach(this.currentWZInfo, item => {
+            Text(item.pmdmsix).width("25%").textAlign(TextAlign.Start).fontSize(14)
+            Text(item.wzpm).width("25%").textAlign(TextAlign.Center).fontSize(14)
+            Text(item.hxmc).width("25%").textAlign(TextAlign.Center).fontSize(14)
+            Text(item.crksl).width("25%").textAlign(TextAlign.Center)
+              .fontSize(20).fontColor("#0fa983").fontWeight(700)
+          })
+        }.padding(15)
+      }
+    }
+  }
+
+  convertionDefaultHwh(): string {
+    if (this.defaultArr && this.defaultArr.length > 1) {
+      return this.defaultArr[0].HWH + ',' + this.defaultArr[1].HWH + '...' || '暂无'
+    } else if (this.defaultArr && this.defaultArr.length == 1) {
+      return this.defaultArr[0].HWH || '暂无'
+    } else {
+      return '暂无'
+    }
+  }
+
+
+   scanInfoDialog: CustomDialogController = new CustomDialogController({
+    builder: WzScanInfoDialog({
+      container: this.container,
+      defaultHwh: $defaultHwh,
+      pageType: $pageType,
+      currentHwh: $currentHwh,
+      currentWZInfo: $currentWZInfo
+    }),
+    autoCancel: false,
+    alignment: DialogAlignment.Top,
+    customStyle: true
+  })
+
+
+
+  // 页面初始化
+  aboutToAppear(){
+    this.getData()
+  }
+
+  async getData() {
+    Logger.info(">>>>>>>>>>>>>>>PAGETYPE:", this.pageType)
+    // 获取收物单位
+    const res1 = await gldwModel.queryByData({dwdm:this.wzcrk.sfdw})
+    this.currentDw = res1[0].dwfh ?? ''
+    // 获取库房名称
+    const res = await kfModel.query({guid: this.wzcrk.kfguid})
+    this.kfmc = res[0].kfmc ?? ''
+  }
+
+
+  build() {
+    Column() {
+      Flex({ direction: FlexDirection.Column }) {
+        Column() {
+          if (this.pageType == "倒库") {
+            Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
+              DividerTitle({ title: "当前单位出库房:"})
+              Text(this.currentDw + this.kfmc)
+                .fontWeight(FontWeight.Medium)
+                .fontSize(21)
+                .fontColor($r("app.color.title_background"))
+                .width("60%")
+                .textAlign(TextAlign.Start)
+                .padding({ bottom: 20, top: 20 })
+            }.width("100%")
+
+            Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
+              DividerTitle({ title: "当前单位入库房:"})
+              Text(this.currentDw + this.kfmc)
+                .fontWeight(FontWeight.Medium)
+                .fontSize(21)
+                .fontColor($r("app.color.title_background"))
+                .width("60%")
+                .textAlign(TextAlign.Start)
+                .padding({ bottom: 20, top: 20 })
+            }.width("100%")
+
+          } else {
+            Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
+              DividerTitle({ title: "单位/库房信息"})
+              Text(this.currentDw + this.kfmc)
+                .fontWeight(FontWeight.Medium)
+                .fontSize(21)
+                .fontColor($r("app.color.title_background"))
+                .width("60%")
+                .textAlign(TextAlign.Start)
+                .padding({ bottom: 20, top: 20 })
+            }.width("100%")
+
+          }
+          if (this.isHaveButton && (this.pageType == '倒库' || this.pageType == '调号' || this.pageType == '换位')) {
+            Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+              DividerTitle({ title: this.pageType + "模式"})
+              Row(){
+                if (this.pageType == "倒库") {
+                  Text("倒入").margin({left:10,right:10})
+                }
+                if (this.pageType == "调号") {
+                  Text("调入").margin({left:10,right:10})
+                }
+                if (this.pageType == "换位") {
+                  Text("换出").margin({left:10,right:10})
+                }
+                Toggle({ type: ToggleType.Switch, isOn: true })
+                  .selectedColor('#007DFF')
+                  .switchPointColor('#FFFFFF')
+                  .onChange((isOn: boolean) => {
+                    console.info('Component status:' + isOn)
+                  })
+                if (this.pageType == "倒库") {
+                  Text("倒出").margin({ left: 10, right: 10 })
+                }
+                if (this.pageType == "调号") {
+                  Text("调出").margin({left:10,right:10})
+                }
+                if (this.pageType == "换位") {
+                  Text("换入").margin({left:10,right:10})
+                }
+              }
+            }.padding({left: 8, right: 8})
+          }
+        }.padding({ bottom: 20, top: 20 })
+        .borderRadius(5)
+        .width("100%")
+        .backgroundColor("#fff")
+
+        Flex({ direction: FlexDirection.Column }) {
+          Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+            DividerTitle({ title: "物资列表" })
+          }.padding({ left: 2, right: 10 })
+          .width("100%")
+
+          Row() {
+            Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+              Search({ placeholder: '请输入品名名称', controller: this.searchcontroller })
+                .height(40)
+                .backgroundColor('#F5F5F5')
+                .placeholderColor(Color.Grey)
+                .textAlign(TextAlign.Center)
+                .placeholderFont({ size: 14, weight: 400 })
+                .textFont({ size: 14, weight: 400 })
+                .width('75%')
+                .onSubmit((value: string) => {
+                  this.getDetail(value)
+                })
+                .onChange((value: string) => {
+                })
+                .margin({ left: 10 })
+                .borderRadius(5)
+              Button("查看状态").CommonButtonStyle().width("25%").margin({ left: 5, right: 5 }).onClick(() => {
+                router.pushUrl({ url: 'pages/metailmange/WzStatus', params: {
+                  wzmx: this.wzmx
+                } })
+              })
+            }.width("100%")
+          }.padding({ top: 10, bottom: 10 }).width("100%")
+
+          Column() {
+            List() {
+              ForEach(this.wzmx, (item) => {
+                ListItem() {
+                  WzList({ wzmx: item })
+                }
+              })
+            }
+          }.flexGrow(1)
+        }
+        .padding({ bottom: 20, top: 20 })
+        .borderRadius(15)
+        .margin({ top: 20 })
+        .width("100%")
+        .backgroundColor("#fff")
+      }
+      .width("100%")
+      .height("100%")
+    }
+  }
+}
\ No newline at end of file

entry/src/main/ets/pages/metailmange/Common/action.ts

+// 菜单数据
+export interface pzForm {
+  pzlx: string,
+  pzh: string,
+  kfdm: string,
+  pzszlx: string,
+  sfdw: string,
+  hwh: string,
+  ydh: string,
+  fwgldwdm: string,
+  swgldwdm: string,
+  dec: string
+}
\ No newline at end of file

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

-import router from '@ohos.router';
-import { Logger } from '@ohos/common';
-import { Wzcrkmx } from '@ohos/common/src/main/ets/entity/Wzcrkmx';
-import gldwModel from '../../../../model/GldwModel';
-import kfModel from '../../../../model/KfModel';
-import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
-import { WzList } from './WzList';
-
-@Extend(Button) function CommonButtonStyle() {
-  .borderWidth(2)
-  .borderColor('#0fa983')
-  .backgroundColor('#97c6a6')
-  .fontColor('#fff')
-  .borderRadius(5)
-  .type(ButtonType.Normal)
-  .stateEffect(true)
-}
-
-@Component
-  // 物资信息
-export struct WzInfo {
-  private searchcontroller: SearchController = new SearchController()
-  @State kfmc: string = ''
-  @State sfdw: string = ''
-  @State wzmx: WzmxClass[] = []
-  @ObjectLink wzcrk: WzClass
-  getDetail: (wzpm?:string) => void
-
-  aboutToAppear(){
-    this.getData()
-  }
-
-  async getData() {
-    const res = await kfModel.query({guid: this.wzcrk.kfguid})
-    this.kfmc = res[0].kfmc ?? ''
-
-    const res1 = await gldwModel.queryByData({dwdm:this.wzcrk.sfdw})
-    this.sfdw = res1[0].dwfh ?? ''
-  }
-
-
-  build() {
-    Column() {
-      Flex({ direction: FlexDirection.Column }) {
-        Column() {
-          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("35%")
-
-            Text(this.sfdw + this.kfmc)
-              .fontWeight(FontWeight.Medium)
-              .fontSize(21)
-              .fontColor($r("app.color.title_background"))
-              .width("60%")
-              .textAlign(TextAlign.Start)
-              .padding({ bottom: 20, top: 20 })
-          }.width("100%")
-        }.padding({ bottom: 20, top: 20 })
-        .borderRadius(5)
-        .width("100%")
-        .backgroundColor("#fff")
-
-        Flex({ direction: FlexDirection.Column }) {
-          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"))
-            }
-          }.padding({ left: 2, right: 10 })
-          .width("100%")
-
-          Row() {
-            Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
-              Search({ placeholder: '请输入品名名称', controller: this.searchcontroller })
-                .height(40)
-                .backgroundColor('#F5F5F5')
-                .placeholderColor(Color.Grey)
-                .textAlign(TextAlign.Center)
-                .placeholderFont({ size: 14, weight: 400 })
-                .textFont({ size: 14, weight: 400 })
-                .width('75%')
-                .onSubmit((value: string) => {
-                  this.getDetail(value)
-                })
-                .onChange((value: string) => {
-                })
-                .margin({ left: 10 })
-                .borderRadius(5)
-              Button("查看状态").CommonButtonStyle().width("25%").margin({ left: 5, right: 5 }).onClick(() => {
-                router.pushUrl({ url: 'pages/metailmange/WzStatus', params: {
-                  wzmx: this.wzmx
-                } })
-              })
-            }.width("100%")
-          }.padding({ top: 10, bottom: 10 }).width("100%")
-
-          Column() {
-            List() {
-              ForEach(this.wzmx, (item) => {
-                ListItem() {
-                  WzList({ wzmx: item })
-                }
-              })
-            }
-          }.flexGrow(1)
-        }
-        .padding({ bottom: 20, top: 20 })
-        .borderRadius(15)
-        .margin({ top: 20 })
-        .width("100%")
-        .backgroundColor("#fff")
-      }
-      .width("100%")
-      .height("100%")
-    }
-  }
-}
\ No newline at end of file

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

@@ -2,7 +2,7 @@ import { TitleBar } from '../../../../view/title/TitleBar'
 import router from '@ohos.router';
 import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
 import { Wzcrk } from '@ohos/common/src/main/ets/entity/Wzcrk';
-import { WzInfo } from './WzInfo'
+import { WzInfo } from '../../Common/WzInfo'
 import { PzInfo } from './PzInfo'
 import wzcrkmxModel from '../../../../model/WzcrkmxModel';
 import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
@@ -92,7 +92,7 @@ struct WzinDetail {
 
           TabContent() {
             Column() {
-              WzInfo({ wzmx: this.wzmx, wzcrk: this.wzcrk, getDetail: this.getDetail })
+              WzInfo({ wzmx: this.wzmx, wzcrk: this.wzcrk, getDetail: this.getDetail, pageType: "入库" })
             }.width("100%")
           }.tabBar(this.TabBuilder(1, '物资信息'))
         }

entry/src/main/ets/pages/metailmange/WzInvPage/WzInvDetail/WzInvDetail.ets

@@ -2,7 +2,7 @@ import { TitleBar } from '../../../../view/title/TitleBar'
 import router from '@ohos.router';
 import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
 import { Wzcrk } from '@ohos/common/src/main/ets/entity/Wzcrk';
-import { WzInfo } from '../../WzInPage/WzinDetail/WzInfo'
+import { WzInfo } from '../../Common/WzInfo'
 import { PzInvInfo } from './PzInvInfo'
 import wzcrkmxModel from '../../../../model/WzcrkmxModel';
 import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';

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

-import router from '@ohos.router';
-import { Logger } from '@ohos/common';
-import { Wzcrkmx } from '@ohos/common/src/main/ets/entity/Wzcrkmx';
-import gldwModel from '../../../../model/GldwModel';
-import kfModel from '../../../../model/KfModel';
-import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
-import { WzList } from './WzList';
-
-@Extend(Button) function CommonButtonStyle() {
-  .borderWidth(2)
-  .borderColor('#0fa983')
-  .backgroundColor('#97c6a6')
-  .fontColor('#fff')
-  .borderRadius(5)
-  .type(ButtonType.Normal)
-  .stateEffect(true)
-}
-
-@Component
-  // 物资信息
-export struct WzInfo {
-  private searchcontroller: SearchController = new SearchController()
-  @State kfmc: string = ''
-  @State sfdw: string = ''
-  @State wzmx: WzmxClass[] = []
-  @ObjectLink wzcrk: WzClass
-  getDetail: (wzpm?:string) => void
-
-  aboutToAppear(){
-    this.getData()
-  }
-
-  async getData() {
-    const res = await kfModel.query({guid: this.wzcrk.kfguid})
-    this.kfmc = res[0].kfmc ?? ''
-
-    const res1 = await gldwModel.queryByData({dwdm:this.wzcrk.sfdw})
-    this.sfdw = res1[0].dwfh ?? ''
-  }
-
-
-  build() {
-    Column() {
-      Flex({ direction: FlexDirection.Column }) {
-        Column() {
-          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("35%")
-
-            Text(this.sfdw + this.kfmc)
-              .fontWeight(FontWeight.Medium)
-              .fontSize(21)
-              .fontColor($r("app.color.title_background"))
-              .width("60%")
-              .textAlign(TextAlign.Start)
-              .padding({ bottom: 20, top: 20 })
-          }.width("100%")
-        }.padding({ bottom: 20, top: 20 })
-        .borderRadius(5)
-        .width("100%")
-        .backgroundColor("#fff")
-
-        Flex({ direction: FlexDirection.Column }) {
-          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"))
-            }
-          }.padding({ left: 2, right: 10 })
-          .width("100%")
-
-          Row() {
-            Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
-              Search({ placeholder: '请输入品名名称', controller: this.searchcontroller })
-                .height(40)
-                .backgroundColor('#F5F5F5')
-                .placeholderColor(Color.Grey)
-                .textAlign(TextAlign.Center)
-                .placeholderFont({ size: 14, weight: 400 })
-                .textFont({ size: 14, weight: 400 })
-                .width('75%')
-                .onSubmit((value: string) => {
-                  this.getDetail(value)
-                })
-                .onChange((value: string) => {
-                })
-                .margin({ left: 10 })
-                .borderRadius(5)
-              Button("查看状态").CommonButtonStyle().width("25%").margin({ left: 5, right: 5 }).onClick(() => {
-                router.pushUrl({ url: 'pages/metailmange/WzStatus', params: {
-                  wzmx: this.wzmx
-                } })
-              })
-            }.width("100%")
-          }.padding({ top: 10, bottom: 10 }).width("100%")
-
-          Column() {
-            List() {
-              ForEach(this.wzmx, (item) => {
-                ListItem() {
-                  WzList({ wzmx: item })
-                }
-              })
-            }
-          }.flexGrow(1)
-        }
-        .padding({ bottom: 20, top: 20 })
-        .borderRadius(15)
-        .margin({ top: 20 })
-        .width("100%")
-        .backgroundColor("#fff")
-      }
-      .width("100%")
-      .height("100%")
-    }
-  }
-}
\ No newline at end of file

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

+import { Logger } from '@ohos/common/src/main/ets/utils/Logger'
+import { WzmxClass } from '../../Common/Wzcrk.data'
+
+@Component
+export struct WzList {
+  @ObjectLink wzmx: WzmxClass
+
+  build() {
+    Column() {
+      Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+        Column() {
+          Text(this.wzmx.wzpm).padding({ top: 5, bottom: 5 }).alignSelf(ItemAlign.Start)
+          Row() {
+            Text("号型: " + this.wzmx.hxmc)
+          }.alignSelf(ItemAlign.Start).padding({ top: 5, bottom: 5 })
+
+          Row() {
+             Text('货位号')
+            Text( this.wzmx.hwh == '' ? '暂无货位号': this.wzmx.hwh)
+          }.alignSelf(ItemAlign.Start).padding({ top: 5, bottom: 5 })
+        }.margin({ left: 15 })
+
+        Column() {
+          Row() {
+            Text("总数: ")
+            Text(this.wzmx.pzsl + '')
+          }.alignSelf(ItemAlign.End).padding({ top: 5, bottom: 5 })
+
+          Row() {
+            Counter() {
+              Text(this.wzmx.crksl + '')
+            }
+            .width(120)
+            .onInc(() => {
+              this.wzmx.crksl = this.wzmx.crksl + 1
+            })
+            .onDec(() => {
+              if( this.wzmx.crksl == 0) {
+                return
+              }
+              this.wzmx.crksl = this.wzmx.crksl - 1
+            })
+          }.alignSelf(ItemAlign.End)
+
+          Row() {
+            Image($r('app.media.trash')).width(35)
+          }.alignSelf(ItemAlign.End)
+        }.margin({ right: 20 })
+      }.margin({ top: 10 }).border({ width: { bottom: '1lpx' }, color: "#717171" })
+    }
+  }
+}
\ No newline at end of file

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

@@ -2,7 +2,6 @@ import { TitleBar } from '../../../../view/title/TitleBar'
 import router from '@ohos.router';
 import { Logger } from '@ohos/common/src/main/ets/utils/Logger';
 import { Wzcrk } from '@ohos/common/src/main/ets/entity/Wzcrk';
-import { WzInfo } from './WzInfo'
 import { PzInfo } from './PzInfo'
 import wzcrkmxModel from '../../../../model/WzcrkmxModel';
 import { WzClass, WzmxClass } from '../../Common/Wzcrk.data';
@@ -11,6 +10,7 @@ import wzcrkModel from '../../../../model/WzcrkModel';
 import { SQLiteContext, Wzcrkmx, WzcrkmxDao } from '@ohos/common';
 import {AddWzin} from './AddWzin'
 import { uuid } from '@ohos/common/src/main/ets/utils/util';
+import { WzInfo } from '../../Common/WzInfo';
 
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
@@ -92,7 +92,7 @@ struct WzOutDetail {
 
           TabContent() {
             Column() {
-              WzInfo({ wzmx: this.wzmx, wzcrk: this.wzcrk, getDetail: this.getDetail })
+              WzInfo({ wzmx: this.wzmx, wzcrk: this.wzcrk, getDetail: this.getDetail, pageType: "出库" })
             }.width("100%")
           }.tabBar(this.TabBuilder(1, '物资信息'))
         }

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

@@ -48,7 +48,7 @@ export struct WzOutPage {
     router.pushUrl({url:'pages/order_detail/PzInOutDetailPage'})
   }
 
-  aboutToAppear() {
+  onPageShow() {
     this.getWzcrkList()
   }
 

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

@@ -48,6 +48,7 @@
     "identify/demo_page/UHFDemo",
     "identify/demo_page/ScanDemo",
     "pages/metailmange/GoodsSelectHwPage",
-    "pages/metailmange/GoodsSelectRfidTools"
+    "pages/metailmange/GoodsSelectRfidTools",
+    "pages/metailmange/WzOutPage/WzOutDetail/WzOutDetail"
   ]
 }