Merge remote-tracking branch 'origin/master'

entry/src/main/ets/database/database.ets

@@ -57,7 +57,7 @@ class Database {
 
 
       while (!result.isAtLastRow) {
-        let obj = { } as T
+        let obj = {} as T
 
         // 3.3.指针移动到下一行
         result.goToNextRow()

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
   .borderColor('#0fa983')
@@ -9,6 +10,7 @@ import { BasicTable } from '../../view/BasicTable/BasicTable'
   .type(ButtonType.Normal)
   .stateEffect(true)
 }
+
 @Entry
 @Component
 export struct AddTemporaryInPage {
@@ -16,13 +18,15 @@ export struct AddTemporaryInPage {
   @State selectedFontColor: string = '#fff'
   @State currentIndex: number = 0
   private controller: TabsController = new TabsController()
+
   @Builder TabBuilder(index: number, name: string) {
     Column() {
       Text(name)
         .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
         .fontSize(21)
         .lineHeight(36)
-      } .width('100%')
+    }
+    .width('100%')
     .height(45)
     .border({ width: 2, color: 'rgb(15, 169, 131)' })
     .borderRadius(3)
@@ -45,6 +49,7 @@ export struct AddTemporaryInPage {
           .fontColor($r("app.color.item_color_black"))
       }.padding("2vp")
       .width("100%")
+
       Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center }) {
         Text("凭证类型:")
           .fontSize(14)
@@ -95,6 +100,7 @@ export struct AddTemporaryInPage {
           })
           .flexGrow(1)
       }.padding("10vp")
+
       Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center }) {
         Text("收支类型:")
           .fontSize(14)
@@ -168,6 +174,7 @@ export struct AddTemporaryInPage {
           .padding(5)
           .flexGrow(1)
       }.padding("10vp").width("100%")
+
       Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
         Text("运单号:")
           .fontSize(14)
@@ -181,6 +188,7 @@ export struct AddTemporaryInPage {
           .height(40)
           .padding(10)
       }.margin("10vp").width("100%")
+
       Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
         Text("备注:")
           .fontSize(14)
@@ -204,8 +212,10 @@ export struct AddTemporaryInPage {
 
   @Builder WzInfoRow() {
     Flex({ direction: FlexDirection.Column }) {
-         Column() {
-            Flex({justifyContent:FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center}){
+      Flex({
+        direction: FlexDirection.Row, // 设置主轴方向，默认为Row
+        alignItems: ItemAlign.Center // 设置交叉轴的对齐方式
+      }) {
         Row() {
           Divider()
             .vertical(true)
@@ -219,21 +229,17 @@ export struct AddTemporaryInPage {
             .fontSize(14)
             .fontColor($r("app.color.item_color_black"))
         }
-               .width("40%")
         Text("浙江钧普科技股份有限公司1号库房")
           .fontWeight(FontWeight.Medium)
           .fontSize(21)
           .fontColor($r("app.color.title_background"))
-                  .width("60%")
+          .width("80%")
           .textAlign(TextAlign.Start)
-                  .padding({left:2,bottom: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 }){
+          .margin({left:15})
+      }.width("100%").height("15%").backgroundColor("#fff").padding({top:10,bottom:10,left:2,right:5})
+
+      Flex({ direction: FlexDirection.Column }) {
+        Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
           Row() {
             Divider()
               .vertical(true)
@@ -247,19 +253,23 @@ export struct AddTemporaryInPage {
               .fontSize(14)
               .fontColor($r("app.color.item_color_black"))
           }
-               Row(){
-                  Text("品种个数:").margin({left:10,right:10})
+
+          Row() {
+            Text("品种个数:").margin({ left: 10, right: 10 })
             Text("0").fontColor($r("app.color.title_background")).fontSize("24vp")
-                  Text("合计数量").margin({left:10,right:10})
+            Text("合计数量").margin({ left: 10, right: 10 })
             Text("0").fontColor($r("app.color.title_background")).fontSize("24vp")
           }
-            }.padding({left:2,right:10,bottom:20,top:20})
+        }.padding({ left: 2, right: 10, bottom: 20, top: 20 })
         .width("100%")
-            Column(){
-               BasicTable({dataSource:[]})
+
+        Column() {
+          BasicTable({ dataSource: [] })
         }.flexGrow(1)
-         }.padding({}).borderRadius(15)
-         .margin({top:20})
+      }
+      .padding({})
+      .borderRadius(15)
+      .margin({ top: 20 })
       .width("100%")
       .backgroundColor("#fff")
     }
@@ -267,33 +277,33 @@ export struct AddTemporaryInPage {
     .height("100%")
 
   }
-   build(){
+
+  build() {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-            TitleBar({ title: "物资新增" }).padding({bottom:10})
+        TitleBar({ title: "物资新增" }).padding({ bottom: 10 })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
-                  Column(){
+            Column() {
               this.VoucherRow()
             }.width("100%")
 
           }.tabBar(this.TabBuilder(0, '凭证信息'))
+
           TabContent() {
-                  Column(){
+            Column() {
               this.WzInfoRow()
             }.width("100%")
           }.tabBar(this.TabBuilder(1, '物资信息'))
         }
-            .margin({left:15,right:15,top:15})
+        .margin({ left: 15, right: 15, top: 15 })
         .onChange((index: number) => {
           this.currentIndex = index
         })
-            Row() {
           Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
-                  Button("射频扫码").CommonButtonStyle().width("50%")
-                  Button("保存").CommonButtonStyle().width("50%")
-               }
-            }.margin({left:20,right:20}).height(80)
+            Button("射频扫码").CommonButtonStyle().width("45%")
+            Button("保存").CommonButtonStyle().width("45%")
+          }.height(80).width("100%")
       }
     }.linearGradient({
       direction: GradientDirection.Right, // 渐变方向

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
 import router from '@ohos.router';
+import { Demo } from '../../view/demo/demo';
 @Extend(Button) function bottomBtnSty() {
   .borderWidth(1)
   .padding({top:1,bottom:1,right:7,left:7})
@@ -15,6 +16,9 @@ import router from '@ohos.router';
 @Component
 struct WzConversionPage{
   private  searchcontroller: SearchController = new SearchController()
+  itemClick() {
+    router.pushUrl({url:'pages/order_detail/PzAdjustModelPage'})
+  }
   @Builder bottomButtons() {
     Row() {
       Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
@@ -68,10 +72,10 @@ struct WzConversionPage{
           }.height(60)
         }.width("100%")
         .padding('15vp')
-        Row(){
-          // 底部按钮
-          this.bottomButtons();
-        }.width("100%").padding("2vp").height(40)
+        // 列表
+        Column() {
+          Demo({itemClick: this.itemClick}).width('90%')
+        }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
         Column(){
           BasicTable({dataSource:[]})
         }.flexGrow(1)

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
 import router from '@ohos.router';
+import { Demo } from '../../view/demo/demo';
 @Extend(Button) function bottomBtnSty() {
   .borderWidth(1)
   .padding({top:1,bottom:1,right:7,left:7})
@@ -20,7 +21,9 @@ struct WzExchangePage{
   @State currentIndex: number = 0
   private controller: TabsController = new TabsController()
   private  searchcontroller: SearchController = new SearchController()
-
+  itemClick() {
+    router.pushUrl({url:'pages/order_detail/PzAdjustModelPage'})
+  }
   @Builder TabBuilder(index: number, name: string) {
     Column() {
       Text(name)
@@ -104,9 +107,12 @@ struct WzExchangePage{
         .onChange((index: number) => {
           this.currentIndex = index
         })
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
+
+        // 列表
+        Column() {
+          Demo({itemClick: this.itemClick}).width('90%')
+        }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
+
         Row(){
           // 底部按钮
           this.bottomButtons();

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';
+import { Demo } from '../../view/demo/demo';
+import { BasicDialog } from '../../view/BasicDialog/BasicDialog';
 
 @Extend(Button) function bottomBtnSty() {
   .borderWidth(1)
-  .padding({top:1,bottom:1,right:7,left:7})
+  .padding({ top: 1, bottom: 1, right: 7, left: 7 })
   .borderColor('#0fa983')
   .backgroundColor('#fff')
   .fontColor('#0fa983')
@@ -13,6 +15,7 @@ import router from '@ohos.router';
   .stateEffect(true)
 
 }
+
 @Entry
 @Component
 export struct WzInPage {
@@ -22,13 +25,63 @@ export struct WzInPage {
   private controller: TabsController = new TabsController()
   private searchcontroller: SearchController = new SearchController()
 
+  itemClick() {
+    router.pushUrl({url:'pages/order_detail/PzInOutDetailPage'})
+  }
+
+  @Builder container() {
+    Column() {
+      Row() {
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Text('完成').margin({ left: 20 })
+          Radio({ value: 'Radio1', group: 'radioGroup' })
+            .onChange((isChecked: boolean) => {
+              console.log('Radio1 status is ' + isChecked)
+            }).margin({ right: 20 })
+        }
+      }.padding({ top: 10, bottom: 10 })
+
+      Row() {
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Text('未完成').margin({ left: 20 })
+          Radio({ value: 'Radio1', group: 'radioGroup' })
+            .onChange((isChecked: boolean) => {
+              console.log('Radio1 status is ' + isChecked)
+            }).margin({ right: 20 })
+        }
+      }.padding({ top: 10, bottom: 10 })
+    }
+  }
+
+  dialogController: CustomDialogController = new CustomDialogController({
+    builder: BasicDialog({
+      cancel: this.onCancel,
+      confirm: this.onSubmit,
+      title: '设置状态',
+      container: this.container
+    }),
+    autoCancel: true,
+    alignment: DialogAlignment.Bottom,
+    offset: { dx: 0, dy: -20 },
+    gridCount: 4,
+    customStyle: false
+  })
+
+  onCancel() {
+    console.info('------取消------')
+  }
+
+  onSubmit() {
+    console.info('------确认------')
+  }
+
   @Builder TabBuilder(index: number, name: string) {
     Column() {
       Text(name)
         .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
         .fontSize(16)
         .lineHeight(22)
-        .margin({bottom: 7 })
+        .margin({ bottom: 7 })
       Divider()
         .strokeWidth(2)
         .color('#fff')
@@ -36,13 +89,14 @@ 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)
+          .visibility(this.currentIndex === 1 ? Visibility.Visible : Visibility.None)
           .bottomBtnSty()
-          .onClick( () => {
+          .onClick(() => {
             router.pushUrl({
               url: "pages/metailmange/AddTemporaryInPage",
             })
@@ -52,27 +106,31 @@ export struct WzInPage {
         Button("设置状态")
           .bottomBtnSty()
           .onClick(() => {
+            if (this.dialogController != undefined) {
+              this.dialogController.open()
+            }
           })
           .fontColor("#0fa983")
           .fontSize("14vp")
         Button("导出数据包")
           .bottomBtnSty()
           .onClick(() => {
-          }).fontColor("#0fa983") .fontSize("14vp")
-        Button("全选")
-          .bottomBtnSty().fontColor("#0fa983") .fontSize("14vp")
+          }).fontColor("#0fa983").fontSize("14vp")
+        // Button("全选")
+        //   .bottomBtnSty().fontColor("#0fa983") .fontSize("14vp")
         Button("清空选择")
           .bottomBtnSty()
-          .onClick(() =>{
+          .onClick(() => {
 
-          }).fontColor("#0fa983") .fontSize("14vp")
+          }).fontColor("#0fa983").fontSize("14vp")
       }
     }.height(80)
   }
-  build(){
+
+  build() {
     Column() {
-      Flex({direction:FlexDirection.Column}){
-        TitleBar({ title:"物资入库" })
+      Flex({ direction: FlexDirection.Column }) {
+        TitleBar({ title: "物资入库" })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             // Column().width('100%').height('100%').backgroundColor('#00CB87')
@@ -86,8 +144,9 @@ export struct WzInPage {
         .onChange((index: number) => {
           this.currentIndex = index
         })
-        Row(){
-          Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }){
+
+        Row() {
+          Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
             Search({ placeholder: '请输入凭证号', controller: this.searchcontroller })
               .height(40)
               .backgroundColor('#F5F5F5')
@@ -95,7 +154,7 @@ export struct WzInPage {
               .textAlign(TextAlign.Center)
               .placeholderFont({ size: 14, weight: 400 })
               .textFont({ size: 14, weight: 400 })
-              .width('70%')
+              .width('60%')
               .onSubmit((value: string) => {
               })
               .onChange((value: string) => {
@@ -104,28 +163,33 @@ export struct WzInPage {
             Select([{ value: "未完成" }, { value: "已完成" }])
               .value('请选择状态')
               .borderWidth(1)
-              .borderRadius(10)
+              .borderRadius(6)
+              .height(42)
+              .margin({ left: 10 })
               .borderColor("#454545")
               .onSelect(async (index: number, value?: string) => {
-                if(value == '未完成') {
-                  console.log("未完成",'未完成')
+                if (value == '未完成') {
+                  console.log("未完成", '未完成')
                 } else {
-                  console.log("已完成",'已完成')
+                  console.log("已完成", '已完成')
                 }
               })
-              .width(110)
+              .width(120)
               .padding({
-                right:10
+                right: 15
               })
           }
-        }.margin({top:-30})
+        }.margin({ top: -20 })
         .width("100%")
         .padding('15vp')
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
-        Row(){
+
+        // 列表
+        Column() {
+          Demo({itemClick: this.itemClick}).width('90%')
+        }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
+
         // 底部按钮
+        Row() {
           this.bottomButtons();
         }.backgroundColor("#97c6a6").width("100%").height(80)
       }

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import { Demo } from '../../view/demo/demo';
+import router from '@ohos.router';
 @Extend(Button) function bottomBtnSty() {
   .borderWidth(1)
   .borderColor('#0fa983')
@@ -17,6 +19,10 @@ struct WzInvPage{
   @State currentIndex: number = 0
   private controller: TabsController = new TabsController()
   private  searchcontroller: SearchController = new SearchController()
+
+  itemClick() {
+    router.pushUrl({url:'pages/order_detail/PzInvDetailPage'})
+  }
   @Builder TabBuilder(index: number, name: string) {
     Column() {
       Text(name)
@@ -86,9 +92,10 @@ struct WzInvPage{
         .onChange((index: number) => {
           this.currentIndex = index
         })
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
+        // 列表
+        Column() {
+          Demo({itemClick: this.itemClick}).width('90%')
+        }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
         Row(){
           // 底部按钮
           this.bottomButtons();

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

 import { TitleBar } from '../../view/title/TitleBar'
-import { BasicTable } from '../../view/BasicTable/BasicTable'
+import { Demo } from '../../view/demo/demo';
 import router from '@ohos.router';
 @Extend(Button) function bottomBtnSty() {
   .borderWidth(1)
@@ -20,6 +20,9 @@ export struct WzOutPage {
   @State currentIndex: number = 0
   private controller: TabsController = new TabsController()
   private  searchcontroller: SearchController = new SearchController()
+  itemClick() {
+    router.pushUrl({url:'pages/order_detail/PzInOutDetailPage'})
+  }
 
   @Builder TabBuilder(index: number, name: string) {
     Column() {
@@ -104,9 +107,10 @@ export struct WzOutPage {
         .onChange((index: number) => {
           this.currentIndex = index
         })
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
+        // 列表
+        Column() {
+          Demo({itemClick: this.itemClick}).width('90%')
+        }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
         Row(){
           // 底部按钮
           this.bottomButtons();

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
-
+import { Demo } from '../../view/demo/demo';
+import router from '@ohos.router';
 @Extend(Button) function bottomBtnSty() {
   .borderWidth(1)
   .borderColor('#0fa983')
@@ -18,6 +19,9 @@ struct WzPositionPage{
   @State selectedFontColor: string = '#fff'
   @State currentIndex: number = 0
   @State titleBarPadding:number=0
+  itemClick() {
+    router.pushUrl({url:'pages/order_detail/PzPourStoragePage'})
+  }
   @Builder bottomButtons() {
     Row() {
       Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
@@ -62,9 +66,10 @@ struct WzPositionPage{
           // 底部按钮
           this.bottomButtons();
         }.width("100%").height(80)
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
+        // 列表
+        Column() {
+          Demo({itemClick: this.itemClick}).width('90%')
+        }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
 
       }
     }.linearGradient({

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import { Demo } from '../../view/demo/demo';
+import router from '@ohos.router';
 @Extend(Button) function bottomBtnSty() {
   .borderWidth(1)
   .borderColor('#0fa983')
@@ -18,7 +20,9 @@ struct WzReversePage{
   @State currentIndex: number = 0
   private controller: TabsController = new TabsController()
   private  searchcontroller: SearchController = new SearchController()
-
+  itemClick() {
+    router.pushUrl({url:'pages/order_detail/PzPourStoragePage'})
+  }
   @Builder TabBuilder(index: number, name: string) {
     Column() {
       Text(name)
@@ -87,9 +91,10 @@ struct WzReversePage{
         .onChange((index: number) => {
           this.currentIndex = index
         })
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
+        // 列表
+        Column() {
+          Demo({itemClick: this.itemClick}).width('90%')
+        }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
         Row(){
           // 底部按钮
           this.bottomButtons();

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

+import { LeftDialog } from '../../view/LeftDialog/LeftDialog'
+import { TitleBar } from '../../view/title/TitleBar'
+
+@Extend(Button) function CommonButtonStyle() {
+  .borderWidth(2)
+  .borderColor('#0fa983')
+  .backgroundColor('#fff')
+  .fontColor('#0fa983')
+  .borderRadius(3)
+  .type(ButtonType.Normal)
+  .height(30)
+  .stateEffect(true)
+}
+
+@Entry
+@Component
+export struct WzStatus {
+  @State private finishNum: number = 0
+  @State private unFinishNum: number = 5
+  @State private numberPercentage: string = "0/500个"
+  @State show: boolean = false
+  @State private dataSource: any = [
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+    {mc: '冬季防寒靴100000',dm: 100000, pzsl: 0, rksl: 100, status: '未完成', hx: '180100002'},
+  ]
+  @Builder DetailBuilder() {
+    Column() {
+      List({ space: 2 }) {
+        ListItem() {
+            Row() {
+              Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) {
+                Text('号型:180100002').fontSize(12).fontColor('#3b4144')
+                Text('凭证数量:0').fontSize(12).fontColor('#3b4144')
+              }
+              .width('70%')
+
+              Blank()
+                .layoutWeight(1)
+
+              Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Start }) {
+                Text('未完成').fontSize(12).fontColor('#3b4144')
+                Text('入库数量:100').fontSize(12).fontColor('#3b4144')
+
+              }
+              .width('40%')
+
+            }
+            .width('100%')
+            .justifyContent(FlexAlign.SpaceBetween)
+            .padding({ left: 12, right: 18 })
+          }.height(90)
+        }.margin({top: 100})
+    }.width('100%')
+  }
+
+  dialogController: CustomDialogController = new CustomDialogController({
+    builder: LeftDialog({
+      cancel: this.onCancel,
+      confirm: this.onSubmit,
+      container: this.DetailBuilder,
+    }),
+    alignment: DialogAlignment.CenterEnd,
+    customStyle: true,
+  })
+
+  onCancel() {
+    console.info('------取消------')
+  }
+
+  onSubmit() {
+    console.info('------确认------')
+  }
+
+  existApp() {
+    console.info('Click the callback in the blank area')
+  }
+
+
+
+  build() {
+    Column() {
+      TitleBar({ title: "物资状态" })
+      Flex({ direction: FlexDirection.Column }) {
+        Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+          Column() {
+            Text('完成:' + this.finishNum + '个' + ' 未完成:' + this.unFinishNum + '个').fontSize(13)
+          }
+          Column() {
+            Text('数量:'+  this.numberPercentage).fontSize(13)
+          }
+        }
+        .width('100%')
+        .backgroundColor('#fff')
+        .height(52)
+        .borderRadius(5)
+        .margin({ bottom: 10 })
+        .padding({ left: 10, right: 10 })
+
+        Row() {
+          List({ space: 2 }) {
+            ForEach(this.dataSource, (item: any) => {
+              ListItem() {
+                Row() {
+                  Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) {
+                    Text('名称: ' + item.mc).fontSize(14).fontColor('#3b4144')
+                    Text('代码: ' + item.dm).fontSize(14).fontColor('#3b4144')
+                    Button('号型信息').CommonButtonStyle()
+                  }
+                  .width('70%')
+
+                  Blank()
+                    .layoutWeight(1)
+
+                  Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Start }) {
+                    Text('凭证数量: ' + item.pzsl).fontSize(14).fontColor('#3b4144')
+                    Text('入库数量: ' + item.rksl).fontSize(14).fontColor('#3b4144')
+                    Text(item.status).fontSize(14).fontColor( item.status == '未完成' ? 'red': 'green')
+                  }
+                  .width('40%')
+
+                }
+                .width('100%')
+                .justifyContent(FlexAlign.SpaceBetween)
+                .padding({ left: 12, right: 18 })
+              }
+              .height(90)
+              .onClick((item) => {
+                if (this.dialogController != undefined) {
+                  this.dialogController.open()
+                  this.DetailBuilder()
+                }
+              })
+            })
+          }
+          .width('100%')
+          .backgroundColor('#fff')
+          .divider({ strokeWidth: 1, color: 'rgb(242,242,242)' }) // 每行之间的分界线
+        }.margin({ bottom: 50 })
+
+
+
+      }.padding({ bottom: 20, left: 20, right: 20 })
+    }
+    .height('100%')
+    .linearGradient({
+      direction: GradientDirection.RightBottom,
+      repeating: true,
+      colors: [['#36a3c0', 0.0], ['#97c6a6', 1.0], ['#c7d799', 2.0]]
+    })
+  }
+
+}
\ No newline at end of file

entry/src/main/ets/pages/order_detail/PzAdjustModelPage.ets

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import router from '@ohos.router';
+
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
   .borderColor('#0fa983')
@@ -273,7 +275,9 @@ struct PzAdjustModelPage{
               .onChange((value: string) => {
               }).margin({left:10})
               .borderRadius(5)
-            Button("查看状态").CommonButtonStyle().width("25%").margin({left:5,right:5})
+            Button("查看状态").CommonButtonStyle().width("25%").margin({left:5,right:5}).onClick(()=>{
+              router.pushUrl({url:'pages/metailmange/WzStatus'})
+            })
           }.width("100%")
         }.padding({top:10,bottom:10}).width("100%")
         Column(){

entry/src/main/ets/pages/order_detail/PzInOutDetailPage.ets

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import router from '@ohos.router';
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
   .borderColor('#0fa983')
@@ -247,7 +248,9 @@ struct PzInOutDetailPage{
               .onChange((value: string) => {
               }).margin({left:10})
               .borderRadius(5)
-            Button("查看状态").CommonButtonStyle().width("25%").margin({left:5,right:5})
+            Button("查看状态").CommonButtonStyle().width("25%").margin({left:5,right:5}).onClick(()=>{
+              router.pushUrl({url:'pages/metailmange/WzStatus'})
+            })
           }.width("100%")
         }.padding({top:10,bottom:10}).width("100%")
         Column(){

entry/src/main/ets/pages/order_detail/PzInvDetailPage.ets

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import router from '@ohos.router';
+
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
   .borderColor('#0fa983')
@@ -232,7 +234,9 @@ struct PzInvDetailPage{
               .onChange((value: string) => {
               }).margin({left:10})
               .borderRadius(5)
-            Button("查看状态").CommonButtonStyle().width("25%").margin({left:5,right:5})
+            Button("查看状态").CommonButtonStyle().width("25%").margin({left:5,right:5}).onClick(()=>{
+              router.pushUrl({url:'pages/metailmange/WzStatus'})
+            })
           }.width("100%")
         }.padding({top:10,bottom:10}).width("100%")
         Column(){

entry/src/main/ets/pages/order_detail/PzPourStoragePage.ets

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import router from '@ohos.router';
+
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
   .borderColor('#0fa983')
@@ -311,7 +313,9 @@ struct PzPourStoragePage{
               .onChange((value: string) => {
               }).margin({left:10})
               .borderRadius(5)
-            Button("查看状态").CommonButtonStyle().width("25%").margin({left:5,right:5})
+            Button("查看状态").CommonButtonStyle().width("25%").margin({left:5,right:5}).onClick(()=>{
+              router.pushUrl({url:'pages/metailmange/WzStatus'})
+            })
           }.width("100%")
         }.padding({top:10,bottom:10}).width("100%")
         Column(){

entry/src/main/ets/pages/sub_systemMaintenance/demo.ets

-@Entry
-@Component
-struct ActionSheetExample {
-  build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Button('Click to Show ActionSheet')
-        .onClick(() => {
-          ActionSheet.show({
-            title: '',
-            message: '',
-            autoCancel: false,
-            confirm: {
-              value: '取消',
-              action: () => {
-                console.log('Get Alert Dialog handled')
-              }
-            },
-            alignment: DialogAlignment.Bottom,
-            offset: { dx: 0, dy: -10 },
-            sheets: [
-              {
-                title: '清除基础数据',
-                action: () => {
-                  console.log('apples')
-                }
-              },
-              {
-                title: '清除单据数据',
-                action: () => {
-                  console.log('bananas')
-                }
-              },
-              {
-                title: 'pears',
-                action: () => {
-                  console.log('pears')
-                }
-              }
-            ]
-          })
-        })
-    }.width('100%')
-    .height('100%')
-  }
-}
\ No newline at end of file

entry/src/main/ets/view/LeftDialog/LeftDialog.ets

+@CustomDialog
+@Component
+export struct LeftDialog {
+  controller: CustomDialogController
+  cancel: () => void
+  confirm: () => void
+  @BuilderParam container: () => void
+
+  build() {
+    Column() {
+
+      this.container()
+
+    }
+    .width('60%')
+    .height('100%')
+    .backgroundColor('#fff')
+  }
+}
\ No newline at end of file

entry/src/main/ets/view/demo/demo.ets

+@Entry
+@Component
+export struct Demo {
+  arr = [1, 2, 3, 4, 5, 6,7,8,9,10,11,12]
+  itemClick: () => void
+
+  build() {
+
+      Column() {
+        Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) {
+          CheckboxGroup({ group: 'checkboxGroup' })
+            .selectedColor('#007DFF')
+            .onChange((itemName: CheckboxGroupResult) => {
+              console.info("checkbox group content" + JSON.stringify(itemName))
+            })
+          Text("全选").margin({ left: 10 })
+        }.margin({ bottom: -15, left: 8 }).backgroundColor('#fff').zIndex(999)
+        List(){
+            ForEach(this.arr, (item, index) => {
+              ListItem(){
+                Row() {
+                  Checkbox({ name: 'checkbox1', group: 'checkboxGroup' })
+                    .selectedColor('#007DFF')
+                    .onChange((value: boolean) => {
+                      console.info('Checkbox1 change is' + value)
+                    }).margin({ right: 10,left: 10 })
+                  Column() {
+                    Text('2023-01-17').alignSelf(ItemAlign.Start).width("30%")
+                    Text("收物单").alignSelf(ItemAlign.Start).width("30%").margin({ top: 5 })
+                  }
+
+                  Column() {
+                    Row() {
+                      Text('凭证号: ')
+                      Text('1')
+                    }.alignSelf(ItemAlign.Start).padding({ top: 8, bottom: 8 })
+
+                    Row() {
+                      Text("数量: ")
+                      Text('0').fontColor('#ff3d43')
+                      Text('/').fontColor('#ff3d43')
+                      Text('500').fontColor('#ff3d43')
+                    }.alignSelf(ItemAlign.Start)
+                  }.width("30%").padding({ top: 8, bottom: 8 })
+
+                  Row() {
+                    Text("状态: ")
+                    Text("未完成").fontColor('#ff3d43')
+                  }
+                }.margin({ top: 10 }).border({ width: { bottom: '1lpx' }, color: "#717171" })
+              }.onClick(() => this.itemClick())
+            })
+          }
+      }.width('100%').height('100%')
+
+    }
+
+}
\ No newline at end of file

entry/src/main/ets/view/demo/demo1.ets

+
+@Observed
+class Good {
+  index: number
+  constructor(index) {
+    this.index = index
+  }
+}
+
+@Entry
+@Component
+export struct Demo1 {
+  @State goodList: Good[] = [new Good(10), new Good(20) ]
+
+  build() {
+    Column() {
+      ForEach(this.goodList, (item) => {
+        child({ good: item })
+      })
+    }.width('100%').height('100%')
+  }
+}
+
+@Component
+struct child {
+  @ObjectLink good: Good
+
+  build() {
+    Column() {
+        Flex({ justifyContent: FlexAlign.SpaceBetween }) {
+          Column() {
+            Text("冬季防寒靴100000").padding({ top: 5, bottom: 5 })
+            Row() {
+              Text("号型: ")
+              Text("1003")
+            }.alignSelf(ItemAlign.Start).padding({ top: 5, bottom: 5 })
+
+            Row() {
+              Text("货位号: ")
+              Text("2")
+            }.alignSelf(ItemAlign.Start).padding({ top: 5, bottom: 5 })
+          }.margin({ left: 15 })
+
+          Column() {
+            Row() {
+              Text("总数: ")
+              Text(this.good.index.toString())
+            }.alignSelf(ItemAlign.End).padding({ top: 5, bottom: 5 })
+
+            Row() {
+              Counter() {
+                Text(this.good.index.toString())
+              }
+              .width(120)
+              .onInc(() => {
+                this.good.index++
+                console.log("item++",this.good.index)
+              })
+              .onDec(() => {
+                this.good.index--
+              })
+            }.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/resources/base/profile/main_pages.json

@@ -32,7 +32,7 @@
     "pages/order_detail/PzInvDetailPage",
     "pages/order_detail/PzPourStoragePage",
     "pages/sub_systemMaintenance/Version",
-    "pages/sub_systemMaintenance/Feedback"
-
+    "pages/sub_systemMaintenance/Feedback",
+    "pages/metailmange/WzStatus"
   ]
 }