Merge branch 'master' of http://gitlab.sothing.top/Mmao/jump_hm_warehouse

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

+import { BasicTable } from '../../view/BasicTable/BasicTable'
+import { TitleBar } from '../../view/title/TitleBar'
+
+@Entry
+@Component
+export struct GoodsShelf {
+  @State searchValue: string = ''
+  controller: SearchController = new SearchController()
+
+  build() {
+    Column() {
+      Flex({ direction: FlexDirection.Column }) {
+        TitleBar({ title: "货架查看" })
+        Row() {
+          Search({ value: this.searchValue, placeholder: '请输入货架号', controller: this.controller })
+            .height(40)
+            .backgroundColor('#F5F5F5')
+            .placeholderColor(Color.Grey)
+            .placeholderFont({ size: 14, weight: 400 })
+            .textFont({ size: 14, weight: 400 })
+            .onChange((value: string) => {
+              this.searchValue = value
+            })
+            .margin(20)
+            .borderRadius(5)
+        }
+        Column() {
+          BasicTable({ dataSource: [], emptyTitle: '暂无货架数据' })
+        }
+      }
+    }.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/sub_systemMaintenance/Pmhx.ets

+import { BasicTable } from '../../view/BasicTable/BasicTable'
+import { TitleBar } from '../../view/title/TitleBar'
+
+@Entry
+@Component
+export struct Pmhx {
+  @State searchValue: string = ''
+  controller: SearchController = new SearchController()
+
+  build() {
+    Column() {
+      Flex({ direction: FlexDirection.Column }) {
+        TitleBar({ title: "品名号型查看" })
+        Row() {
+          Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+            Column() {
+              Text('品名数量: 0个')
+            }
+            Column() {
+              Text('号型数量: 0个')
+            }
+          }
+          .width('100%').backgroundColor('#fff').height(52).borderRadius(5).padding({ left: 10, right: 10 })
+        }.padding({ top: 20, right: 20, left: 20 })
+        Row() {
+          Search({ value: this.searchValue, placeholder: '请输入六位品名代码', controller: this.controller })
+            .height(40)
+            .backgroundColor('#F5F5F5')
+            .placeholderColor(Color.Grey)
+            .placeholderFont({ size: 14, weight: 400 })
+            .textFont({ size: 14, weight: 400 })
+            .onChange((value: string) => {
+              this.searchValue = value
+            })
+            .margin(20)
+            .borderRadius(5)
+        }
+        Column() {
+          BasicTable({ dataSource: [], emptyTitle: '暂无品名号型数据' })
+        }
+      }
+    }.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/sub_systemMaintenance/Unit.ets

@@ -22,6 +22,7 @@ export struct Unit {
               this.searchValue = value
             })
             .margin(20)
+            .borderRadius(5)
         }
 
       }

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

@@ -22,11 +22,11 @@ export struct Warehouse {
               this.searchValue = value
             })
             .margin(20)
+            .borderRadius(5)
         }
         Column() {
-          BasicTable({ dataSource: [] })
+          BasicTable({ dataSource: [], emptyTitle: '暂无库房数据' })
         }
-
       }
     }.linearGradient({
       direction: GradientDirection.RightBottom,

entry/src/main/ets/view/BasicTable/BasicTable.ets

@@ -4,6 +4,9 @@ import { BasicColumn } from './table.type'
 export struct BasicTable {
   private columns: BasicColumn[];
   private dataSource: any[];
+  private emptyTitle: string;
+  private pageNo: string;
+  private pageSize: string;
 
   @Builder renderList() {
     Column() {
@@ -39,9 +42,9 @@ export struct BasicTable {
     Flex({justifyContent:FlexAlign.Center,alignItems:ItemAlign.Center}) {
       Column() {
         Image($r("app.media.empty")).width("42%")
-        Text("暂无数据").fontSize(22).fontColor("#fff").margin({top: 5})
+        Text(this.emptyTitle || "暂无数据").fontSize(22).fontColor("#fff").margin({top: 5})
       }
-    }.height('100%')
+    }.height('70%')
   }
 
 

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

@@ -14,6 +14,8 @@
     "pages/metailmange/AddConversionPage",
     "pages/metailmange/WzReversePage",
     "pages/sub_systemMaintenance/Unit",
-    "pages/sub_systemMaintenance/Warehouse"
+    "pages/sub_systemMaintenance/Warehouse",
+    "pages/sub_systemMaintenance/GoodsShelf",
+    "pages/sub_systemMaintenance/Pmhx"
   ]
 }

features/SystemMaintenance/src/main/ets/model/UniInitList.ets

@@ -33,14 +33,14 @@ export const uniInitList: UniListItem[] = [
     showExtraIcon: true,
     showArrow: true,
     //extraIcon: '',
-    url: 'goodsShelf'
+    url: 'pages/sub_systemMaintenance/GoodsShelf'
   },
   {
     title: '品名号型查看',
     showExtraIcon: true,
     showArrow: true,
     //extraIcon: '',
-    url: 'pmhx'
+    url: 'pages/sub_systemMaintenance/Pmhx'
   },
   {
     title: '系统设置',