From 13ae1a2d7590106fbe3f0bf7ee7ae27abca7ef2b Mon Sep 17 00:00:00 2001
From: th1029 <743242323@qq.com>
Date: Thu, 8 Sep 2022 11:35:51 +0800
Subject: [PATCH] =?UTF-8?q?wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/basic/colours.ts                  |  33 +
 src/api/wms/basic/customer.ts                 |  61 ++
 src/api/wms/basic/enterprise.ts               |  40 +
 src/api/wms/basic/material.ts                 |  70 ++
 src/api/wms/basic/materialType.ts             |  36 +
 src/api/wms/basic/shelves.ts                  |  45 ++
 src/api/wms/basic/supplier.ts                 |  53 ++
 src/api/wms/basic/units.ts                    |  32 +
 src/api/wms/basic/warehouse.ts                |  42 +
 .../routes/modules/wms/basic/wmsBasic.ts      |  51 ++
 src/views/wms/basic/colours/form.vue          | 112 +++
 src/views/wms/basic/colours/list.vue          | 172 ++++
 src/views/wms/basic/customer/form.vue         | 275 +++++++
 src/views/wms/basic/customer/list.vue         | 296 +++++++
 src/views/wms/basic/enterprise/form.vue       | 185 +++++
 src/views/wms/basic/enterprise/list.vue       | 225 ++++++
 src/views/wms/basic/material/add.vue          | 276 +++++++
 src/views/wms/basic/material/addOrUpdate.ts   | 483 +++++++++++
 src/views/wms/basic/material/detail.vue       | 513 ++++++++++++
 src/views/wms/basic/material/edit.vue         | 275 +++++++
 src/views/wms/basic/material/form.vue         | 758 ++++++++++++++++++
 src/views/wms/basic/material/index.vue        |  40 +
 src/views/wms/basic/material/list.vue         | 584 ++++++++++++++
 .../wms/basic/material/materialDetail.vue     | 513 ++++++++++++
 src/views/wms/basic/materialType/form.vue     | 158 ++++
 src/views/wms/basic/materialType/index.vue    |  40 +
 src/views/wms/basic/materialType/list.vue     | 199 +++++
 src/views/wms/basic/shelves/form.vue          | 189 +++++
 src/views/wms/basic/shelves/index.vue         |  40 +
 src/views/wms/basic/shelves/list.vue          | 236 ++++++
 src/views/wms/basic/supplier/form.vue         | 271 +++++++
 src/views/wms/basic/supplier/list.vue         | 291 +++++++
 src/views/wms/basic/units/form.vue            | 121 +++
 src/views/wms/basic/units/list.vue            | 176 ++++
 src/views/wms/basic/warehouse/form.vue        | 141 ++++
 src/views/wms/basic/warehouse/list.vue        | 226 ++++++
 src/views/wms/basic/wmsBasicDetail.vue        |  29 +
 37 files changed, 7287 insertions(+)
 create mode 100644 src/api/wms/basic/colours.ts
 create mode 100644 src/api/wms/basic/customer.ts
 create mode 100644 src/api/wms/basic/enterprise.ts
 create mode 100644 src/api/wms/basic/material.ts
 create mode 100644 src/api/wms/basic/materialType.ts
 create mode 100644 src/api/wms/basic/shelves.ts
 create mode 100644 src/api/wms/basic/supplier.ts
 create mode 100644 src/api/wms/basic/units.ts
 create mode 100644 src/api/wms/basic/warehouse.ts
 create mode 100644 src/router/routes/modules/wms/basic/wmsBasic.ts
 create mode 100644 src/views/wms/basic/colours/form.vue
 create mode 100644 src/views/wms/basic/colours/list.vue
 create mode 100644 src/views/wms/basic/customer/form.vue
 create mode 100644 src/views/wms/basic/customer/list.vue
 create mode 100644 src/views/wms/basic/enterprise/form.vue
 create mode 100644 src/views/wms/basic/enterprise/list.vue
 create mode 100644 src/views/wms/basic/material/add.vue
 create mode 100644 src/views/wms/basic/material/addOrUpdate.ts
 create mode 100644 src/views/wms/basic/material/detail.vue
 create mode 100644 src/views/wms/basic/material/edit.vue
 create mode 100644 src/views/wms/basic/material/form.vue
 create mode 100644 src/views/wms/basic/material/index.vue
 create mode 100644 src/views/wms/basic/material/list.vue
 create mode 100644 src/views/wms/basic/material/materialDetail.vue
 create mode 100644 src/views/wms/basic/materialType/form.vue
 create mode 100644 src/views/wms/basic/materialType/index.vue
 create mode 100644 src/views/wms/basic/materialType/list.vue
 create mode 100644 src/views/wms/basic/shelves/form.vue
 create mode 100644 src/views/wms/basic/shelves/index.vue
 create mode 100644 src/views/wms/basic/shelves/list.vue
 create mode 100644 src/views/wms/basic/supplier/form.vue
 create mode 100644 src/views/wms/basic/supplier/list.vue
 create mode 100644 src/views/wms/basic/units/form.vue
 create mode 100644 src/views/wms/basic/units/list.vue
 create mode 100644 src/views/wms/basic/warehouse/form.vue
 create mode 100644 src/views/wms/basic/warehouse/list.vue
 create mode 100644 src/views/wms/basic/wmsBasicDetail.vue

diff --git a/src/api/wms/basic/colours.ts b/src/api/wms/basic/colours.ts
new file mode 100644
index 0000000..29dab3e
--- /dev/null
+++ b/src/api/wms/basic/colours.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { BasicModel, Page } from '../../model/baseModel';
+
+const { adminPath } = useGlobSetting();
+
+export interface Colours extends BasicModel<Colours> {
+  colorCode?: string; // 主键
+  colorName?: string; // 颜色名称
+  sort?: number; // 顺序
+}
+export const coloursAllData = (params?: Colours | any) =>
+  defHttp.get<Colours>({ url: adminPath + '/wms/basic/colours/coloursAllData', params });
+
+export const coloursList = (params?: Colours | any) =>
+  defHttp.get<Colours>({ url: adminPath + '/wms/basic/colours/list', params });
+
+export const coloursListData = (params?: Colours | any) =>
+  defHttp.post<Page<Colours>>({ url: adminPath + '/wms/basic/colours/listData', params });
+
+export const coloursForm = (params?: Colours | any) =>
+  defHttp.get<Colours>({ url: adminPath + '/wms/basic/colours/form', params });
+
+export const coloursSave = (params?: any, data?: Colours | any) =>
+  defHttp.postJson<Colours>({ url: adminPath + '/wms/basic/colours/save', params, data });
+
+export const coloursDelete = (params?: Colours | any) =>
+  defHttp.get<Colours>({ url: adminPath + '/wms/basic/colours/delete', params });
diff --git a/src/api/wms/basic/customer.ts b/src/api/wms/basic/customer.ts
new file mode 100644
index 0000000..ef3bbe8
--- /dev/null
+++ b/src/api/wms/basic/customer.ts
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { Page } from '../../model/baseModel';
+import { User } from '../../sys/user';
+
+const { adminPath } = useGlobSetting();
+
+/*
+export interface Customer extends BasicModel<Customer> {
+  cusId?: string; // 客户id
+  cusCode?: string; // 客户编码
+  cusName?: string; // 客户名称
+  cusType?: string; // 客户类型
+  cusPy?: string; // 拼音
+  busLicense?: string; // 营业执照
+  responsiblePerson?: string; // 负责人
+  responsiblePhone?: string; // 负责人电话
+  linker1?: string; // 联系人1
+  phone1?: string; // 联系方式1
+  linker2?: string; // 联系人2
+  phone2?: string; // 联系方式2
+  email?: string; // 邮箱
+  sort?: number; // 排序（升序）
+  areaCode?: string; // 区
+  areaName?: string; // 区
+  address?: string; // 地址
+  taxNo?: string; // 税号
+}*/
+
+export interface CustomerUser extends User {
+  customer?: any;
+}
+
+export const customerList = (params?: CustomerUser | any) =>
+  defHttp.get<CustomerUser>({ url: adminPath + '/wms/basic/customer/list', params });
+
+export const customerListData = (params?: CustomerUser | any) =>
+  defHttp.post<Page<CustomerUser>>({ url: adminPath + '/wms/basic/customer/listData', params });
+
+export const customerForm = (params?: CustomerUser | any) =>
+  defHttp.get<CustomerUser>({ url: adminPath + '/wms/basic/customer/form', params });
+
+export const customerSave = (params?: any, data?: CustomerUser | any) =>
+  defHttp.postJson<CustomerUser>({ url: adminPath + '/wms/basic/customer/save', params, data });
+
+export const customerDisable = (params?: CustomerUser | any) =>
+  defHttp.get<CustomerUser>({ url: adminPath + '/wms/basic/customer/disable', params });
+
+export const customerEnable = (params?: CustomerUser | any) =>
+  defHttp.get<CustomerUser>({ url: adminPath + '/wms/basic/customer/enable', params });
+
+export const customerDelete = (params?: CustomerUser | any) =>
+  defHttp.get<CustomerUser>({ url: adminPath + '/wms/basic/customer/delete', params });
+
+export const resetpwd = (params?: CustomerUser | any) =>
+  defHttp.get<CustomerUser>({ url: adminPath + '/wms/basic/customer/resetpwd', params });
diff --git a/src/api/wms/basic/enterprise.ts b/src/api/wms/basic/enterprise.ts
new file mode 100644
index 0000000..5e636b1
--- /dev/null
+++ b/src/api/wms/basic/enterprise.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { BasicModel, Page } from '../../model/baseModel';
+
+const { adminPath } = useGlobSetting();
+
+export interface Enterprise extends BasicModel<Enterprise> {
+  code?: string; // 编码
+  name?: string; // 名称
+  linkman?: string; // 联系人
+  mobile?: string; // 联系电话
+  phone?: string; // 固定电话
+  address?: string; // 地址
+  kpxxSh?: string; // 开票信息:税号
+  kpxxQymc?: string; // 开票信息:企业名称
+  kpxxZcdh?: string; // 开票信息:注册电话
+  kpxxZcdz?: string; // 开票信息:注册地址
+  kpxxYhzh?: string; // kpxx_yhzh
+  kpxxKhyx?: string; // 开票信息:开户银行
+}
+
+export const enterpriseList = (params?: Enterprise | any) =>
+  defHttp.get<Enterprise>({ url: adminPath + '/wms/basic/enterprise/list', params });
+
+export const enterpriseListData = (params?: Enterprise | any) =>
+  defHttp.post<Page<Enterprise>>({ url: adminPath + '/wms/basic/enterprise/listData', params });
+
+export const enterpriseForm = (params?: Enterprise | any) =>
+  defHttp.get<Enterprise>({ url: adminPath + '/wms/basic/enterprise/form', params });
+
+export const enterpriseSave = (params?: any, data?: Enterprise | any) =>
+  defHttp.postJson<Enterprise>({ url: adminPath + '/wms/basic/enterprise/save', params, data });
+
+export const enterpriseDelete = (params?: Enterprise | any) =>
+  defHttp.get<Enterprise>({ url: adminPath + '/wms/basic/enterprise/delete', params });
diff --git a/src/api/wms/basic/material.ts b/src/api/wms/basic/material.ts
new file mode 100644
index 0000000..5e57466
--- /dev/null
+++ b/src/api/wms/basic/material.ts
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { BasicModel, Page } from '../../model/baseModel';
+
+const { adminPath } = useGlobSetting();
+
+export interface Material extends BasicModel<Material> {
+  warehouseId?: string; // 所属仓库
+  officeId?: any; // 所属部门
+  materialTypeCode?: string; // 物料分类编码
+  materialBarcode?: string; // 条码
+  materialCode?: string; // 编码
+  materialName?: string; // 名称
+  materialSpecs?: string; // 规格
+  materialBrand?: string; // 品牌
+  materialMnemonicCode?: string; // 助记码
+  expDateMgt?: string; // 是否启用保质期管理
+  expirationDate?: number; // 保质期
+  expirationDateDict?: string; // 保质期单位
+  expirationDateDay?: number; // 保质期换算成天
+  expirationPrompting?: number; // 提前X天预警
+  colourMgt?: string; // 是否启用颜色管理
+  colours?: string; // 颜色
+  singleMgt?: string; // 是否启用单件管理
+  sequenceMgt?: string; // 是否启用序列号管理
+  batchMethod?: string; // 是否启用批次管理
+  openMultipleUnits?: string; // 是否支持多单位
+  volume?: string; // 体积
+  weight?: string; // 净重
+  mlength?: string; // 长单品
+  mwidth?: string; // 宽单品
+  mheight?: string; // 高单品
+  msizeDict?: string; // 尺寸单位,字典
+  defaultQty?: number; // 默认装箱数量
+  taxRate?: number; // 税率
+  safetyStockWhMgt?: string; // 是否启用分仓库存预警
+  sort?: number; // 顺序
+}
+
+export const materialList = (params?: Material | any) =>
+  defHttp.get<Material>({ url: adminPath + '/wms/basic/material/list', params });
+
+export const materialListData = (params?: Material | any) =>
+  defHttp.post<Page<Material>>({ url: adminPath + '/wms/basic/material/listData', params });
+
+export const materialForm = (params?: Material | any) =>
+  defHttp.get<Material>({ url: adminPath + '/wms/basic/material/form', params });
+
+export const materialSave = (params?: any, data?: Material | any) =>
+  defHttp.postJson<Material>({ url: adminPath + '/wms/basic/material/save', params, data });
+
+export const materialDisable = (params?: Material | any) =>
+  defHttp.get<Material>({ url: adminPath + '/wms/basic/material/disable', params });
+
+export const materialEnable = (params?: Material | any) =>
+  defHttp.get<Material>({ url: adminPath + '/wms/basic/material/enable', params });
+
+export const materialDelete = (params?: Material | any) =>
+  defHttp.get<Material>({ url: adminPath + '/wms/basic/material/delete', params });
+
+export const checkMaterialCode = (oldCode: string, newCode: string) =>
+  defHttp.get<Material>({
+    url: adminPath + '/wms/basic/material/checkMaterialCode',
+    params: { oldCode, newCode },
+  });
diff --git a/src/api/wms/basic/materialType.ts b/src/api/wms/basic/materialType.ts
new file mode 100644
index 0000000..3146ab0
--- /dev/null
+++ b/src/api/wms/basic/materialType.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { TreeDataModel, TreeModel } from '../../model/baseModel';
+
+const { adminPath } = useGlobSetting();
+
+export interface MaterialType extends TreeModel<MaterialType> {
+  materialTypeCode?: string; // 物料分类编码
+  materialTypeName?: string; // 分类名称
+}
+
+export const materialTypeList = (params?: MaterialType | any) =>
+  defHttp.get<MaterialType>({ url: adminPath + '/wms/basic/materialType/list', params });
+
+export const materialTypeListData = (params?: MaterialType | any) =>
+  defHttp.post<MaterialType[]>({ url: adminPath + '/wms/basic/materialType/listData', params });
+
+export const materialTypeForm = (params?: MaterialType | any) =>
+  defHttp.get<MaterialType>({ url: adminPath + '/wms/basic/materialType/form', params });
+
+export const materialTypeCreateNextNode = (params?: MaterialType | any) =>
+  defHttp.get<MaterialType>({ url: adminPath + '/wms/basic/materialType/createNextNode', params });
+
+export const materialTypeSave = (params?: any, data?: MaterialType | any) =>
+  defHttp.postJson<MaterialType>({ url: adminPath + '/wms/basic/materialType/save', params, data });
+
+export const materialTypeDelete = (params?: MaterialType | any) =>
+  defHttp.get<MaterialType>({ url: adminPath + '/wms/basic/materialType/delete', params });
+
+export const materialTypeTreeData = (params?: any) =>
+  defHttp.get<TreeDataModel[]>({ url: adminPath + '/wms/basic/materialType/treeData', params });
diff --git a/src/api/wms/basic/shelves.ts b/src/api/wms/basic/shelves.ts
new file mode 100644
index 0000000..83ac19e
--- /dev/null
+++ b/src/api/wms/basic/shelves.ts
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { TreeDataModel, TreeModel } from '../../model/baseModel';
+
+const { adminPath } = useGlobSetting();
+
+export interface Shelves extends TreeModel<Shelves> {
+  shelvesCode?: string; // 主键
+  warehouseCode?: string; // 所属仓库
+  shelvesNo?: string; // 编码
+  name?: string; // 名称
+  type?: string; // 类型（1区域2货架3货位）
+}
+
+export const shelvesList = (params?: Shelves | any) =>
+  defHttp.get<Shelves>({ url: adminPath + '/wms/basic/shelves/list', params });
+
+export const shelvesListData = (params?: Shelves | any) =>
+  defHttp.post<Shelves[]>({ url: adminPath + '/wms/basic/shelves/listData', params });
+
+export const shelvesForm = (params?: Shelves | any) =>
+  defHttp.get<Shelves>({ url: adminPath + '/wms/basic/shelves/form', params });
+
+export const shelvesCreateNextNode = (params?: Shelves | any) =>
+  defHttp.get<Shelves>({ url: adminPath + '/wms/basic/shelves/createNextNode', params });
+
+export const shelvesSave = (params?: any, data?: Shelves | any) =>
+  defHttp.postJson<Shelves>({ url: adminPath + '/wms/basic/shelves/save', params, data });
+
+export const shelvesDisable = (params?: Shelves | any) =>
+  defHttp.get<Shelves>({ url: adminPath + '/basic/shelves/disable', params });
+
+export const shelvesEnable = (params?: Shelves | any) =>
+  defHttp.get<Shelves>({ url: adminPath + '/wms/basic/shelves/enable', params });
+
+export const shelvesDelete = (params?: Shelves | any) =>
+  defHttp.get<Shelves>({ url: adminPath + '/wms/basic/shelves/delete', params });
+
+export const shelvesTreeData = (params?: any) =>
+  defHttp.get<TreeDataModel[]>({ url: adminPath + '/wms/basic/shelves/treeData', params });
diff --git a/src/api/wms/basic/supplier.ts b/src/api/wms/basic/supplier.ts
new file mode 100644
index 0000000..d342698
--- /dev/null
+++ b/src/api/wms/basic/supplier.ts
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { Page } from '../../model/baseModel';
+import { User } from '../../sys/user';
+
+const { adminPath } = useGlobSetting();
+
+/*
+export interface Supplier extends BasicModel<Supplier> {
+  supId?: string; // 供应商id
+  supCode?: string; // 供应编码
+  supName?: string; // 供应商名称
+  linker?: string; // 联系人
+  phone?: string; // 联系方式
+  areaCode?: string; // 区
+  areaName?: string; // 区
+  address?: string; // 地址
+  email?: string; // 邮箱
+  sort?: number; // 排序（升序）
+}*/
+
+export interface SupplierUser extends User {
+  supplier?: any;
+}
+
+export const supplierList = (params?: SupplierUser | any) =>
+  defHttp.get<SupplierUser>({ url: adminPath + '/wms/basic/supplier/list', params });
+
+export const supplierListData = (params?: SupplierUser | any) =>
+  defHttp.post<Page<SupplierUser>>({ url: adminPath + '/wms/basic/supplier/listData', params });
+
+export const supplierForm = (params?: SupplierUser | any) =>
+  defHttp.get<SupplierUser>({ url: adminPath + '/wms/basic/supplier/form', params });
+
+export const supplierSave = (params?: any, data?: SupplierUser | any) =>
+  defHttp.postJson<SupplierUser>({ url: adminPath + '/wms/basic/supplier/save', params, data });
+
+export const supplierDisable = (params?: SupplierUser | any) =>
+  defHttp.get<SupplierUser>({ url: adminPath + '/wms/basic/supplier/disable', params });
+
+export const supplierEnable = (params?: SupplierUser | any) =>
+  defHttp.get<SupplierUser>({ url: adminPath + '/wms/basic/supplier/enable', params });
+
+export const supplierDelete = (params?: SupplierUser | any) =>
+  defHttp.get<SupplierUser>({ url: adminPath + '/wms/basic/supplier/delete', params });
+
+export const resetpwd = (params?: SupplierUser | any) =>
+  defHttp.get<SupplierUser>({ url: adminPath + '/wms/basic/supplier/resetpwd', params });
diff --git a/src/api/wms/basic/units.ts b/src/api/wms/basic/units.ts
new file mode 100644
index 0000000..f4923a3
--- /dev/null
+++ b/src/api/wms/basic/units.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { BasicModel, Page } from '../../model/baseModel';
+
+const { adminPath } = useGlobSetting();
+
+export interface Units extends BasicModel<Units> {
+  unitCode?: string; // 主键
+  unitName?: string; // 单位名称
+  allowDecimal?: string; // 是否允许小数
+  sort?: number; // 顺序
+}
+
+export const unitsAllListData = (params?: Units | any) =>
+  defHttp.get<Units>({ url: adminPath + '/wms/basic/units/unitsAllListData', params });
+
+export const unitsListData = (params?: Units | any) =>
+  defHttp.post<Page<Units>>({ url: adminPath + '/wms/basic/units/listData', params });
+
+export const unitsForm = (params?: Units | any) =>
+  defHttp.get<Units>({ url: adminPath + '/wms/basic/units/form', params });
+
+export const unitsSave = (params?: any, data?: Units | any) =>
+  defHttp.postJson<Units>({ url: adminPath + '/wms/basic/units/save', params, data });
+
+export const unitsDelete = (params?: Units | any) =>
+  defHttp.get<Units>({ url: adminPath + '/wms/basic/units/delete', params });
diff --git a/src/api/wms/basic/warehouse.ts b/src/api/wms/basic/warehouse.ts
new file mode 100644
index 0000000..69d5ec9
--- /dev/null
+++ b/src/api/wms/basic/warehouse.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useGlobSetting } from '/@/hooks/setting';
+import { BasicModel, Page } from '../../model/baseModel';
+
+const { adminPath } = useGlobSetting();
+
+export interface Warehouse extends BasicModel<Warehouse> {
+  code?: string; // 仓库编码
+  name?: string; // 仓库名称
+  officeId?: any; // 所属部门
+  responsiblePerson?: string; // 负责人
+  phone?: string; // 联系电话
+}
+
+//export const warehouseList = (params?: Warehouse | any) =>
+//  defHttp.get<Warehouse>({ url: adminPath + '/wms/basic/warehouse/list', params });
+
+export const warehouseAllData = (params?: Warehouse | any) =>
+  defHttp.get<Warehouse>({ url: adminPath + '/wms/basic/warehouse/warehouseAllData', params });
+
+export const warehouseListData = (params?: Warehouse | any) =>
+  defHttp.post<Page<Warehouse>>({ url: adminPath + '/wms/basic/warehouse/listData', params });
+
+export const warehouseForm = (params?: Warehouse | any) =>
+  defHttp.get<Warehouse>({ url: adminPath + '/wms/basic/warehouse/form', params });
+
+export const warehouseSave = (params?: any, data?: Warehouse | any) =>
+  defHttp.postJson<Warehouse>({ url: adminPath + '/wms/basic/warehouse/save', params, data });
+
+export const warehouseDisable = (params?: Warehouse | any) =>
+  defHttp.get<Warehouse>({ url: adminPath + '/wms/basic/warehouse/disable', params });
+
+export const warehouseEnable = (params?: Warehouse | any) =>
+  defHttp.get<Warehouse>({ url: adminPath + '/wms/basic/warehouse/enable', params });
+
+export const warehouseDelete = (params?: Warehouse | any) =>
+  defHttp.get<Warehouse>({ url: adminPath + '/wms/basic/warehouse/delete', params });
diff --git a/src/router/routes/modules/wms/basic/wmsBasic.ts b/src/router/routes/modules/wms/basic/wmsBasic.ts
new file mode 100644
index 0000000..1630550
--- /dev/null
+++ b/src/router/routes/modules/wms/basic/wmsBasic.ts
@@ -0,0 +1,51 @@
+import type { AppRouteModule } from '/@/router/types';
+
+import { LAYOUT } from '/@/router/constant';
+import { t } from '/@/hooks/web/useI18n';
+
+const wmsBasic: AppRouteModule = {
+  path: '/wms/basic',
+  name: 'Material',
+  component: LAYOUT,
+  redirect: '/wms/basic/',
+  meta: {
+    icon: 'ion:person-outline',
+    title: t('sys.account.center'),
+    orderNo: 100000,
+  },
+  children: [
+    {
+      path: 'material/detail',
+      name: 'ViewsBasicMaterialDetail',
+      component: () => import('/@/views/wms/basic/material/materialDetail.vue'),
+      meta: {
+        title: '物料详情',
+      },
+    },
+    {
+      path: 'material/add',
+      name: 'ViewsBasicMaterialAdd',
+      component: () => import('/@/views/wms/basic/material/add.vue'),
+      meta: {
+        title: '新增物料',
+        fromTab: 'ViewsBasicMaterialIndex',
+      },
+      beforeEnter: (to, from, next) => {
+        debugger;
+        console.log('2 beforeEnter', to, from);
+        next();
+      },
+    },
+    {
+      path: 'material/edit',
+      name: 'ViewsBasicMaterialEdit',
+      component: () => import('/@/views/wms/basic/material/edit.vue'),
+      meta: {
+        title: '编辑物料',
+        fromTab: 'ViewsBasicMaterialIndex',
+      },
+    },
+  ],
+};
+
+export default wmsBasic;
diff --git a/src/views/wms/basic/colours/form.vue b/src/views/wms/basic/colours/form.vue
new file mode 100644
index 0000000..9b6abb0
--- /dev/null
+++ b/src/views/wms/basic/colours/form.vue
@@ -0,0 +1,112 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'wms:basic:colours:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="60%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicColoursForm',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { Colours, coloursSave, coloursForm } from '/@/api/wms/basic/colours';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.colours');
+  const { showMessage } = useMessage();
+  const record = ref<Colours>({} as Colours);
+  const getTitle = computed(() => ({
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增颜色管理') : t('编辑颜色管理'),
+  }));
+
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('颜色名称'),
+      field: 'colorName',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      required: true,
+    },
+    {
+      label: t('顺序'),
+      field: 'sort',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { lg: 12, md: 24 },
+  });
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ loading: true });
+    const res = await coloursForm(data);
+    record.value = (res.colours || {}) as Colours;
+    record.value.__t = new Date().getTime();
+    setFieldsValue(record.value);
+    setDrawerProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        colorCode: record.value.colorCode,
+      };
+      // console.log('submit', params, data, record);
+      const res = await coloursSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/wms/basic/colours/list.vue b/src/views/wms/basic/colours/list.vue
new file mode 100644
index 0000000..e119cec
--- /dev/null
+++ b/src/views/wms/basic/colours/list.vue
@@ -0,0 +1,172 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button type="primary" @click="handleForm({})" v-auth="'wms:basic:colours:edit'">
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <a @click="handleForm({ colorCode: record.colorCode })">
+          {{ record.colorName }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicColoursList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { coloursDelete, coloursListData } from '/@/api/wms/basic/colours';
+  import { useDrawer } from '/@/components/Drawer';
+  import { FormProps } from '/@/components/Form';
+  import InputForm from './form.vue';
+
+  const { t } = useI18n('basic.colours');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('颜色管理管理'),
+  };
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('颜色名称'),
+        field: 'colorName',
+        component: 'Input',
+      },
+      {
+        label: t('状态'),
+        field: 'status',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_search_status',
+          allowClear: true,
+          onChange: handleSuccess,
+        },
+      },
+      {
+        label: t('备注信息'),
+        field: 'remarks',
+        component: 'Input',
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('颜色名称'),
+      dataIndex: 'colorName',
+      key: 'a.color_name',
+      sorter: true,
+      width: 230,
+      align: 'left',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('顺序'),
+      dataIndex: 'sort',
+      key: 'a.sort',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'status',
+      key: 'a.status',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_search_status',
+    },
+    {
+      title: t('更新时间'),
+      dataIndex: 'updateDate',
+      key: 'a.update_date',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'remarks',
+      key: 'a.remarks',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+  ];
+
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑颜色管理'),
+        onClick: handleForm.bind(this, { colorCode: record.colorCode }),
+        auth: 'wms:basic:colours:edit',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除颜色管理'),
+        popConfirm: {
+          title: t('是否确认删除颜色管理'),
+          confirm: handleDelete.bind(this, { colorCode: record.colorCode }),
+        },
+        auth: 'wms:basic:colours:edit',
+      },
+    ],
+  };
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerTable, { reload }] = useTable({
+    api: coloursListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await coloursDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/customer/form.vue b/src/views/wms/basic/customer/form.vue
new file mode 100644
index 0000000..1a19fa3
--- /dev/null
+++ b/src/views/wms/basic/customer/form.vue
@@ -0,0 +1,275 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'wms:basic:customer:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="60%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm">
+      <template #userRoleString>
+        <BasicTable @register="registerUserRoleTable" />
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicSupplierForm',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { CustomerUser, customerSave, customerForm } from '/@/api/wms/basic/customer';
+  import { checkLoginCode } from '/@/api/sys/user';
+  import { roleTreeData } from '/@/api/sys/role';
+  import { BasicTable, useTable } from '/@/components/Table';
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.customer');
+  const { showMessage } = useMessage();
+  const record = ref<CustomerUser>({} as CustomerUser);
+  const getTitle = computed(() => ({
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增供应商管理') : t('编辑供应商管理'),
+  }));
+  const op = ref<String>('');
+
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('客户编码'),
+      field: 'customer.cusCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      rules: [
+        { required: true },
+        { min: 4, max: 20, message: t('请输入长度在 4 到 20 个字符之间') },
+        { pattern: /^[\u0391-\uFFE5\w]+$/, message: t('不能输入特殊字符') },
+        {
+          validator(_rule, value) {
+            return new Promise((resolve, reject) => {
+              if (!value || value === '') return resolve();
+              checkLoginCode(record.value.customer.supCode || '', value)
+                .then((res) => (res ? resolve() : reject(t('登录账号已存在'))))
+                .catch((err) => reject(err.message || t('验证失败')));
+            });
+          },
+        },
+      ],
+    },
+    {
+      label: t('客户名称'),
+      field: 'customer.cusName',
+      component: 'Input',
+      required: true,
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('税号'),
+      field: 'customer.taxNo',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+    },
+    {
+      label: t('负责人'),
+      field: 'customer.responsiblePerson',
+      component: 'Input',
+      required: true,
+      componentProps: {
+        maxlength: 50,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('负责人电话'),
+      field: 'customer.responsiblePhone',
+      component: 'Input',
+      componentProps: {
+        maxlength: 20,
+      },
+      rules: [
+        {
+          pattern: /(^0[1-9]{1}\d{8,10}$)|(^1[3,4,5,6,7,8,9]\d{9}$)/g,
+          message: t('请输入固话或手机号码'),
+        },
+      ],
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('区'),
+      field: 'customer.areaCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('地址'),
+      field: 'customer.address',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('邮箱'),
+      field: 'customer.email',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('排序'),
+      field: 'customer.sort',
+      helpMessage: '排序，权重越大排名越靠前，请填写数字。',
+      component: 'InputNumber',
+      defaultValue: 0,
+      componentProps: {
+        maxlength: 8,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('备注信息'),
+      field: 'customer.remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('角色信息'),
+      field: 'roleInfo',
+      component: 'FormGroup',
+      colProps: { lg: 24, md: 24 },
+      ifShow: () => op.value === 'add' || op.value === 'auth',
+    },
+    {
+      label: t('分配角色'),
+      field: 'userRoleString',
+      component: 'Input',
+      colProps: { lg: 24, md: 24 },
+      slot: 'userRoleString',
+      show: () => op.value === 'add' || op.value === 'auth',
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { lg: 12, md: 24 },
+  });
+
+  const [registerUserRoleTable, userRoleTable] = useTable({
+    columns: [
+      {
+        title: t('角色名称'),
+        dataIndex: 'name',
+        width: 260,
+        align: 'center',
+      },
+      {
+        title: t('角色编码'),
+        dataIndex: 'id',
+        width: 260,
+        align: 'center',
+      },
+    ],
+    rowSelection: { type: 'checkbox' },
+    pagination: false,
+    bordered: true,
+    size: 'small',
+    inset: true,
+  });
+
+  async function setUserRoleTableData(res: Recordable) {
+    const dataSource = await roleTreeData({
+      userType: 'customer',
+    });
+    userRoleTable.setTableData(dataSource || []);
+    userRoleTable.setSelectedRowKeys(res.roleList?.map((item) => item.id) || []);
+  }
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ loading: true });
+    op.value = data.op || 'add';
+    const res = await customerForm(data);
+    debugger;
+    record.value = (res.customerUser || {}) as CustomerUser;
+    record.value.__t = new Date().getTime();
+    setFieldsValue(record.value);
+    /*updateSchema([
+      {
+        field: 'supCode',
+        componentProps: {
+          disabled: !record.value.isNewRecord,
+        },
+      },
+    ]);*/
+    if (op.value === 'add' || op.value === 'auth') {
+      setUserRoleTableData(res);
+    }
+    setDrawerProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        cusId: record.value.cusId,
+        cusCode: record.value.cusCode,
+        op: op.value,
+      };
+      // console.log('submit', params, data, record);
+      data.userType = 'customer';
+      if (op.value === 'add' || op.value === 'edit') {
+        data.loginCode = data.customer.cusCode;
+      }
+      if (op.value === 'add' || op.value === 'auth') {
+        data.userRoleString = userRoleTable.getSelectRowKeys().join(',');
+      }
+      const res = await customerSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/wms/basic/customer/list.vue b/src/views/wms/basic/customer/list.vue
new file mode 100644
index 0000000..42366a2
--- /dev/null
+++ b/src/views/wms/basic/customer/list.vue
@@ -0,0 +1,296 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button
+          type="primary"
+          @click="handleForm({ op: 'add' })"
+          v-auth="'wms:basic:customer:edit'"
+        >
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <a @click="handleForm({ cusId: record.customer.cusId, op: 'edit' })">
+          {{ record.customer.cusCode }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicSupplierList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { customerDelete, customerListData } from '/@/api/wms/basic/customer';
+  import { customerDisable, customerEnable, resetpwd } from '/@/api/wms/basic/customer';
+  import { useDrawer } from '/@/components/Drawer';
+  import { FormProps } from '/@/components/Form';
+  import InputForm from './form.vue';
+
+  const { t } = useI18n('basic.customer');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('客户信息管理'),
+  };
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('客户编码'),
+        field: 'customer.cusCode',
+        component: 'Input',
+      },
+      {
+        label: t('客户名称'),
+        field: 'customer.cusName',
+        component: 'Input',
+      },
+      {
+        label: t('负责人'),
+        field: 'customer.responsiblePerson',
+        component: 'Input',
+      },
+      {
+        label: t('状态'),
+        field: 'customer.status',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_search_status',
+          allowClear: true,
+        },
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('客户编码'),
+      dataIndex: 'customer.cusCode',
+      key: 'c.cus_code',
+      sorter: true,
+      width: 230,
+      align: 'left',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('客户名称'),
+      dataIndex: 'customer.cusName',
+      key: 'c.cus_name',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('客户类型'),
+      dataIndex: 'customer.cusType',
+      key: 'c.cus_type',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_user_status',
+    },
+    {
+      title: t('营业执照'),
+      dataIndex: 'customer.busLicense',
+      key: 'c.bus_license',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('负责人'),
+      dataIndex: 'customer.responsiblePerson',
+      key: 'c.responsible_person',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('负责人电话'),
+      dataIndex: 'customer.responsiblePhone',
+      key: 'c.responsible_phone',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('邮箱'),
+      dataIndex: 'customer.email',
+      key: 'c.email',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('排序'),
+      dataIndex: 'customer.sort',
+      key: 'c.sort',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('地址'),
+      dataIndex: 'customer.address',
+      key: 'c.address',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('税号'),
+      dataIndex: 'customer.taxNo',
+      key: 'c.tax_no',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'status',
+      key: 'c.status',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_search_status',
+    },
+    {
+      title: t('更新时间'),
+      dataIndex: 'customer.updateDate',
+      key: 'c.update_date',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'customer.remarks',
+      key: 'c.remarks',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+  ];
+
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑客户信息'),
+        onClick: handleForm.bind(this, { cusId: record.customer.cusId, op: 'edit' }),
+        auth: 'wms:basic:customer:edit',
+      },
+      {
+        icon: 'ant-design:stop-outlined',
+        color: 'error',
+        title: t('停用客户信息'),
+        popConfirm: {
+          title: t('确认是否需要停用供应商'),
+          confirm: handleDisable.bind(this, { cusId: record.customer.cusId }),
+        },
+        auth: 'wms:basic:customer:updateStatus',
+        ifShow: () => record.customer.status === '0',
+      },
+      {
+        icon: 'ant-design:check-circle-outlined',
+        color: 'success',
+        title: t('启用客户信息'),
+        popConfirm: {
+          title: t('确认是否需要启用供应商'),
+          confirm: handleEnable.bind(this, { cusId: record.customer.cusId }),
+        },
+        auth: 'wms:basic:customer:updateStatus',
+        ifShow: () => record.customer.status === '2',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除客户信息'),
+        popConfirm: {
+          title: t('确认是否需要删除供应商'),
+          confirm: handleDelete.bind(this, { cusId: record.customer.cusId }),
+        },
+        auth: 'wms:basic:customer:edit',
+      },
+      {
+        icon: 'ant-design:reload-outlined',
+        title: t('重置密码'),
+        popConfirm: {
+          title: t('确认是否需要重置密码'),
+          confirm: handleResetpwd.bind(this, {
+            userCode: record.customer.cusId,
+            cusId: record.customer.cusId,
+          }),
+        },
+        auth: 'sys:empUser:resetpwd',
+      },
+    ],
+  };
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerTable, { reload }] = useTable({
+    api: customerListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleDisable(record: Recordable) {
+    const res = await customerDisable(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleEnable(record: Recordable) {
+    const res = await customerEnable(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await customerDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleResetpwd(record: Recordable) {
+    const res = await resetpwd(record);
+    showMessage(res.message);
+  }
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/enterprise/form.vue b/src/views/wms/basic/enterprise/form.vue
new file mode 100644
index 0000000..ffec440
--- /dev/null
+++ b/src/views/wms/basic/enterprise/form.vue
@@ -0,0 +1,185 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'wms:basic:enterprise:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="60%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicEnterpriseForm',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { Enterprise, enterpriseSave, enterpriseForm } from '/@/api/wms/basic/enterprise';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.enterprise');
+  const { showMessage } = useMessage();
+  const record = ref<Enterprise>({} as Enterprise);
+  const getTitle = computed(() => ({
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增企业信息') : t('编辑企业信息'),
+  }));
+
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('名称'),
+      field: 'name',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('联系人'),
+      field: 'linkman',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+    },
+    {
+      label: t('联系电话'),
+      field: 'mobile',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('固定电话'),
+      field: 'phone',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+    },
+    {
+      label: t('地址'),
+      field: 'address',
+      component: 'Input',
+      componentProps: {
+        maxlength: 200,
+      },
+    },
+    {
+      label: t('开票信息'),
+      field: 'kpxxSh',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+    },
+    {
+      label: t('开票信息'),
+      field: 'kpxxQymc',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('开票信息'),
+      field: 'kpxxZcdh',
+      component: 'Input',
+      componentProps: {
+        maxlength: 20,
+      },
+    },
+    {
+      label: t('开票信息'),
+      field: 'kpxxZcdz',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('kpxx_yhzh'),
+      field: 'kpxxYhzh',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+    },
+    {
+      label: t('开票信息'),
+      field: 'kpxxKhyx',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { lg: 12, md: 24 },
+  });
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ loading: true });
+    const res = await enterpriseForm(data);
+    record.value = (res.enterprise || {}) as Enterprise;
+    record.value.__t = new Date().getTime();
+    setFieldsValue(record.value);
+    setDrawerProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        code: record.value.code,
+      };
+      // console.log('submit', params, data, record);
+      const res = await enterpriseSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/wms/basic/enterprise/list.vue b/src/views/wms/basic/enterprise/list.vue
new file mode 100644
index 0000000..ac1fdbc
--- /dev/null
+++ b/src/views/wms/basic/enterprise/list.vue
@@ -0,0 +1,225 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button type="primary" @click="handleForm({})" v-auth="'wms:basic:enterprise:edit'">
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <a @click="handleForm({ code: record.code })">
+          {{ record.name }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicEnterpriseList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { enterpriseDelete, enterpriseListData } from '/@/api/wms/basic/enterprise';
+  import { useDrawer } from '/@/components/Drawer';
+  import { FormProps } from '/@/components/Form';
+  import InputForm from './form.vue';
+
+  const { t } = useI18n('basic.enterprise');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('企业信息管理'),
+  };
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('名称'),
+        field: 'name',
+        component: 'Input',
+      },
+      {
+        label: t('备注信息'),
+        field: 'remarks',
+        component: 'Input',
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('名称'),
+      dataIndex: 'name',
+      key: 'a.name',
+      sorter: true,
+      width: 230,
+      align: 'left',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('联系人'),
+      dataIndex: 'linkman',
+      key: 'a.linkman',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('联系电话'),
+      dataIndex: 'mobile',
+      key: 'a.mobile',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('固定电话'),
+      dataIndex: 'phone',
+      key: 'a.phone',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('地址'),
+      dataIndex: 'address',
+      key: 'a.address',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('开票信息'),
+      dataIndex: 'kpxxSh',
+      key: 'a.kpxx_sh',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('开票信息'),
+      dataIndex: 'kpxxQymc',
+      key: 'a.kpxx_qymc',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('开票信息'),
+      dataIndex: 'kpxxZcdh',
+      key: 'a.kpxx_zcdh',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('开票信息'),
+      dataIndex: 'kpxxZcdz',
+      key: 'a.kpxx_zcdz',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('kpxx_yhzh'),
+      dataIndex: 'kpxxYhzh',
+      key: 'a.kpxx_yhzh',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('开票信息'),
+      dataIndex: 'kpxxKhyx',
+      key: 'a.kpxx_khyx',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('更新时间'),
+      dataIndex: 'updateDate',
+      key: 'a.update_date',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'remarks',
+      key: 'a.remarks',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+  ];
+
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑企业信息'),
+        onClick: handleForm.bind(this, { code: record.code }),
+        auth: 'wms:basic:enterprise:edit',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除企业信息'),
+        popConfirm: {
+          title: t('是否确认删除企业信息'),
+          confirm: handleDelete.bind(this, { code: record.code }),
+        },
+        auth: 'wms:basic:enterprise:edit',
+      },
+    ],
+  };
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerTable, { reload }] = useTable({
+    api: enterpriseListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await enterpriseDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/material/add.vue b/src/views/wms/basic/material/add.vue
new file mode 100644
index 0000000..8166955
--- /dev/null
+++ b/src/views/wms/basic/material/add.vue
@@ -0,0 +1,276 @@
+<template>
+  <PageWrapper>
+    <div class="bg-white flex flex-col justify-center items-center">
+      <BasicForm @register="registerForm">
+        <template #materialUnitsList>
+          <BasicTable
+            @register="registerMaterialUnitsTable"
+            @row-click="handleMaterialUnitsRowClick"
+          />
+        </template>
+        <template #addMaterialUnitsBut>
+          <a-button class="mt-2" @click="handleMaterialUnitsAdd">
+            <Icon icon="ant-design:plus-circle-outlined" /> {{ t('新增') }}
+          </a-button>
+        </template>
+      </BasicForm>
+    </div>
+    <template #rightFooter>
+      <div class="flex justify-center">
+        <a-button @click="undo"> <Icon icon="ant-design:undo-outlined" /> 返回</a-button>
+        <a-button class="!ml-4" type="primary" @click="submitAll">
+          <Icon icon="ant-design:check-outlined" /> 提交
+        </a-button>
+      </div>
+    </template>
+  </PageWrapper>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicMaterialAdd',
+    components: { [Card.name]: Card, PageWrapper },
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, onMounted, ref } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { PageWrapper } from '/@/components/Page';
+  import { Material, materialSave, materialForm } from '/@/api/wms/basic/material';
+  import { unitsAllListData } from '/@/api/wms/basic/units';
+  import { Card } from 'ant-design-vue';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { router } from '/@/router';
+  import { inputFormSchemas, undo } from './addOrUpdate';
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.material');
+  const { showMessage } = useMessage();
+  const record = ref<Material>({} as Material);
+  const op = ref<String>('');
+  let isMasterUnitIndex = 1;
+
+  const [registerMaterialUnitsTable, materialUnitsTable] = useTable({
+    actionColumn: {
+      width: 60,
+      actions: (record: Recordable) => [
+        {
+          icon: 'ant-design:delete-outlined',
+          color: 'error',
+          popConfirm: {
+            title: '是否确认删除',
+            confirm: handleMaterialUnitsDelete.bind(this, record),
+          },
+          auth: 'wms:basic:material:edit',
+        },
+      ],
+    },
+    rowKey: 'id',
+    pagination: false,
+    bordered: true,
+    size: 'small',
+    inset: true,
+  });
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    showActionButtonGroup: false,
+  });
+
+  onMounted(async () => {
+    const data: any = { id: router.currentRoute.value.query?.id };
+    debugger;
+    //data.id = `1546328235992219648`;
+    resetFields();
+    const res = await materialForm(data);
+    op.value = data.op || 'add';
+    record.value = (res.material || {}) as Material;
+    record.value.__t = new Date().getTime();
+    console.log(data);
+    setFieldsValue(record.value);
+
+    res.unitsAllListData = await unitsAllListData(data);
+    setMaterialUnitsListTableData(res);
+    if (op.value === 'add') {
+      handleMaterialUnitsAdd();
+    } else {
+      //.setTableData(record.value.employee?.materialUnitsList || []);
+    }
+  });
+
+  async function setMaterialUnitsListTableData(res: Recordable) {
+    materialUnitsTable.setColumns([
+      {
+        title: '标题',
+        dataIndex: 'jldw',
+        width: 100,
+        align: 'left',
+        editRow: false,
+        editRule: false,
+      },
+      {
+        title: '计量单位',
+        dataIndex: 'unit.unitCode',
+        dataLabel: 'unit.unitName',
+        width: 100,
+        align: 'left',
+        editRow: true,
+        editComponent: 'Select',
+        editComponentProps: {
+          options: res.unitsAllListData?.map((item) => ({
+            label: item.unitName,
+            value: item.unitCode,
+          })),
+        },
+        editRule: true,
+      },
+      {
+        title: '单位换算',
+        dataIndex: 'unitConvert',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '辅助单位',
+        dataIndex: 'auxiliaryUnit.unitCode',
+        dataLabel: 'auxiliaryUnit.unitName',
+        width: 100,
+        align: 'left',
+        editRow: true,
+        editComponent: 'Select',
+        editComponentProps: {
+          options: res.unitsAllListData?.map((item) => ({
+            label: item.unitName,
+            value: item.unitCode,
+          })),
+        },
+        editRule: false,
+      },
+      {
+        title: '辅助单位换算',
+        dataIndex: 'auxiliaryUnitConvert',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '采购价',
+        dataIndex: 'purchasePrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '成本价',
+        dataIndex: 'costPrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '批发价',
+        dataIndex: 'tradePrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '零售价(¥)',
+        dataIndex: 'retailPrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      //如一件黄金饰品的重量为500g,其中"件"为基本单位，"g"为辅助计量
+      {
+        title: '默认单位',
+        dataIndex: 'isMasterUnit',
+        width: 100,
+        align: 'center',
+        editRow: false,
+        dictType: 'sys_yes_no',
+        editRule: false,
+      },
+    ]);
+  }
+
+  function handleMaterialUnitsRowClick(record: Recordable) {
+    record.onEdit?.(true, false);
+  }
+
+  function handleMaterialUnitsAdd() {
+    materialUnitsTable.insertTableDataRecord({
+      id: 'rid_' + new Date().getTime(),
+      editable: true,
+      jldw: isMasterUnitIndex == 1 ? '基本单位' : '副单位',
+      isMasterUnit: isMasterUnitIndex == 1 ? isMasterUnitIndex : '0',
+      materialId: '',
+    });
+    isMasterUnitIndex++;
+  }
+
+  function handleMaterialUnitsDelete(record: Recordable) {
+    if (record.jldw === '基本单位') {
+      showMessage('不能删除基本单位！');
+      return;
+    }
+    materialUnitsTable.deleteTableDataRecord(record);
+  }
+
+  async function submitAll() {
+    try {
+      const data = await validate();
+      data.materialUnitsList = await getMaterialUnitsList();
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        id: record.value.id,
+      };
+      // console.log('submit', params, data, record);
+      const res = await materialSave(params, data);
+      showMessage(res.message);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      console.log('finally');
+    }
+  }
+
+  async function getMaterialUnitsList() {
+    let muValid = true;
+    let materialUnitsList = materialUnitsTable.getDataSource();
+    for (const record of materialUnitsList) {
+      if (!(await record.onEdit?.(false, true))) {
+        muValid = false;
+      }
+    }
+    if (!muValid) {
+      throw new Error('materialUnitsTableList valid.');
+    }
+    return materialUnitsList;
+  }
+</script>
+<style lang="less" scoped>
+  .high-form {
+    padding: 0px 0px 0px 0px;
+    padding-bottom: 48px;
+  }
+</style>
diff --git a/src/views/wms/basic/material/addOrUpdate.ts b/src/views/wms/basic/material/addOrUpdate.ts
new file mode 100644
index 0000000..307ce9b
--- /dev/null
+++ b/src/views/wms/basic/material/addOrUpdate.ts
@@ -0,0 +1,483 @@
+import { ref, computed, unref } from 'vue';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { FormSchema } from '/@/components/Form/index';
+import { checkMaterialCode, Material } from '/@/api/wms/basic/material';
+import { materialTypeTreeData } from '/@/api/wms/basic/materialType';
+import { warehouseAllData } from '/@/api/wms/basic/warehouse';
+import { coloursAllData } from '/@/api/wms/basic/colours';
+import { officeTreeData } from '/@/api/sys/office';
+import { useMultipleTabStore } from '/@/store/modules/multipleTab';
+import { router } from '/@/router';
+import type { RouteLocationNormalized } from 'vue-router';
+
+const { t } = useI18n('basic.material');
+const record = ref<Material>({} as Material);
+const tabStore = useMultipleTabStore();
+
+export const inputFormSchemas: FormSchema[] = [
+  {
+    label: t('基础信息'),
+    field: 'materialBaseInfo',
+    component: 'FormGroup',
+    colProps: { lg: 24, md: 24 },
+  },
+  {
+    label: t('编码'),
+    field: 'materialCode',
+    component: 'Input',
+    componentProps: {
+      maxlength: 20,
+    },
+    rules: [
+      { required: true },
+      { min: 4, max: 20, message: t('请输入长度在 4 到 20 个字符之间') },
+      {
+        validator(_rule, value) {
+          return new Promise((resolve, reject) => {
+            if (!value || value === '') return resolve();
+            checkMaterialCode(record.value.materialCode || '', value)
+              .then((res) => (res ? resolve() : reject(t('物料编码已存在'))))
+              .catch((err) => reject(err.message || t('验证失败')));
+          });
+        },
+      },
+    ],
+    colProps: {
+      span: 8,
+    },
+    required: true,
+  },
+  {
+    label: t('名称'),
+    field: 'materialName',
+    component: 'Input',
+    componentProps: {
+      maxlength: 100,
+    },
+    colProps: {
+      span: 8,
+    },
+    required: true,
+  },
+  {
+    label: t('规格'),
+    field: 'materialSpecs',
+    component: 'Input',
+    componentProps: {
+      maxlength: 100,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: '物料分类',
+    field: 'materialType.materialTypeCode',
+    fieldLabel: 'materialType.materialTypeName',
+    component: 'TreeSelect',
+    componentProps: {
+      api: materialTypeTreeData,
+      allowClear: true,
+    },
+    colProps: {
+      span: 8,
+    },
+    required: true,
+  },
+  {
+    label: t('所属仓库'),
+    field: 'warehouseId',
+    component: 'Select',
+    componentProps: {
+      api: warehouseAllData,
+      allowClear: false,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('所属部门'),
+    field: 'officeId.officeCode',
+    fieldLabel: 'officeId.officeName',
+    component: 'TreeSelect',
+    componentProps: {
+      api: officeTreeData,
+      canSelectParent: false,
+      allowClear: true,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('助记码'),
+    field: 'materialMnemonicCode',
+    component: 'Input',
+    componentProps: {
+      maxlength: 50,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('条码'),
+    field: 'materialBarcode',
+    component: 'Input',
+    componentProps: {
+      maxlength: 50,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('品牌'),
+    field: 'materialBrand',
+    component: 'Select',
+    componentProps: {
+      dictType: 'msg_inner_receiver_type',
+      allowClear: true,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('是否支持多单位'),
+    field: 'openMultipleUnits',
+    component: 'RadioButtonGroup',
+    defaultValue: '0',
+    componentProps: ({ formModel, formActionType }) => {
+      return {
+        dictType: 'sys_yes_no',
+        onChange: (e: any) => {
+          console.log(e);
+        },
+      };
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: '',
+    field: 'addMaterialUnitsBut',
+    component: 'Input',
+    colProps: { lg: 24, md: 24 },
+    slot: 'addMaterialUnitsBut',
+    show: ({ values }) => values.openMultipleUnits === '1',
+  },
+  {
+    label: '',
+    field: 'materialUnitsList',
+    component: 'Input',
+    colProps: { lg: 24, md: 24 },
+    slot: 'materialUnitsList',
+  },
+  {
+    label: t('行业特性'),
+    field: 'hytx',
+    component: 'FormGroup',
+    colProps: { lg: 24, md: 24 },
+  },
+  {
+    label: t('是否启用保质期管理'),
+    labelWidth: 170,
+    field: 'expDateMgt',
+    component: 'RadioButtonGroup',
+    componentProps: {
+      dictType: 'sys_yes_no',
+    },
+    defaultValue: '0',
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('保质期'),
+    field: 'expirationDate',
+    component: 'Input',
+    rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    colProps: {
+      span: 4,
+    },
+    show: ({ values }) => values.expDateMgt === '1',
+  },
+  {
+    label: t('保质期单位'),
+    field: 'expirationDateDict',
+    component: 'Select',
+    componentProps: {
+      dictType: 'sys_area_type',
+      allowClear: true,
+    },
+    colProps: {
+      span: 4,
+    },
+    show: ({ values }) => values.expDateMgt === '1',
+  },
+  {
+    label: t('提前X天预警'),
+    field: 'expirationPrompting',
+    component: 'Input',
+    rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    colProps: {
+      span: 8,
+    },
+    suffix: '天',
+    show: ({ values }) => values.expDateMgt === '1',
+  },
+  {
+    label: t('是否启用颜色管理'),
+    labelWidth: 170,
+    field: 'colourMgt',
+    component: 'RadioButtonGroup',
+    componentProps: {
+      dictType: 'sys_yes_no',
+    },
+    colProps: {
+      span: 8,
+    },
+    defaultValue: '0',
+  },
+  {
+    label: t('颜色'),
+    field: 'colours',
+    component: 'Select',
+    componentProps: {
+      api: coloursAllData,
+      allowClear: true,
+      mode: 'multiple',
+    },
+    colProps: {
+      span: 8,
+    },
+    show: ({ values }) => values.colourMgt === '1',
+  },
+  {
+    label: t('是否启用单件管理'),
+    labelWidth: 170,
+    field: 'singleMgt',
+    component: 'RadioButtonGroup',
+    defaultValue: '0',
+    componentProps: {
+      dictType: 'sys_yes_no',
+    },
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    label: t('是否启用序列号管理'),
+    labelWidth: 170,
+    field: 'sequenceMgt',
+    component: 'RadioButtonGroup',
+    defaultValue: '0',
+    componentProps: {
+      dictType: 'sys_yes_no',
+      allowClear: true,
+    },
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    label: t('是否启用批次管理'),
+    labelWidth: 170,
+    field: 'batchMethod',
+    component: 'RadioButtonGroup',
+    defaultValue: '0',
+    componentProps: {
+      dictType: 'sys_yes_no',
+      allowClear: true,
+    },
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    label: t('库存预警'),
+    field: 'kcyj',
+    component: 'FormGroup',
+    colProps: { lg: 24, md: 24 },
+  },
+  {
+    label: t('是否启用分仓库存预警'),
+    labelWidth: 170,
+    field: 'safetyStockWhMgt',
+    component: 'RadioButtonGroup',
+    defaultValue: '0',
+    componentProps: {
+      dictType: 'sys_yes_no',
+      allowClear: true,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('最低库存量'),
+    field: 'stockQtyMin',
+    component: 'Input',
+    rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('最高库存量'),
+    field: 'stockQtyMax',
+    component: 'Input',
+    rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('其它信息'),
+    field: 'qtxx',
+    component: 'FormGroup',
+    colProps: { lg: 24, md: 24 },
+  },
+  {
+    label: t('体积'),
+    field: 'volume',
+    component: 'Input',
+    componentProps: {
+      maxlength: 50,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('净重'),
+    field: 'weight',
+    component: 'Input',
+    componentProps: {
+      maxlength: 50,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('长单品'),
+    field: 'mlength',
+    component: 'Input',
+    componentProps: {
+      maxlength: 30,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('宽单品'),
+    field: 'mwidth',
+    component: 'Input',
+    componentProps: {
+      maxlength: 30,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('高单品'),
+    field: 'mheight',
+    component: 'Input',
+    componentProps: {
+      maxlength: 30,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('尺寸单位,字典'),
+    field: 'msizeDict',
+    component: 'Input',
+    componentProps: {
+      maxlength: 64,
+    },
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('默认装箱数量'),
+    field: 'defaultQty',
+    component: 'Input',
+    componentProps: {
+      maxlength: 19,
+    },
+    rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('税率'),
+    field: 'taxRate',
+    component: 'Input',
+    rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('顺序'),
+    field: 'sort',
+    component: 'Input',
+    rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    colProps: {
+      span: 8,
+    },
+  },
+  {
+    label: t('备注信息'),
+    field: 'remarks',
+    component: 'InputTextArea',
+    componentProps: {
+      maxlength: 500,
+    },
+    colProps: { lg: 24, md: 24 },
+  },
+  {
+    label: t('图片上传'),
+    field: 'dataMap',
+    component: 'Upload',
+    componentProps: {
+      loadTime: computed(() => record.value.__t),
+      bizKey: computed(() => record.value.id),
+      bizType: 'material_image',
+      uploadType: 'image',
+    },
+    colProps: { lg: 24, md: 24 },
+  },
+];
+
+export async function undo() {
+  //router.go(-1);
+  debugger;
+  // eslint-disable-next-line prettier/prettier
+  const currentTab : RouteLocationNormalized = tabStore.getTabList.find(
+    (i) => i.path === router.currentRoute.value.path,
+  );
+  tabStore.closeTab(currentTab, router);
+  // const { close } = useTabs(reloadListPage);
+  // reloadListPage.query = { dictType: 'sys_job_event' };
+  // eslint-disable-next-line prettier/prettier
+  const fromRouter = tabStore.getTabList.find(
+    (i) =>
+      i.name ===
+      (router.currentRoute.value.query?.fromTab || router.currentRoute.value.meta?.fromTab),
+  );
+  if (fromRouter) {
+    router.push({ path: unref(fromRouter).path });
+  }
+  //updateTabPath record.value.parentName
+}
diff --git a/src/views/wms/basic/material/detail.vue b/src/views/wms/basic/material/detail.vue
new file mode 100644
index 0000000..df3044a
--- /dev/null
+++ b/src/views/wms/basic/material/detail.vue
@@ -0,0 +1,513 @@
+<template>
+  <PageWrapper :contentBackground="false" class="high-form" :contentClass="'wppd0'">
+    <a-card title="基础字段123Detail" :bordered="false">
+      <BasicForm @register="registerBsicForm" />
+    </a-card>
+    <a-card title="行业特性" :bordered="false" class="!mt-5">
+      <BasicForm @register="registerHYTZForm" />
+    </a-card>
+    <a-card title="库存预警（按默认单位预警）" :bordered="false" class="!mt-5">
+      <BasicForm @register="registerKCYJForm" />
+    </a-card>
+    <a-card title="其他信息" :bordered="false" class="!mt-5">
+      <BasicForm @register="registerQTForm" />
+    </a-card>
+    <template #rightFooter>
+      <a-button type="primary" @click="submitAll"> 提交 </a-button>
+    </template>
+  </PageWrapper>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicMaterialDetail',
+    components: { [Card.name]: Card, PageWrapper },
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, onMounted, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { PageWrapper } from '/@/components/Page';
+  import { Material, materialSave, materialForm } from '/@/api/wms/basic/material';
+  import { officeTreeData } from '/@/api/sys/office';
+  import { Card } from 'ant-design-vue';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.material');
+  const { showMessage } = useMessage();
+  const record = ref<Material>({} as Material);
+
+  const inputFormBasicSchemas: FormSchema[] = [
+    {
+      label: t('编码'),
+      field: 'materialCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('名称'),
+      field: 'materialName',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('规格'),
+      field: 'materialSpecs',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: '物料分类',
+      field: 'materialTypeCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('所属仓库'),
+      field: 'warehouseId',
+      component: 'Select',
+      componentProps: {
+        dictType: 'msg_inner_receiver_type',
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('所属部门'),
+      field: 'officeId.officeCode',
+      fieldLabel: 'officeId.officeName',
+      component: 'TreeSelect',
+      componentProps: {
+        api: officeTreeData,
+        canSelectParent: false,
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('助记码'),
+      field: 'materialMnemonicCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('条码'),
+      field: 'materialBarcode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('品牌'),
+      field: 'materialBrand',
+      component: 'Select',
+      componentProps: {
+        dictType: 'msg_inner_receiver_type',
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('是否支持多单位'),
+      field: 'openMultipleUnits',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+  ];
+
+  const inputFormHYTZSchemas: FormSchema[] = [
+    {
+      label: t('是否启用保质期管理'),
+      field: 'expDateMgt',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('保质期'),
+      field: 'expirationDate',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 4,
+      },
+    },
+    {
+      label: t('保质期单位'),
+      field: 'expirationDateDict',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_area_type',
+        allowClear: true,
+      },
+      colProps: {
+        span: 4,
+      },
+    },
+    {
+      label: t('提前X天预警'),
+      field: 'expirationPrompting',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('是否启用颜色管理'),
+      field: 'colourMgt',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('颜色'),
+      field: 'colours',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_user_status',
+        allowClear: true,
+        mode: 'multiple',
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('是否启用单件管理'),
+      field: 'singleMgt',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+    {
+      label: t('是否启用序列号管理'),
+      field: 'sequenceMgt',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+    {
+      label: t('是否启用批次管理'),
+      field: 'batchMethod',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+  ];
+
+  const inputFormKCYJchemas: FormSchema[] = [
+    {
+      label: t('是否启用分仓库存预警'),
+      field: 'safetyStockWhMgt',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('最低库存量'),
+      field: 'stockQtyMin',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('最高库存量'),
+      field: 'stockQtyMax',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+  ];
+
+  const inputFormKQTchemas: FormSchema[] = [
+    {
+      label: t('体积'),
+      field: 'volume',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('净重'),
+      field: 'weight',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('长单品'),
+      field: 'mlength',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('宽单品'),
+      field: 'mwidth',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('高单品'),
+      field: 'mheight',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('尺寸单位,字典'),
+      field: 'msizeDict',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('默认装箱数量'),
+      field: 'defaultQty',
+      component: 'Input',
+      componentProps: {
+        maxlength: 19,
+      },
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('税率'),
+      field: 'taxRate',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('顺序'),
+      field: 'sort',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('图片上传'),
+      field: 'dataMap',
+      component: 'Upload',
+      componentProps: {
+        loadTime: computed(() => record.value.__t),
+        bizKey: computed(() => record.value.id),
+        bizType: 'material_image',
+        uploadType: 'image',
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerBsicForm, { resetFields:resetFieldsBsic, setFieldsValue:setBasicFieldsValue, validate:basicValidate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormBasicSchemas,
+    showActionButtonGroup: false,
+  });
+
+  const [registerHYTZForm, { resetFields:resetFieldsHYTZ, setFieldsValue:setFieldsValueHYTZ, validate:validateHYTZ }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormHYTZSchemas,
+    showActionButtonGroup: false,
+  });
+
+  const [registerKCYJForm, { resetFields:resetFieldsKCYJ, setFieldsValue:setFieldsValueKCYJ, validate:validateKCYJ }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormKCYJchemas,
+    showActionButtonGroup: false,
+  });
+
+  const [registerQTForm, { resetFields:resetFieldsQT, setFieldsValue:setFieldsValueQT, validate:validateQT }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormKQTchemas,
+    showActionButtonGroup: false,
+  });
+  /*
+ const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    showActionButtonGroup: true,
+    submitButtonOptions: {
+      text: '提交',
+    },
+    actionColOptions: {
+      span: 24,
+    },
+  });*/
+
+  onMounted(async () => {
+    debugger;
+    const data = {};
+    data.id = `1546328235992219648`;
+    resetFieldsBsic();
+    resetFieldsHYTZ();
+    resetFieldsKCYJ();
+    resetFieldsQT();
+    const res = await materialForm(data);
+    record.value = (res.material || {}) as Material;
+    record.value.__t = new Date().getTime();
+    console.log(data);
+    setBasicFieldsValue(record.value);
+    setFieldsValueHYTZ(record.value);
+    setFieldsValueKCYJ(record.value);
+    setFieldsValueQT(record.value);
+  });
+
+  async function submitAll() {
+    try {
+      //const data = await validate();
+
+      const valuesBasic = await basicValidate();
+      const valuesHYTZ = await validateHYTZ();
+      const valuesKCYJ = await validateKCYJ();
+      const valuesQT = await validateQT();
+
+      const data = {
+        ...valuesBasic,
+        ...valuesHYTZ,
+        ...valuesKCYJ,
+        ...valuesQT,
+      };
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        id: record.value.id,
+      };
+      // console.log('submit', params, data, record);
+      const res = await materialSave(params, data);
+      showMessage(res.message);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      console.log('finally');
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .high-form {
+    padding: 0px 0px 0px 0px;
+    padding-bottom: 48px;
+    //background: #f0f2f5;
+    //background: red;
+  }
+  .wppd0{
+    padding: 0px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/wms/basic/material/edit.vue b/src/views/wms/basic/material/edit.vue
new file mode 100644
index 0000000..2482448
--- /dev/null
+++ b/src/views/wms/basic/material/edit.vue
@@ -0,0 +1,275 @@
+<template>
+  <PageWrapper>
+    <div class="bg-white flex flex-col justify-center items-center">
+      <BasicForm @register="registerForm">
+        <template #materialUnitsList>
+          <BasicTable
+            @register="registerMaterialUnitsTable"
+            @row-click="handleMaterialUnitsRowClick"
+          />
+        </template>
+        <template #addMaterialUnitsBut>
+          <a-button class="mt-2" @click="handleMaterialUnitsAdd">
+            <Icon icon="ant-design:plus-circle-outlined" /> {{ t('新增') }}
+          </a-button>
+        </template>
+      </BasicForm>
+    </div>
+    <template #rightFooter>
+      <div class="flex justify-center">
+        <a-button @click="undo"> <Icon icon="ant-design:undo-outlined" /> 返回</a-button>
+        <a-button class="!ml-4" type="primary" @click="submitAll">
+          <Icon icon="ant-design:check-outlined" /> 提交
+        </a-button>
+      </div>
+    </template>
+  </PageWrapper>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicMaterialEdit',
+    components: { [Card.name]: Card, PageWrapper },
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, onMounted, ref } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { PageWrapper } from '/@/components/Page';
+  import { Material, materialSave, materialForm } from '/@/api/wms/basic/material';
+  import { unitsAllListData } from '/@/api/wms/basic/units';
+  import { Card } from 'ant-design-vue';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { router } from '/@/router';
+  import { inputFormSchemas, undo } from './addOrUpdate';
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.material');
+  const { showMessage } = useMessage();
+  const record = ref<Material>({} as Material);
+  const op = ref<String>('');
+  let isMasterUnitIndex = 1;
+
+  const [registerMaterialUnitsTable, materialUnitsTable] = useTable({
+    actionColumn: {
+      width: 60,
+      actions: (record: Recordable) => [
+        {
+          icon: 'ant-design:delete-outlined',
+          color: 'error',
+          popConfirm: {
+            title: '是否确认删除',
+            confirm: handleMaterialUnitsDelete.bind(this, record),
+          },
+          auth: 'wms:basic:material:edit',
+        },
+      ],
+    },
+    rowKey: 'id',
+    pagination: false,
+    bordered: true,
+    size: 'small',
+    inset: true,
+  });
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    showActionButtonGroup: false,
+  });
+
+  onMounted(async () => {
+    const data: any = { id: router.currentRoute.value.query?.id };
+    debugger;
+    //data.id = `1546328235992219648`;
+    resetFields();
+    const res = await materialForm(data);
+    op.value = data.op || 'add';
+    record.value = (res.material || {}) as Material;
+    record.value.__t = new Date().getTime();
+    console.log(data);
+    setFieldsValue(record.value);
+
+    res.unitsAllListData = await unitsAllListData(data);
+    setMaterialUnitsListTableData(res);
+    if (op.value === 'add') {
+      handleMaterialUnitsAdd();
+    }
+  });
+
+  async function setMaterialUnitsListTableData(res: Recordable) {
+    materialUnitsTable.setColumns([
+      {
+        title: '标题',
+        dataIndex: 'jldw',
+        width: 100,
+        align: 'left',
+        editRow: false,
+        editRule: false,
+      },
+      {
+        title: '计量单位',
+        dataIndex: 'unit.unitCode',
+        dataLabel: 'unit.unitName',
+        width: 100,
+        align: 'left',
+        editRow: true,
+        editComponent: 'Select',
+        editComponentProps: {
+          options: res.unitsAllListData?.map((item) => ({
+            label: item.unitName,
+            value: item.unitCode,
+          })),
+        },
+        editRule: true,
+      },
+      {
+        title: '单位换算',
+        dataIndex: 'unitConvert',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '辅助单位',
+        dataIndex: 'auxiliaryUnit.unitCode',
+        dataLabel: 'auxiliaryUnit.unitName',
+        width: 100,
+        align: 'left',
+        editRow: true,
+        editComponent: 'Select',
+        editComponentProps: {
+          options: res.unitsAllListData?.map((item) => ({
+            label: item.unitName,
+            value: item.unitCode,
+          })),
+        },
+        editRule: false,
+      },
+      {
+        title: '辅助单位换算',
+        dataIndex: 'auxiliaryUnitConvert',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '采购价',
+        dataIndex: 'purchasePrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '成本价',
+        dataIndex: 'costPrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '批发价',
+        dataIndex: 'tradePrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '零售价(¥)',
+        dataIndex: 'retailPrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      //如一件黄金饰品的重量为500g,其中"件"为基本单位，"g"为辅助计量
+      {
+        title: '默认单位',
+        dataIndex: 'isMasterUnit',
+        width: 100,
+        align: 'center',
+        editRow: false,
+        dictType: 'sys_yes_no',
+        editRule: false,
+      },
+    ]);
+    materialUnitsTable.setTableData(res.materialUnitsList || []);
+  }
+
+  function handleMaterialUnitsRowClick(record: Recordable) {
+    record.onEdit?.(true, false);
+  }
+
+  function handleMaterialUnitsAdd() {
+    materialUnitsTable.insertTableDataRecord({
+      id: 'rid_' + new Date().getTime(),
+      editable: true,
+      jldw: isMasterUnitIndex == 1 ? '基本单位' : '副单位',
+      isMasterUnit: isMasterUnitIndex == 1 ? isMasterUnitIndex : '0',
+      materialId: '',
+    });
+    isMasterUnitIndex++;
+  }
+
+  function handleMaterialUnitsDelete(record: Recordable) {
+    if (record.jldw === '基本单位') {
+      showMessage('不能删除基本单位！');
+      return;
+    }
+    materialUnitsTable.deleteTableDataRecord(record);
+  }
+
+  async function submitAll() {
+    try {
+      const data = await validate();
+      data.materialUnitsList = await getMaterialUnitsList();
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        id: record.value.id,
+      };
+      // console.log('submit', params, data, record);
+      const res = await materialSave(params, data);
+      showMessage(res.message);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      console.log('finally');
+    }
+  }
+
+  async function getMaterialUnitsList() {
+    let muValid = true;
+    let materialUnitsList = materialUnitsTable.getDataSource();
+    for (const record of materialUnitsList) {
+      if (!(await record.onEdit?.(false, true))) {
+        muValid = false;
+      }
+    }
+    if (!muValid) {
+      throw new Error('materialUnitsTableList valid.');
+    }
+    return materialUnitsList;
+  }
+</script>
+<style lang="less" scoped>
+  .high-form {
+    padding: 0px 0px 0px 0px;
+    padding-bottom: 48px;
+  }
+</style>
diff --git a/src/views/wms/basic/material/form.vue b/src/views/wms/basic/material/form.vue
new file mode 100644
index 0000000..2b29778
--- /dev/null
+++ b/src/views/wms/basic/material/form.vue
@@ -0,0 +1,758 @@
+<template>
+  <PageWrapper>
+    <div class="bg-white flex flex-col justify-center items-center">
+      <BasicForm @register="registerForm">
+        <template #materialUnitsList>
+          <BasicTable
+            @register="registerMaterialUnitsTable"
+            @row-click="handleMaterialUnitsRowClick"
+          />
+        </template>
+        <template #addMaterialUnitsBut>
+          <a-button class="mt-2" @click="handleMaterialUnitsAdd">
+            <Icon icon="ant-design:plus-circle-outlined" /> {{ t('新增') }}
+          </a-button>
+        </template>
+      </BasicForm>
+    </div>
+    <template #rightFooter>
+      <div class="flex justify-center">
+        <a-button @click="undo"> <Icon icon="ant-design:undo-outlined" /> 返回</a-button>
+        <a-button class="!ml-4" type="primary" @click="submitAll">
+          <Icon icon="ant-design:check-outlined" /> 提交
+        </a-button>
+      </div>
+    </template>
+  </PageWrapper>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicMaterialForm',
+    components: { [Card.name]: Card, PageWrapper },
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, onMounted, ref, computed, unref } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { PageWrapper } from '/@/components/Page';
+  import { Material, materialSave, materialForm } from '/@/api/wms/basic/material';
+  import { materialTypeTreeData } from '/@/api/wms/basic/materialType';
+  import { warehouseAllData } from '/@/api/wms/basic/warehouse';
+  import { officeTreeData } from '/@/api/sys/office';
+  import { unitsAllListData } from '/@/api/wms/basic/units';
+  import { Card } from 'ant-design-vue';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { useTabs } from '/@/hooks/web/useTabs';
+  import { useMultipleTabStore } from '/@/store/modules/multipleTab';
+  import { router } from '/@/router';
+  import type { RouteLocationNormalized } from 'vue-router';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.material');
+  const { showMessage } = useMessage();
+  const record = ref<Material>({} as Material);
+  const getTitle = computed(() => ({
+    icon: 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增物料管理') : t('编辑物料管理'),
+  }));
+  const ctrlPermi = ref<String>('');
+  const op = ref<String>('');
+  let isMasterUnitIndex = 1;
+  const warehouseList = ref<Recordable>([]);
+  const coloursList = ref<Recordable>([]);
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('基础信息'),
+      field: 'materialBaseInfo',
+      component: 'FormGroup',
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('编码'),
+      field: 'materialCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+      required: true,
+    },
+    {
+      label: t('名称'),
+      field: 'materialName',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      colProps: {
+        span: 8,
+      },
+      required: true,
+    },
+    {
+      label: t('规格'),
+      field: 'materialSpecs',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: '物料分类',
+      field: 'materialType.materialTypeCode',
+      fieldLabel: 'materialType.materialTypeName',
+      component: 'TreeSelect',
+      componentProps: {
+        api: materialTypeTreeData,
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+      required: true,
+    },
+    {
+      label: t('所属仓库'),
+      field: 'warehouseId',
+      component: 'Select',
+      componentProps: {
+        options: warehouseList,
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('所属部门'),
+      field: 'officeId.officeCode',
+      fieldLabel: 'officeId.officeName',
+      component: 'TreeSelect',
+      componentProps: {
+        api: officeTreeData,
+        canSelectParent: false,
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('助记码'),
+      field: 'materialMnemonicCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('条码'),
+      field: 'materialBarcode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('品牌'),
+      field: 'materialBrand',
+      component: 'Select',
+      componentProps: {
+        dictType: 'msg_inner_receiver_type',
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('是否支持多单位'),
+      field: 'openMultipleUnits',
+      component: 'RadioButtonGroup',
+      defaultValue: '0',
+      componentProps: ({ formModel, formActionType }) => {
+        return {
+          dictType: 'sys_yes_no',
+          onChange: (e: any) => {
+            console.log(e);
+          },
+        };
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: '',
+      field: 'addMaterialUnitsBut',
+      component: 'Input',
+      colProps: { lg: 24, md: 24 },
+      slot: 'addMaterialUnitsBut',
+      show: ({ values }) => values.openMultipleUnits === '1',
+    },
+    {
+      label: '',
+      field: 'materialUnitsList',
+      component: 'Input',
+      colProps: { lg: 24, md: 24 },
+      slot: 'materialUnitsList',
+    },
+    {
+      label: t('行业特性'),
+      field: 'hytx',
+      component: 'FormGroup',
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('是否启用保质期管理'),
+      labelWidth: 170,
+      field: 'expDateMgt',
+      component: 'RadioButtonGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      defaultValue: '0',
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('保质期'),
+      field: 'expirationDate',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 4,
+      },
+      show: ({ values }) => values.expDateMgt === '1',
+    },
+    {
+      label: t('保质期单位'),
+      field: 'expirationDateDict',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_area_type',
+        allowClear: true,
+      },
+      colProps: {
+        span: 4,
+      },
+      show: ({ values }) => values.expDateMgt === '1',
+    },
+    {
+      label: t('提前X天预警'),
+      field: 'expirationPrompting',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+      show: ({ values }) => values.expDateMgt === '1',
+    },
+    {
+      label: t('是否启用颜色管理'),
+      labelWidth: 170,
+      field: 'colourMgt',
+      component: 'RadioButtonGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 8,
+      },
+      defaultValue: '0',
+    },
+    {
+      label: t('颜色'),
+      field: 'colours',
+      component: 'Select',
+      componentProps: {
+        options: coloursList,
+        allowClear: true,
+        mode: 'multiple',
+      },
+      colProps: {
+        span: 8,
+      },
+      show: ({ values }) => values.colourMgt === '1',
+    },
+    {
+      label: t('是否启用单件管理'),
+      labelWidth: 170,
+      field: 'singleMgt',
+      component: 'RadioButtonGroup',
+      defaultValue: '0',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+    {
+      label: t('是否启用序列号管理'),
+      labelWidth: 170,
+      field: 'sequenceMgt',
+      component: 'RadioButtonGroup',
+      defaultValue: '0',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+    {
+      label: t('是否启用批次管理'),
+      labelWidth: 170,
+      field: 'batchMethod',
+      component: 'RadioButtonGroup',
+      defaultValue: '0',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+    {
+      label: t('库存预警'),
+      field: 'kcyj',
+      component: 'FormGroup',
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('是否启用分仓库存预警'),
+      labelWidth: 170,
+      field: 'safetyStockWhMgt',
+      component: 'RadioButtonGroup',
+      defaultValue: '0',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('最低库存量'),
+      field: 'stockQtyMin',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('最高库存量'),
+      field: 'stockQtyMax',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('其它信息'),
+      field: 'qtxx',
+      component: 'FormGroup',
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('体积'),
+      field: 'volume',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('净重'),
+      field: 'weight',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('长单品'),
+      field: 'mlength',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('宽单品'),
+      field: 'mwidth',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('高单品'),
+      field: 'mheight',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('尺寸单位,字典'),
+      field: 'msizeDict',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('默认装箱数量'),
+      field: 'defaultQty',
+      component: 'Input',
+      componentProps: {
+        maxlength: 19,
+      },
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('税率'),
+      field: 'taxRate',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('顺序'),
+      field: 'sort',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('图片上传'),
+      field: 'dataMap',
+      component: 'Upload',
+      componentProps: {
+        loadTime: computed(() => record.value.__t),
+        bizKey: computed(() => record.value.id),
+        bizType: 'material_image',
+        uploadType: 'image',
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerMaterialUnitsTable, materialUnitsTable] = useTable({
+    actionColumn: {
+      width: 60,
+      actions: (record: Recordable) => [
+        {
+          icon: 'ant-design:delete-outlined',
+          color: 'error',
+          popConfirm: {
+            title: '是否确认删除',
+            confirm: handleMaterialUnitsDelete.bind(this, record),
+          },
+          ifShow: record.isMasterUnit,
+          auth: 'wms:basic:material:edit',
+        },
+      ],
+    },
+    rowKey: 'id',
+    pagination: false,
+    bordered: true,
+    size: 'small',
+    inset: true,
+  });
+
+  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    showActionButtonGroup: false,
+  });
+
+  onMounted(async () => {
+    //加载所属仓库选项
+    const resWH = await warehouseAllData();
+    warehouseList.value = resWH.warehouseList?.map((item) => ({
+      label: item.name,
+      value: item.code,
+    }));
+    //加载颜色选项
+    const resColours = await coloursAllListData();
+    coloursList.value = resColours.coloursList?.map((item) => ({
+      label: item.colorName,
+      value: item.colorCode,
+    }));
+    updateSchema([
+      {
+        field: 'materialType.materialTypeCode',
+        componentProps: {
+          api: materialTypeTreeData,
+          canSelectParent: true,
+        },
+      },
+    ]);
+    const data: any = {};
+    //data.id = `1546328235992219648`;
+    resetFields();
+    const res = await materialForm(data);
+    op.value = data.op || 'add';
+    record.value = (res.material || {}) as Material;
+    record.value.__t = new Date().getTime();
+    console.log(data);
+    setFieldsValue(record.value);
+
+    res.unitsAllListData = await unitsAllListData(data);
+    setMaterialUnitsListTableData(res);
+    if (op.value === 'add') {
+      handleMaterialUnitsAdd();
+    } else {
+      materialUnitsTable.setTableData(record.value.employee?.materialUnitsList || []);
+    }
+  });
+
+  async function setMaterialUnitsListTableData(res: Recordable) {
+    materialUnitsTable.setColumns([
+      {
+        title: '标题',
+        dataIndex: 'jldw',
+        width: 100,
+        align: 'left',
+        editRow: false,
+        editRule: false,
+      },
+      {
+        title: '计量单位',
+        dataIndex: 'unit.unitCode',
+        dataLabel: 'unit.unitName',
+        width: 100,
+        align: 'left',
+        editRow: true,
+        editComponent: 'Select',
+        editComponentProps: {
+          options: res.unitsAllListData?.map((item) => ({
+            label: item.unitName,
+            value: item.unitCode,
+          })),
+        },
+        editRule: true,
+      },
+      {
+        title: '单位换算',
+        dataIndex: 'unitConvert',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '辅助单位',
+        dataIndex: 'auxiliaryUnit.unitCode',
+        dataLabel: 'auxiliaryUnit.unitName',
+        width: 100,
+        align: 'left',
+        editRow: true,
+        editComponent: 'Select',
+        editComponentProps: {
+          options: res.unitsAllListData?.map((item) => ({
+            label: item.unitName,
+            value: item.unitCode,
+          })),
+        },
+        editRule: false,
+      },
+      {
+        title: '辅助单位换算',
+        dataIndex: 'auxiliaryUnitConvert',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '采购价',
+        dataIndex: 'purchasePrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '成本价',
+        dataIndex: 'costPrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '批发价',
+        dataIndex: 'tradePrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      {
+        title: '零售价(¥)',
+        dataIndex: 'retailPrice',
+        width: 100,
+        align: 'center',
+        editRow: true,
+        editComponent: 'Input',
+        editRule: false,
+      },
+      //如一件黄金饰品的重量为500g,其中"件"为基本单位，"g"为辅助计量
+      {
+        title: '默认单位',
+        dataIndex: 'isMasterUnit',
+        width: 100,
+        align: 'center',
+        editRow: false,
+        dictType: 'sys_yes_no',
+        editRule: false,
+      },
+    ]);
+  }
+
+  function handleMaterialUnitsRowClick(record: Recordable) {
+    record.onEdit?.(true, false);
+  }
+
+  function handleMaterialUnitsAdd() {
+    materialUnitsTable.insertTableDataRecord({
+      id: 'rid_' + new Date().getTime(),
+      editable: true,
+      jldw: isMasterUnitIndex == 1 ? '基本单位' : '副单位',
+      isMasterUnit: isMasterUnitIndex == 1 ? isMasterUnitIndex : '0',
+      materialId: '',
+    });
+    isMasterUnitIndex++;
+  }
+
+  function handleMaterialUnitsDelete(record: Recordable) {
+    if (record.jldw === '基本单位') {
+      showMessage('不能删除基本单位！');
+      return;
+    }
+    materialUnitsTable.deleteTableDataRecord(record);
+  }
+
+  async function submitAll() {
+    try {
+      const data = await validate();
+      data.materialUnitsList = await getMaterialUnitsList();
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        id: record.value.id,
+      };
+      // console.log('submit', params, data, record);
+      const res = await materialSave(params, data);
+      showMessage(res.message);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      console.log('finally');
+    }
+  }
+
+  const { close } = useTabs();
+  const tabStore = useMultipleTabStore();
+  async function undo() {
+    //router.go(-1);
+    debugger;
+    // eslint-disable-next-line prettier/prettier
+    let currentTab :RouteLocationNormalized   = tabStore.getTabList.find(i => i.path === router.currentRoute.value.path);
+    tabStore.closeTab(currentTab, router);
+    // const { close } = useTabs(reloadListPage);
+    // reloadListPage.query = { dictType: 'sys_job_event' };
+    // eslint-disable-next-line prettier/prettier
+    let fromRouter = tabStore.getTabList.find(i => i.name === (router.currentRoute.value.query?.fromTab || router.currentRoute.value.meta?.fromTab) );
+    if (fromRouter) {
+      router.push({ path: unref(fromRouter).path });
+    }
+    //updateTabPath record.value.parentName
+  }
+
+  async function getMaterialUnitsList() {
+    let muValid = true;
+    let materialUnitsList = materialUnitsTable.getDataSource();
+    for (const record of materialUnitsList) {
+      if (!(await record.onEdit?.(false, true))) {
+        muValid = false;
+      }
+    }
+    if (!muValid) {
+      throw new Error('materialUnitsTableList valid.');
+    }
+    return materialUnitsList;
+  }
+</script>
+<style lang="less" scoped>
+  .high-form {
+    padding: 0px 0px 0px 0px;
+    padding-bottom: 48px;
+  }
+</style>
diff --git a/src/views/wms/basic/material/index.vue b/src/views/wms/basic/material/index.vue
new file mode 100644
index 0000000..4b25815
--- /dev/null
+++ b/src/views/wms/basic/material/index.vue
@@ -0,0 +1,40 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <PageWrapper :sidebarWidth="230">
+    <template #sidebar>
+      <BasicTree
+        :title="t('物料分类表')"
+        :search="true"
+        :toolbar="true"
+        :api="materialTypeTreeData"
+        :defaultExpandLevel="2"
+        @select="handleSelect"
+      />
+    </template>
+    <ListView :treeCode="treeCode" />
+  </PageWrapper>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsWmsBasicMaterialIndex',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { PageWrapper } from '/@/components/Page';
+  import { BasicTree } from '/@/components/Tree';
+  import { materialTypeTreeData } from '/@/api/wms/basic/materialType';
+  import ListView from './list.vue';
+
+  const { t } = useI18n('sys.menu');
+  const treeCode = ref<string>('');
+
+  function handleSelect(keys: string[]) {
+    treeCode.value = keys[0];
+  }
+</script>
diff --git a/src/views/wms/basic/material/list.vue b/src/views/wms/basic/material/list.vue
new file mode 100644
index 0000000..46342cc
--- /dev/null
+++ b/src/views/wms/basic/material/list.vue
@@ -0,0 +1,584 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button type="primary" @click="handleForm({})" v-auth="'wms:basic:material:edit'">
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+        <a-button type="primary" @click="openTabAdd()">
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增12') }}
+        </a-button>
+        <a-button class="mr-2" @click="openDetail()">打开详情页</a-button>
+      </template>
+      <template #codeColumn="{ record }">
+        <a @click="handleCodeData(record)" :title="record.code">
+          {{ record.code }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicMaterialList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, onMounted, onActivated, watch, ref, onDeactivated } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { materialDelete, materialListData } from '/@/api/wms/basic/material';
+  import { materialTypeTreeData } from '/@/api/wms/basic/materialType';
+  import { warehouseAllData } from '/@/api/wms/basic/warehouse';
+  import { officeTreeData } from '/@/api/sys/office';
+  import { useModal } from '/@/components/Modal';
+  import { FormProps } from '/@/components/Form';
+  import { useGo } from '/@/hooks/web/usePage';
+  import { PageEnum } from '/@/enums/pageEnum';
+
+  const props = defineProps({
+    treeCode: String,
+  });
+  const go = useGo();
+  const { t } = useI18n('basic.material');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('物料管理管理'),
+  };
+  const warehouseList = ref<Recordable>([]);
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('编码'),
+        field: 'materialCode',
+        component: 'Input',
+      },
+      {
+        label: t('名称'),
+        field: 'materialName',
+        component: 'Input',
+      },
+      {
+        label: t('所属仓库'),
+        field: 'warehouseId',
+        component: 'Select',
+        componentProps: {
+          options: warehouseList,
+          allowClear: true,
+        },
+      },
+      {
+        label: t('条码'),
+        field: 'materialBarcode',
+        component: 'Input',
+      },
+      {
+        label: t('规格'),
+        field: 'materialSpecs',
+        component: 'Input',
+      },
+      {
+        label: t('品牌'),
+        field: 'materialBrand',
+        component: 'Select',
+        componentProps: {
+          dictType: 'msg_inner_receiver_type',
+          allowClear: true,
+        },
+      },
+      {
+        label: t('助记码'),
+        field: 'materialMnemonicCode',
+        component: 'Input',
+      },
+      {
+        label: t('颜色'),
+        field: 'colours',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_user_status',
+          allowClear: true,
+          mode: 'multiple',
+        },
+      },
+      {
+        label: t('所属部门'),
+        field: 'officeId.officeCode',
+        component: 'TreeSelect',
+        componentProps: {
+          api: officeTreeData,
+          allowClear: true,
+        },
+      },
+      {
+        label: t('物料分类'),
+        field: 'materialTypeCode',
+        component: 'TreeSelect',
+        componentProps: {
+          api: materialTypeTreeData,
+        },
+      },
+      {
+        label: t('状态'),
+        field: 'status',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_search_status',
+          allowClear: true,
+          onChange: handleSuccess,
+        },
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('所属仓库'),
+      dataIndex: 'warehouseId',
+      key: 'a.warehouse_id',
+      sorter: true,
+      width: 230,
+      align: 'left',
+      dictType: 'msg_inner_receiver_type',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('所属部门'),
+      dataIndex: 'officeId.officeName',
+      key: 'a.office_id',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('物料分类编码'),
+      dataIndex: 'materialType.materialTypeName',
+      key: 'a.material_type_code',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('条码'),
+      dataIndex: 'materialBarcode',
+      key: 'a.material_barcode',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('编码'),
+      dataIndex: 'materialCode',
+      key: 'a.material_code',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('名称'),
+      dataIndex: 'materialName',
+      key: 'a.material_name',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('规格'),
+      dataIndex: 'materialSpecs',
+      key: 'a.material_specs',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('品牌'),
+      dataIndex: 'materialBrand',
+      key: 'a.material_brand',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'msg_inner_receiver_type',
+    },
+    {
+      title: t('拼音首字母'),
+      dataIndex: 'materialFirstSpell',
+      key: 'a.material_first_spell',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('拼音全拼'),
+      dataIndex: 'materialFullSpell',
+      key: 'a.material_full_spell',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('助记码'),
+      dataIndex: 'materialMnemonicCode',
+      key: 'a.material_mnemonic_code',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('是否启用保质期管理'),
+      dataIndex: 'expDateMgt',
+      key: 'a.exp_date_mgt',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_yes_no',
+    },
+    {
+      title: t('保质期'),
+      dataIndex: 'expirationDate',
+      key: 'a.expiration_date',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('保质期单位'),
+      dataIndex: 'expirationDateDict',
+      key: 'a.expiration_date_dict',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_area_type',
+    },
+    {
+      title: t('保质期换算成天'),
+      dataIndex: 'expirationDateDay',
+      key: 'a.expiration_date_day',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('提前X天预警'),
+      dataIndex: 'expirationPrompting',
+      key: 'a.expiration_prompting',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('是否启用颜色管理'),
+      dataIndex: 'colourMgt',
+      key: 'a.colour_mgt',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_yes_no',
+    },
+    {
+      title: t('颜色'),
+      dataIndex: 'colours',
+      key: 'a.colours',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_user_status',
+    },
+    {
+      title: t('是否启用单件管理'),
+      dataIndex: 'singleMgt',
+      key: 'a.single_mgt',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_yes_no',
+    },
+    {
+      title: t('是否启用序列号管理'),
+      dataIndex: 'sequenceMgt',
+      key: 'a.sequence_mgt',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_yes_no',
+    },
+    {
+      title: t('是否启用批次管理'),
+      dataIndex: 'batchMethod',
+      key: 'a.batch_method',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_yes_no',
+    },
+    {
+      title: t('是否支持多单位'),
+      dataIndex: 'openMultipleUnits',
+      key: 'a.open_multiple_units',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_yes_no',
+    },
+    {
+      title: t('体积'),
+      dataIndex: 'volume',
+      key: 'a.volume',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('净重'),
+      dataIndex: 'weight',
+      key: 'a.weight',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('长单品'),
+      dataIndex: 'mlength',
+      key: 'a.m_length',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('宽单品'),
+      dataIndex: 'mwidth',
+      key: 'a.m_width',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('高单品'),
+      dataIndex: 'mheight',
+      key: 'a.m_height',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('尺寸单位,字典'),
+      dataIndex: 'msizeDict',
+      key: 'a.m_size_dict',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('默认装箱数量'),
+      dataIndex: 'defaultQty',
+      key: 'a.default_qty',
+      sorter: true,
+      width: 130,
+      align: 'right',
+    },
+    {
+      title: t('税率'),
+      dataIndex: 'taxRate',
+      key: 'a.tax_rate',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('是否启用分仓库存预警'),
+      dataIndex: 'safetyStockWhMgt',
+      key: 'a.safety_stock_wh_mgt',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_yes_no',
+    },
+    {
+      title: t('顺序'),
+      dataIndex: 'sort',
+      key: 'a.sort',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'status',
+      key: 'a.status',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_search_status',
+    },
+    {
+      title: t('更新时间'),
+      dataIndex: 'updateDate',
+      key: 'a.update_date',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'remarks',
+      key: 'a.remarks',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+  ];
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑物料管理'),
+        onClick: handleForm.bind(this, { id: record.id }),
+        auth: 'wms:basic:material:edit',
+      },
+      {
+        icon: 'ant-design:stop-outlined',
+        color: 'error',
+        title: t('停用物料管理'),
+        popConfirm: {
+          title: t('是否确认停用物料管理'),
+          confirm: handleDisable.bind(this, { id: record.id }),
+        },
+        auth: 'wms:basic:material:edit',
+        ifShow: () => record.status === '0',
+      },
+      {
+        icon: 'ant-design:check-circle-outlined',
+        color: 'success',
+        title: t('启用物料管理'),
+        popConfirm: {
+          title: t('是否确认启用物料管理'),
+          confirm: handleEnable.bind(this, { id: record.id }),
+        },
+        auth: 'wms:basic:material:edit',
+        ifShow: () => record.status === '2',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除物料管理'),
+        popConfirm: {
+          title: t('是否确认删除物料管理'),
+          confirm: handleDelete.bind(this, { id: record.id }),
+        },
+        auth: 'wms:basic:material:edit',
+      },
+    ],
+  };
+
+  const [registerModal, { openModal }] = useModal();
+  const [registerTable, { reload, getForm }] = useTable({
+    api: materialListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+  //DOM挂载完毕 初始化数据
+  onMounted(async () => {
+    const res = await warehouseAllData();
+    warehouseList.value = res.warehouseList?.map((item) => ({
+      label: item.name,
+      value: item.code,
+    }));
+    reload();
+  });
+  //点击左侧tree 右侧列表刷新
+  watch(
+    () => props.treeCode,
+    async () => {
+      await getForm().setFieldsValue({
+        materialTypeCode: props.treeCode,
+      });
+      reload();
+    },
+  );
+  //tab页签 新增或修改操作后刷新
+  onActivated((a, b, c) => {
+    console.log('onActivated', a, b, c);
+    debugger;
+    if (router.currentRoute.value.query.handle == 'handleSuccess') {
+      delete router.currentRoute.value.query.handle;
+      handleSuccess();
+    }
+  });
+  onDeactivated(() => {
+    debugger;
+    if (router.currentRoute.value.query.handle == 'handleSuccess') {
+      delete router.currentRoute.value.query.handle;
+      handleSuccess();
+    }
+  });
+  //打开详情
+  function openDetail() {
+    //go('/basic/material/detail');
+    go('/wms/basic/material/detail');
+  }
+  //新增
+  function openTabAdd() {
+    let fromTab = router.currentRoute.value.name?.toString();
+    go(`/wms/basic/material/add`);
+  }
+
+  function handleForm(record: Recordable) {
+    //openModal(true, record);
+    go(`/wms/basic/material/edit?id=${record.id}`);
+  }
+
+  async function handleDisable(record: Recordable) {
+    const res = await materialDisable(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleEnable(record: Recordable) {
+    const res = await materialEnable(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await materialDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  function handleCodeData(record: Recordable) {
+    router.push({
+      path: '/wms/basic/material/detail',
+      query: {
+        dictType: 'sys_job_event',
+      },
+    });
+  }
+
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/material/materialDetail.vue b/src/views/wms/basic/material/materialDetail.vue
new file mode 100644
index 0000000..3d8ed7c
--- /dev/null
+++ b/src/views/wms/basic/material/materialDetail.vue
@@ -0,0 +1,513 @@
+<template>
+  <PageWrapper :contentBackground="false" class="high-form" :contentClass="'wppd0'">
+    <a-card title="基础字段123" :bordered="false">
+      <BasicForm @register="registerBsicForm" />
+    </a-card>
+    <a-card title="行业特性" :bordered="false" class="!mt-5">
+      <BasicForm @register="registerHYTZForm" />
+    </a-card>
+    <a-card title="库存预警（按默认单位预警）" :bordered="false" class="!mt-5">
+      <BasicForm @register="registerKCYJForm" />
+    </a-card>
+    <a-card title="其他信息" :bordered="false" class="!mt-5">
+      <BasicForm @register="registerQTForm" />
+    </a-card>
+    <template #rightFooter>
+      <a-button type="primary" @click="submitAll"> 提交 </a-button>
+    </template>
+  </PageWrapper>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicTabMaterialMaterialDetail',
+    components: { [Card.name]: Card, PageWrapper },
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, onMounted, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { PageWrapper } from '/@/components/Page';
+  import { Material, materialSave, materialForm } from '/@/api/wms/basic/material';
+  import { officeTreeData } from '/@/api/sys/office';
+  import { Card } from 'ant-design-vue';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.material');
+  const { showMessage } = useMessage();
+  const record = ref<Material>({} as Material);
+
+  const inputFormBasicSchemas: FormSchema[] = [
+    {
+      label: t('编码'),
+      field: 'materialCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('名称'),
+      field: 'materialName',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('规格'),
+      field: 'materialSpecs',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: '物料分类',
+      field: 'materialTypeCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('所属仓库'),
+      field: 'warehouseId',
+      component: 'Select',
+      componentProps: {
+        dictType: 'msg_inner_receiver_type',
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('所属部门'),
+      field: 'officeId.officeCode',
+      fieldLabel: 'officeId.officeName',
+      component: 'TreeSelect',
+      componentProps: {
+        api: officeTreeData,
+        canSelectParent: false,
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('助记码'),
+      field: 'materialMnemonicCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('条码'),
+      field: 'materialBarcode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('品牌'),
+      field: 'materialBrand',
+      component: 'Select',
+      componentProps: {
+        dictType: 'msg_inner_receiver_type',
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('是否支持多单位'),
+      field: 'openMultipleUnits',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+  ];
+
+  const inputFormHYTZSchemas: FormSchema[] = [
+    {
+      label: t('是否启用保质期管理'),
+      field: 'expDateMgt',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('保质期'),
+      field: 'expirationDate',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 4,
+      },
+    },
+    {
+      label: t('保质期单位'),
+      field: 'expirationDateDict',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_area_type',
+        allowClear: true,
+      },
+      colProps: {
+        span: 4,
+      },
+    },
+    {
+      label: t('提前X天预警'),
+      field: 'expirationPrompting',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('是否启用颜色管理'),
+      field: 'colourMgt',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('颜色'),
+      field: 'colours',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_user_status',
+        allowClear: true,
+        mode: 'multiple',
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('是否启用单件管理'),
+      field: 'singleMgt',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+    {
+      label: t('是否启用序列号管理'),
+      field: 'sequenceMgt',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+    {
+      label: t('是否启用批次管理'),
+      field: 'batchMethod',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+  ];
+
+  const inputFormKCYJchemas: FormSchema[] = [
+    {
+      label: t('是否启用分仓库存预警'),
+      field: 'safetyStockWhMgt',
+      component: 'Select',
+      componentProps: {
+        dictType: 'sys_yes_no',
+        allowClear: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('最低库存量'),
+      field: 'stockQtyMin',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('最高库存量'),
+      field: 'stockQtyMax',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+  ];
+
+  const inputFormKQTchemas: FormSchema[] = [
+    {
+      label: t('体积'),
+      field: 'volume',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('净重'),
+      field: 'weight',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('长单品'),
+      field: 'mlength',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('宽单品'),
+      field: 'mwidth',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('高单品'),
+      field: 'mheight',
+      component: 'Input',
+      componentProps: {
+        maxlength: 30,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('尺寸单位,字典'),
+      field: 'msizeDict',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('默认装箱数量'),
+      field: 'defaultQty',
+      component: 'Input',
+      componentProps: {
+        maxlength: 19,
+      },
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('税率'),
+      field: 'taxRate',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('顺序'),
+      field: 'sort',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('图片上传'),
+      field: 'dataMap',
+      component: 'Upload',
+      componentProps: {
+        loadTime: computed(() => record.value.__t),
+        bizKey: computed(() => record.value.id),
+        bizType: 'material_image',
+        uploadType: 'image',
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerBsicForm, { resetFields:resetFieldsBsic, setFieldsValue:setBasicFieldsValue, validate:basicValidate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormBasicSchemas,
+    showActionButtonGroup: false,
+  });
+
+  const [registerHYTZForm, { resetFields:resetFieldsHYTZ, setFieldsValue:setFieldsValueHYTZ, validate:validateHYTZ }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormHYTZSchemas,
+    showActionButtonGroup: false,
+  });
+
+  const [registerKCYJForm, { resetFields:resetFieldsKCYJ, setFieldsValue:setFieldsValueKCYJ, validate:validateKCYJ }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormKCYJchemas,
+    showActionButtonGroup: false,
+  });
+
+  const [registerQTForm, { resetFields:resetFieldsQT, setFieldsValue:setFieldsValueQT, validate:validateQT }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormKQTchemas,
+    showActionButtonGroup: false,
+  });
+  /*
+ const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    showActionButtonGroup: true,
+    submitButtonOptions: {
+      text: '提交',
+    },
+    actionColOptions: {
+      span: 24,
+    },
+  });*/
+
+  onMounted(async () => {
+    debugger;
+    const data = {};
+    data.id = `1546328235992219648`;
+    resetFieldsBsic();
+    resetFieldsHYTZ();
+    resetFieldsKCYJ();
+    resetFieldsQT();
+    const res = await materialForm(data);
+    record.value = (res.material || {}) as Material;
+    record.value.__t = new Date().getTime();
+    console.log(data);
+    setBasicFieldsValue(record.value);
+    setFieldsValueHYTZ(record.value);
+    setFieldsValueKCYJ(record.value);
+    setFieldsValueQT(record.value);
+  });
+
+  async function submitAll() {
+    try {
+      //const data = await validate();
+
+      const valuesBasic = await basicValidate();
+      const valuesHYTZ = await validateHYTZ();
+      const valuesKCYJ = await validateKCYJ();
+      const valuesQT = await validateQT();
+
+      const data = {
+        ...valuesBasic,
+        ...valuesHYTZ,
+        ...valuesKCYJ,
+        ...valuesQT,
+      };
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        id: record.value.id,
+      };
+      // console.log('submit', params, data, record);
+      const res = await materialSave(params, data);
+      showMessage(res.message);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      console.log('finally');
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .high-form {
+    padding: 0px 0px 0px 0px;
+    padding-bottom: 48px;
+    //background: #f0f2f5;
+    //background: red;
+  }
+  .wppd0{
+    padding: 0px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/wms/basic/materialType/form.vue b/src/views/wms/basic/materialType/form.vue
new file mode 100644
index 0000000..d15c6e3
--- /dev/null
+++ b/src/views/wms/basic/materialType/form.vue
@@ -0,0 +1,158 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'wms:basic:materialType:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="60%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsWmsBasicMaterialTypeForm',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { MaterialType, materialTypeSave, materialTypeForm, materialTypeTreeData } from '/@/api/wms/basic/materialType';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('wms.basic.materialType');
+  const { showMessage } = useMessage();
+  const record = ref<MaterialType>({} as MaterialType);
+  const getTitle = computed(() => ({
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增物料分类表') : t('编辑物料分类表'),
+  }));
+
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('上级物料分类表'),
+      field: 'parentCode',
+      fieldLabel: 'parentName',
+      component: 'TreeSelect',
+      componentProps: {
+        allowClear: true,
+        style: 'width: calc(50% - 60px)',
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('物料分类编码'),
+      field: 'materialTypeCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      rules: [{ required: true }, { pattern: /^[a-zA-Z0-9_]*$/, message: t('请输入字母数字下划线') }],
+    },
+    {
+      label: t('分类名称'),
+      field: 'materialTypeName',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('排序号'),
+      field: 'treeSort',
+      helpMessage: '升序',
+      component: 'InputNumber',
+      defaultValue: '30',
+      componentProps: {
+        maxlength: 10,
+      },
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { lg: 12, md: 24 },
+  });
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ loading: true });
+    const res = await materialTypeForm(data);
+    record.value = (res.materialType || {}) as MaterialType;
+    record.value.__t = new Date().getTime();
+    if (data.parentCode && data.parentName) {
+      record.value.parentCode = data.parentCode;
+      record.value.parentName = data.parentName;
+    }
+    setFieldsValue(record.value);
+    updateSchema([
+      {
+        field: 'parentCode',
+        componentProps: {
+          api: materialTypeTreeData,
+          params: {
+            excludeCode: record.value.id,
+            isShowRawName: true,
+          },
+        },
+      },
+      {
+        field: 'materialTypeCode',
+        componentProps: {
+          disabled: !record.value.isNewRecord,
+        },
+      },
+    ]);
+    setDrawerProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        materialTypeCode: record.value.materialTypeCode,
+      };
+      // console.log('submit', params, data, record);
+      const res = await materialTypeSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/wms/basic/materialType/index.vue b/src/views/wms/basic/materialType/index.vue
new file mode 100644
index 0000000..4170bd6
--- /dev/null
+++ b/src/views/wms/basic/materialType/index.vue
@@ -0,0 +1,40 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <PageWrapper :sidebarWidth="230">
+    <template #sidebar>
+      <BasicTree
+        :title="t('物料分类表')"
+        :search="true"
+        :toolbar="true"
+        :api="materialTypeTreeData"
+        :defaultExpandLevel="2"
+        @select="handleSelect"
+      />
+    </template>
+    <ListView :treeCode="treeCode" />
+  </PageWrapper>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsWmsBasicMaterialTypeIndex',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { PageWrapper } from '/@/components/Page';
+  import { BasicTree } from '/@/components/Tree';
+  import { materialTypeTreeData } from '/@/api/wms/basic/materialType';
+  import ListView from './list.vue';
+
+  const { t } = useI18n('sys.menu');
+  const treeCode = ref<string>('');
+
+  function handleSelect(keys: string[]) {
+    treeCode.value = keys[0];
+  }
+</script>
diff --git a/src/views/wms/basic/materialType/list.vue b/src/views/wms/basic/materialType/list.vue
new file mode 100644
index 0000000..3f3549c
--- /dev/null
+++ b/src/views/wms/basic/materialType/list.vue
@@ -0,0 +1,199 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable" @fetchSuccess="fetchSuccess">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button @click="expandAll" :title="t('展开一级')">
+          <Icon icon="bi:chevron-double-down" /> {{ t('展开') }}
+        </a-button>
+        <a-button @click="collapseAll" :title="t('展开全部')">
+          <Icon icon="bi:chevron-double-up" /> {{ t('折叠') }}
+        </a-button>
+        <a-button type="primary" @click="handleForm({})" v-auth="'wms:basic:materialType:edit'">
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <span class="cursor-pointer" @click="expandCollapse(record)">
+          ( {{ record.materialTypeCode }} )
+        </span>
+        <a @click="handleForm({ materialTypeCode: record.materialTypeCode })">
+          {{ record.materialTypeName }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsWmsBasicMaterialTypeList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, watch, nextTick } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { materialTypeDelete, materialTypeListData } from '/@/api/wms/basic/materialType';
+  import { useDrawer } from '/@/components/Drawer';
+  import { FormProps } from '/@/components/Form';
+  import InputForm from './form.vue';
+
+  const props = defineProps({
+    treeCode: String,
+  });
+
+  const { t } = useI18n('wms.basic.materialType');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('物料分类表管理'),
+  };
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('分类名称'),
+        field: 'materialTypeName',
+        component: 'Input',
+      },
+      {
+        label: t('状态'),
+        field: 'status',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_search_status',
+          allowClear: true,
+        },
+      },
+      {
+        label: t('备注信息'),
+        field: 'remarks',
+        component: 'Input',
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('分类名称'),
+      dataIndex: 'materialTypeName',
+      width: 230,
+      align: 'left',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('排序号'),
+      dataIndex: 'treeSort',
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'status',
+      width: 130,
+      align: 'center',
+      dictType: 'sys_search_status',
+    },
+    {
+      title: t('更新时间'),
+      dataIndex: 'updateDate',
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'remarks',
+      width: 130,
+      align: 'left',
+    },
+  ];
+
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑物料分类表'),
+        onClick: handleForm.bind(this, { materialTypeCode: record.materialTypeCode }),
+        auth: 'wms:basic:materialType:edit',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除物料分类表'),
+        popConfirm: {
+          title: t('是否确认删除物料分类表'),
+          confirm: handleDelete.bind(this, { materialTypeCode: record.materialTypeCode }),
+        },
+        auth: 'wms:basic:materialType:edit',
+      },
+      {
+        icon: 'fluent:add-circle-24-regular',
+        title: t('新建下级物料分类表'),
+        onClick: handleForm.bind(this, {
+          parentCode: record.id,
+          parentName: record.materialTypeName,
+        }),
+        auth: 'wms:basic:materialType:edit',
+      },
+    ],
+  };
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerTable, { reload, expandAll, collapseAll, expandCollapse }] = useTable({
+    api: materialTypeListData,
+    beforeFetch: (params) => {
+      params.materialTypeCode = props.treeCode;
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    isTreeTable: true,
+    pagination: false,
+    canResize: true,
+  });
+
+  watch(
+    () => props.treeCode,
+    () => {
+      reload();
+    },
+  );
+
+  function fetchSuccess() {
+    if (props.treeCode) {
+      nextTick(expandAll);
+    }
+  }
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await materialTypeDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/shelves/form.vue b/src/views/wms/basic/shelves/form.vue
new file mode 100644
index 0000000..d3662f3
--- /dev/null
+++ b/src/views/wms/basic/shelves/form.vue
@@ -0,0 +1,189 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'wms:basic:shelves:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="60%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicShelvesForm',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed, onMounted } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { Shelves, shelvesSave, shelvesForm, shelvesTreeData } from '/@/api/wms/basic/shelves';
+  import { warehouseAllData } from '/@/api/wms/basic/warehouse';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.shelves');
+  const { showMessage } = useMessage();
+  const record = ref<Shelves>({} as Shelves);
+  const getTitle = computed(() => ({
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增货架货位管理') : t('编辑货架货位管理'),
+  }));
+  const ctrlPermi = ref('');
+  const warehouseList = ref<Recordable>([]);
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('上级货架货位管理'),
+      field: 'parentCode',
+      fieldLabel: 'parentName',
+      component: 'TreeSelect',
+      componentProps: {
+        allowClear: true,
+        style: 'width: calc(50% - 60px)',
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('所属仓库'),
+      field: 'warehouseCode',
+      component: 'Select',
+      componentProps: {
+        options: warehouseList,
+        allowClear: true,
+      },
+      required: true,
+    },
+    {
+      label: t('编码'),
+      field: 'shelvesNo',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      rules: [{ pattern: /^[a-zA-Z0-9_'-]*$/, message: t('请输入字母数字下划线1') }],
+    },
+    {
+      label: t('名称'),
+      field: 'name',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('类型'),
+      field: 'type',
+      component: 'Select',
+      componentProps: {
+        dictType: 'WMS_BASIC_SHELVES_TYPE',
+        allowClear: true,
+      },
+    },
+    {
+      label: t('排序号'),
+      field: 'treeSort',
+      helpMessage: '升序',
+      component: 'InputNumber',
+      defaultValue: '30',
+      componentProps: {
+        maxlength: 10,
+      },
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { lg: 12, md: 24 },
+  });
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ loading: true });
+    const res = await shelvesForm(data);
+    record.value = (res.shelves || {}) as Shelves;
+    record.value.__t = new Date().getTime();
+    if (data.parentCode && data.parentName) {
+      record.value.parentCode = data.parentCode;
+      record.value.parentName = data.parentName;
+    }
+    setFieldsValue(record.value);
+    updateSchema([
+      {
+        field: 'parentCode',
+        componentProps: {
+          api: shelvesTreeData,
+          params: {
+            excludeCode: record.value.id,
+            isShowRawName: true,
+          },
+        },
+      },
+      {
+        field: 'shelvesCode',
+        componentProps: {
+          disabled: !record.value.isNewRecord,
+        },
+      },
+    ]);
+    setDrawerProps({ loading: false });
+  });
+
+  //组件挂到页面后执行
+  onMounted(async () => {
+    const res = await warehouseAllData();
+    warehouseList.value = res.warehouseList?.map((item) => ({
+      label: item.name,
+      value: item.code,
+    }));
+    ctrlPermi.value = res.ctrlPermi || '2';
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        shelvesCode: record.value.shelvesCode,
+      };
+      // console.log('submit', params, data, record);
+      const res = await shelvesSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/wms/basic/shelves/index.vue b/src/views/wms/basic/shelves/index.vue
new file mode 100644
index 0000000..2f56472
--- /dev/null
+++ b/src/views/wms/basic/shelves/index.vue
@@ -0,0 +1,40 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <PageWrapper :sidebarWidth="230">
+    <template #sidebar>
+      <BasicTree
+        :title="t('')"
+        :search="true"
+        :toolbar="true"
+        :api="shelvesTreeData"
+        :defaultExpandLevel="2"
+        @select="handleSelect"
+      />
+    </template>
+    <ListView :treeCode="treeCode" />
+  </PageWrapper>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicShelvesIndex',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { PageWrapper } from '/@/components/Page';
+  import { BasicTree } from '/@/components/Tree';
+  import { shelvesTreeData } from '/@/api/wms/basic/shelves';
+  import ListView from './list.vue';
+
+  const { t } = useI18n('sys.menu');
+  const treeCode = ref<string>('');
+
+  function handleSelect(keys: string[]) {
+    treeCode.value = keys[0];
+  }
+</script>
diff --git a/src/views/wms/basic/shelves/list.vue b/src/views/wms/basic/shelves/list.vue
new file mode 100644
index 0000000..bfb20e0
--- /dev/null
+++ b/src/views/wms/basic/shelves/list.vue
@@ -0,0 +1,236 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable" @fetchSuccess="fetchSuccess">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button @click="expandAll" :title="t('展开一级')">
+          <Icon icon="bi:chevron-double-down" /> {{ t('展开') }}
+        </a-button>
+        <a-button @click="collapseAll" :title="t('展开全部')">
+          <Icon icon="bi:chevron-double-up" /> {{ t('折叠') }}
+        </a-button>
+        <a-button type="primary" @click="handleForm({})" v-auth="'wms:basic:shelves:edit'">
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <span class="cursor-pointer" @click="expandCollapse(record)"></span>
+        <a @click="handleForm({ shelvesCode: record.shelvesCode })">
+          {{ record.shelvesNo }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicShelvesList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, watch, nextTick, onMounted } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { shelvesDelete, shelvesListData } from '/@/api/wms/basic/shelves';
+  import { warehouseAllData } from '/@/api/wms/basic/warehouse';
+  import { useDrawer } from '/@/components/Drawer';
+  import { FormProps } from '/@/components/Form';
+  import InputForm from './form.vue';
+
+  const props = defineProps({
+    treeCode: String,
+  });
+
+  const { t } = useI18n('basic.shelves');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('货架货位管理管理'),
+  };
+  const ctrlPermi = ref('');
+  const warehouseList = ref<Recordable>([]);
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('所属仓库'),
+        field: 'warehouseCode',
+        component: 'Select',
+        componentProps: {
+          options: warehouseList,
+          allowClear: true,
+        },
+      },
+      {
+        label: t('编码'),
+        field: 'shelvesNo',
+        component: 'Input',
+      },
+      {
+        label: t('名称'),
+        field: 'name',
+        component: 'Input',
+      },
+      {
+        label: t('类型'),
+        field: 'type',
+        component: 'Select',
+        componentProps: {
+          dictType: 'WMS_BASIC_SHELVES_TYPE',
+          allowClear: true,
+        },
+      },
+      {
+        label: t('状态'),
+        field: 'status',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_search_status',
+          allowClear: true,
+        },
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('编码'),
+      dataIndex: 'shelvesNo',
+      width: 200,
+      align: 'left',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('名称'),
+      dataIndex: 'name',
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('类型'),
+      dataIndex: 'type',
+      width: 60,
+      align: 'center',
+      dictType: 'WMS_BASIC_SHELVES_TYPE',
+    },
+    {
+      title: t('所属仓库'),
+      dataIndex: 'warehouseName',
+      width: 230,
+      align: 'center',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'status',
+      width: 130,
+      align: 'center',
+      dictType: 'sys_search_status',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'remarks',
+      width: 130,
+      align: 'left',
+    },
+  ];
+
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑货架货位管理'),
+        onClick: handleForm.bind(this, { shelvesCode: record.shelvesCode }),
+        auth: 'wms:basic:shelves:edit',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除货架货位管理'),
+        popConfirm: {
+          title: t('是否确认删除货架货位管理'),
+          confirm: handleDelete.bind(this, { shelvesCode: record.shelvesCode }),
+        },
+        auth: 'wms:basic:shelves:edit',
+      },
+      {
+        icon: 'fluent:add-circle-24-regular',
+        title: t('新建下级货架货位管理'),
+        onClick: handleForm.bind(this, {
+          parentCode: record.shelvesCode,
+          parentName: record.name,
+        }),
+        auth: 'wms:basic:shelves:edit',
+      },
+    ],
+  };
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerTable, { reload, expandAll, collapseAll, expandCollapse }] = useTable({
+    api: shelvesListData,
+    beforeFetch: (params) => {
+      params.shelvesCode = props.treeCode;
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    isTreeTable: true,
+    pagination: false,
+    canResize: true,
+  });
+
+  //组件挂到页面后执行
+  onMounted(async () => {
+    const res = await warehouseAllData();
+    warehouseList.value = res.warehouseList?.map((item) => ({
+      label: item.name,
+      value: item.code,
+    }));
+    ctrlPermi.value = res.ctrlPermi || '2';
+    reload();
+  });
+
+  watch(
+    () => props.treeCode,
+    () => {
+      reload();
+    },
+  );
+
+  function fetchSuccess() {
+    if (props.treeCode) {
+      nextTick(expandAll);
+    }
+  }
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await shelvesDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/supplier/form.vue b/src/views/wms/basic/supplier/form.vue
new file mode 100644
index 0000000..8e0ec40
--- /dev/null
+++ b/src/views/wms/basic/supplier/form.vue
@@ -0,0 +1,271 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'wms:basic:supplier:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="60%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm">
+      <template #userRoleString>
+        <BasicTable @register="registerUserRoleTable" />
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicSupplierForm',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { SupplierUser, supplierSave, supplierForm } from '/@/api/wms/basic/supplier';
+  import { checkLoginCode } from '/@/api/sys/user';
+  import { roleTreeData } from '/@/api/sys/role';
+  import { BasicTable, useTable } from '/@/components/Table';
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.supplier');
+  const { showMessage } = useMessage();
+  const record = ref<SupplierUser>({} as SupplierUser);
+  const getTitle = computed(() => ({
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增供应商管理') : t('编辑供应商管理'),
+  }));
+  const op = ref<String>('');
+
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('供应编码'),
+      field: 'supplier.supCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      rules: [
+        { required: true },
+        { min: 4, max: 20, message: t('请输入长度在 4 到 20 个字符之间') },
+        { pattern: /^[\u0391-\uFFE5\w]+$/, message: t('不能输入特殊字符') },
+        {
+          validator(_rule, value) {
+            return new Promise((resolve, reject) => {
+              if (!value || value === '') return resolve();
+              checkLoginCode(record.value.supplier.supCode || '', value)
+                .then((res) => (res ? resolve() : reject(t('登录账号已存在'))))
+                .catch((err) => reject(err.message || t('验证失败')));
+            });
+          },
+        },
+      ],
+    },
+    {
+      label: t('供应商名称'),
+      field: 'supplier.supName',
+      component: 'Input',
+      required: true,
+      componentProps: {
+        maxlength: 100,
+      },
+    },
+    {
+      label: t('联系人'),
+      field: 'supplier.linker',
+      component: 'Input',
+      required: true,
+      componentProps: {
+        maxlength: 50,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('联系方式'),
+      field: 'supplier.phone',
+      required: true,
+      component: 'Input',
+      componentProps: {
+        maxlength: 15,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('区'),
+      field: 'supplier.areaCode',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('区'),
+      field: 'supplier.areaName',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('地址'),
+      field: 'supplier.address',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('邮箱'),
+      field: 'supplier.email',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('排序'),
+      field: 'supplier.sort',
+      helpMessage: '排序，权重越大排名越靠前，请填写数字。',
+      component: 'InputNumber',
+      defaultValue: 0,
+      componentProps: {
+        maxlength: 8,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+    },
+    {
+      label: t('备注信息'),
+      field: 'supplier.remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      ifShow: () => op.value === 'add' || op.value === 'edit',
+      colProps: { lg: 24, md: 24 },
+    },
+    {
+      label: t('角色信息'),
+      field: 'roleInfo',
+      component: 'FormGroup',
+      colProps: { lg: 24, md: 24 },
+      ifShow: () => op.value === 'add' || op.value === 'auth',
+    },
+    {
+      label: t('分配角色'),
+      field: 'userRoleString',
+      component: 'Input',
+      colProps: { lg: 24, md: 24 },
+      slot: 'userRoleString',
+      show: () => op.value === 'add' || op.value === 'auth',
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { lg: 12, md: 24 },
+  });
+
+  const [registerUserRoleTable, userRoleTable] = useTable({
+    columns: [
+      {
+        title: t('角色名称'),
+        dataIndex: 'name',
+        width: 260,
+        align: 'center',
+      },
+      {
+        title: t('角色编码'),
+        dataIndex: 'id',
+        width: 260,
+        align: 'center',
+      },
+    ],
+    rowSelection: { type: 'checkbox' },
+    pagination: false,
+    bordered: true,
+    size: 'small',
+    inset: true,
+  });
+
+  async function setUserRoleTableData(res: Recordable) {
+    const dataSource = await roleTreeData({
+      userType: 'supplier',
+    });
+    userRoleTable.setTableData(dataSource || []);
+    userRoleTable.setSelectedRowKeys(res.roleList?.map((item) => item.id) || []);
+  }
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ loading: true });
+    op.value = data.op || 'add';
+    const res = await supplierForm(data);
+    debugger;
+    record.value = (res.supplierUser || {}) as SupplierUser;
+    record.value.__t = new Date().getTime();
+    setFieldsValue(record.value);
+    /*updateSchema([
+      {
+        field: 'supCode',
+        componentProps: {
+          disabled: !record.value.isNewRecord,
+        },
+      },
+    ]);*/
+    if (op.value === 'add' || op.value === 'auth') {
+      setUserRoleTableData(res);
+    }
+    setDrawerProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        supId: record.value.supId,
+        supCode: record.value.supCode,
+        op: op.value,
+      };
+      // console.log('submit', params, data, record);
+      data.userType = 'supplier';
+      if (op.value === 'add' || op.value === 'edit') {
+        data.loginCode = data.supplier.supCode;
+      }
+      if (op.value === 'add' || op.value === 'auth') {
+        data.userRoleString = userRoleTable.getSelectRowKeys().join(',');
+      }
+      const res = await supplierSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/wms/basic/supplier/list.vue b/src/views/wms/basic/supplier/list.vue
new file mode 100644
index 0000000..9c63061
--- /dev/null
+++ b/src/views/wms/basic/supplier/list.vue
@@ -0,0 +1,291 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button
+          type="primary"
+          @click="handleForm({ op: 'add' })"
+          v-auth="'wms:basic:supplier:edit'"
+        >
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <a @click="handleForm({ supId: record.supplier.supId, op: 'edit' })">
+          {{ record.supplier.supCode }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicSupplierList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { supplierDelete, supplierListData } from '/@/api/wms/basic/supplier';
+  import { supplierDisable, supplierEnable, resetpwd } from '/@/api/wms/basic/supplier';
+  import { useDrawer } from '/@/components/Drawer';
+  import { FormProps } from '/@/components/Form';
+  import InputForm from './form.vue';
+
+  const { t } = useI18n('basic.supplier');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('供应商管理管理'),
+  };
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('供应商编码'),
+        field: 'supplier.supId',
+        component: 'Input',
+      },
+      {
+        label: t('供应商名称'),
+        field: 'supplier.supName',
+        component: 'Input',
+      },
+      {
+        label: t('联系人'),
+        field: 'supplier.linker',
+        component: 'Input',
+      },
+      {
+        label: t('区'),
+        field: 'supplier.areaCode',
+        component: 'Input',
+      },
+      {
+        label: t('状态'),
+        field: 'status',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_search_status',
+          allowClear: true,
+        },
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('供应商编码'),
+      dataIndex: 'supplier.supCode',
+      key: 's.sup_code',
+      sorter: true,
+      width: 150,
+      align: 'left',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('供应商名称'),
+      dataIndex: 'supplier.supName',
+      key: 's.sup_name',
+      sorter: true,
+      width: 250,
+      align: 'left',
+    },
+    {
+      title: t('联系人'),
+      dataIndex: 'supplier.linker',
+      key: 's.linker',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('联系方式'),
+      dataIndex: 'supplier.phone',
+      key: 's.phone',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('区'),
+      dataIndex: 'supplier.areaCode',
+      key: 's.area_code',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('区'),
+      dataIndex: 'supplier.areaName',
+      key: 's.area_name',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('地址'),
+      dataIndex: 'supplier.address',
+      key: 's.address',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('邮箱'),
+      dataIndex: 'supplier.email',
+      key: 's.email',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('排序'),
+      dataIndex: 'supplier.sort',
+      key: 's.sort',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'status',
+      key: 'a.status',
+      sorter: true,
+      width: 80,
+      dictType: 'sys_search_status',
+    },
+    {
+      title: t('更新时间'),
+      dataIndex: 'supplier.updateDate',
+      key: 's.update_date',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'supplier.remarks',
+      key: 's.remarks',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+  ];
+
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑供应商管理'),
+        onClick: handleForm.bind(this, { supId: record.supplier.supId, op: 'edit' }),
+        auth: 'wms:basic:supplier:edit',
+      },
+      {
+        icon: 'ant-design:stop-outlined',
+        color: 'error',
+        title: t('停用供应商管理'),
+        popConfirm: {
+          title: t('确认是否需要停用供应商'),
+          confirm: handleDisable.bind(this, { supId: record.supplier.supId }),
+        },
+        auth: 'wms:basic:supplier:updateStatus',
+        ifShow: () => record.supplier.status === '0',
+      },
+      {
+        icon: 'ant-design:check-circle-outlined',
+        color: 'success',
+        title: t('启用供应商管理'),
+        popConfirm: {
+          title: t('确认是否需要启用供应商'),
+          confirm: handleEnable.bind(this, { supId: record.supplier.supId }),
+        },
+        auth: 'wms:basic:supplier:updateStatus',
+        ifShow: () => record.supplier.status === '2',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除供应商管理'),
+        popConfirm: {
+          title: t('确认是否需要删除供应商'),
+          confirm: handleDelete.bind(this, { supId: record.supplier.supId }),
+        },
+        auth: 'wms:basic:supplier:edit',
+      },
+      {
+        icon: 'ant-design:reload-outlined',
+        title: t('重置密码'),
+        popConfirm: {
+          title: t('确认是否需要重置密码'),
+          confirm: handleResetpwd.bind(this, {
+            userCode: record.supplier.supId,
+            supId: record.supplier.supId,
+          }),
+        },
+        auth: 'sys:empUser:resetpwd',
+      },
+    ],
+  };
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerTable, { reload }] = useTable({
+    api: supplierListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleDisable(record: Recordable) {
+    const res = await supplierDisable(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleEnable(record: Recordable) {
+    const res = await supplierEnable(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await supplierDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleResetpwd(record: Recordable) {
+    const res = await resetpwd(record);
+    showMessage(res.message);
+  }
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/units/form.vue b/src/views/wms/basic/units/form.vue
new file mode 100644
index 0000000..c15273b
--- /dev/null
+++ b/src/views/wms/basic/units/form.vue
@@ -0,0 +1,121 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'wms:basic:units:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="60%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicUnitsForm',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { Units, unitsSave, unitsForm } from '/@/api/wms/basic/units';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.units');
+  const { showMessage } = useMessage();
+  const record = ref<Units>({} as Units);
+  const getTitle = computed(() => ({
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增单位') : t('编辑单位'),
+  }));
+
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('单位名称'),
+      field: 'unitName',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+      },
+      required: true,
+    },
+    {
+      label: t('是否允许小数'),
+      field: 'allowDecimal',
+      component: 'RadioGroup',
+      componentProps: {
+        dictType: 'sys_yes_no',
+      },
+      required: true,
+    },
+    {
+      label: t('顺序'),
+      field: 'sort',
+      component: 'Input',
+      rules: [{ pattern: /^\d+$/, message: t('请输入一个正整数') }],
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { lg: 24, md: 24 },
+  });
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ loading: true });
+    const res = await unitsForm(data);
+    record.value = (res.units || {}) as Units;
+    record.value.__t = new Date().getTime();
+    setFieldsValue(record.value);
+    setDrawerProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        unitCode: record.value.unitCode,
+      };
+      // console.log('submit', params, data, record);
+      const res = await unitsSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/wms/basic/units/list.vue b/src/views/wms/basic/units/list.vue
new file mode 100644
index 0000000..2bb72e0
--- /dev/null
+++ b/src/views/wms/basic/units/list.vue
@@ -0,0 +1,176 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button type="primary" @click="handleForm({})" v-auth="'wms:basic:units:edit'">
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <a @click="handleForm({ unitCode: record.unitCode })">
+          {{ record.unitName }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicUnitsList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { unitsDelete, unitsListData } from '/@/api/wms/basic/units';
+  import { useDrawer } from '/@/components/Drawer';
+  import { FormProps } from '/@/components/Form';
+  import InputForm from './form.vue';
+
+  const { t } = useI18n('basic.units');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('单位管理管理'),
+  };
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('单位名称'),
+        field: 'unitName',
+        component: 'Input',
+      },
+      {
+        label: t('状态'),
+        field: 'status',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_search_status',
+          allowClear: true,
+          onChange: handleSuccess,
+        },
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('单位名称'),
+      dataIndex: 'unitName',
+      key: 'a.unit_name',
+      sorter: true,
+      width: 230,
+      align: 'left',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('是否允许小数'),
+      dataIndex: 'allowDecimal',
+      key: 'a.allow_decimal',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_yes_no',
+    },
+    {
+      title: t('顺序'),
+      dataIndex: 'sort',
+      key: 'a.sort',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'status',
+      key: 'a.status',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_search_status',
+    },
+    {
+      title: t('更新时间'),
+      dataIndex: 'updateDate',
+      key: 'a.update_date',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'remarks',
+      key: 'a.remarks',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+  ];
+
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑单位管理'),
+        onClick: handleForm.bind(this, { unitCode: record.unitCode }),
+        auth: 'wms:basic:units:edit',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除单位管理'),
+        popConfirm: {
+          title: t('是否确认删除单位管理'),
+          confirm: handleDelete.bind(this, { unitCode: record.unitCode }),
+        },
+        auth: 'wms:basic:units:edit',
+      },
+    ],
+  };
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerTable, { reload }] = useTable({
+    api: unitsListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await unitsDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/warehouse/form.vue b/src/views/wms/basic/warehouse/form.vue
new file mode 100644
index 0000000..6422cfc
--- /dev/null
+++ b/src/views/wms/basic/warehouse/form.vue
@@ -0,0 +1,141 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    :showFooter="true"
+    :okAuth="'wms:basic:warehouse:edit'"
+    @register="registerDrawer"
+    @ok="handleSubmit"
+    width="60%"
+  >
+    <template #title>
+      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+      <span> {{ getTitle.value }} </span>
+    </template>
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicWarehouseForm',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { Warehouse, warehouseSave, warehouseForm } from '/@/api/wms/basic/warehouse';
+  import { officeTreeData } from '/@/api/sys/office';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { t } = useI18n('basic.warehouse');
+  const { showMessage } = useMessage();
+  const record = ref<Warehouse>({} as Warehouse);
+  const getTitle = computed(() => ({
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: record.value.isNewRecord ? t('新增仓库管理') : t('编辑仓库管理'),
+  }));
+
+  const inputFormSchemas: FormSchema[] = [
+    {
+      label: t('仓库名称'),
+      field: 'name',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      rules: [{ required: true }],
+    },
+    {
+      label: t('仓库编码'),
+      field: 'code',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+      },
+      rules: [{ required: true }],
+    },
+    {
+      label: t('所属部门'),
+      field: 'office.officeCode',
+      component: 'TreeSelect',
+      componentProps: {
+        api: officeTreeData,
+      },
+    },
+    {
+      label: t('负责人'),
+      field: 'responsiblePerson',
+      component: 'Input',
+      componentProps: {
+        maxlength: 50,
+      },
+    },
+    {
+      label: t('联系电话'),
+      field: 'phone',
+      component: 'Input',
+      componentProps: {
+        maxlength: 20,
+      },
+      rules: [{ pattern: /(^0[1-9]{1}\d{8,10}$)|(^1[3,4,5,6,7,8,9]\d{9}$)/g, message: t('请输入固话或手机号码') }],
+    },
+    {
+      label: t('备注信息'),
+      field: 'remarks',
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 500,
+      },
+      colProps: { lg: 24, md: 24 },
+    },
+  ];
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 120,
+    schemas: inputFormSchemas,
+    baseColProps: { lg: 12, md: 24 },
+  });
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ loading: true });
+    const res = await warehouseForm(data);
+    record.value = (res.warehouse || {}) as Warehouse;
+    record.value.__t = new Date().getTime();
+    setFieldsValue(record.value);
+    setDrawerProps({ loading: false });
+  });
+
+  async function handleSubmit() {
+    try {
+      const data = await validate();
+      setDrawerProps({ confirmLoading: true });
+      const params: any = {
+        isNewRecord: record.value.isNewRecord,
+        code: record.value.code,
+      };
+      // console.log('submit', params, data, record);
+      const res = await warehouseSave(params, data);
+      showMessage(res.message);
+      setTimeout(closeDrawer);
+      emit('success', data);
+    } catch (error: any) {
+      if (error && error.errorFields) {
+        showMessage(t('您填写的信息有误，请根据提示修正。'));
+      }
+      console.log('error', error);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/wms/basic/warehouse/list.vue b/src/views/wms/basic/warehouse/list.vue
new file mode 100644
index 0000000..6f58cc4
--- /dev/null
+++ b/src/views/wms/basic/warehouse/list.vue
@@ -0,0 +1,226 @@
+<!--
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ * @author tanghan
+-->
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
+        <span> {{ getTitle.value }} </span>
+      </template>
+      <template #toolbar>
+        <a-button type="primary" @click="handleForm({})" v-auth="'wms:basic:warehouse:edit'">
+          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
+        </a-button>
+      </template>
+      <template #firstColumn="{ record }">
+        <a @click="handleForm({ code: record.code })">
+          {{ record.name }}
+        </a>
+      </template>
+    </BasicTable>
+    <InputForm @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  export default defineComponent({
+    name: 'ViewsBasicWarehouseList',
+  });
+</script>
+<script lang="ts" setup>
+  import { defineComponent } from 'vue';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { router } from '/@/router';
+  import { Icon } from '/@/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+  import { warehouseDelete, warehouseListData } from '/@/api/wms/basic/warehouse';
+  import { warehouseDisable, warehouseEnable } from '/@/api/wms/basic/warehouse';
+  import { officeTreeData } from '/@/api/sys/office';
+  import { useDrawer } from '/@/components/Drawer';
+  import { FormProps } from '/@/components/Form';
+  import InputForm from './form.vue';
+
+  const { t } = useI18n('basic.warehouse');
+  const { showMessage } = useMessage();
+  const getTitle = {
+    icon: router.currentRoute.value.meta.icon || 'ant-design:book-outlined',
+    value: router.currentRoute.value.meta.title || t('仓库管理管理'),
+  };
+
+  const searchForm: FormProps = {
+    baseColProps: { lg: 6, md: 8 },
+    labelWidth: 90,
+    schemas: [
+      {
+        label: t('仓库名称'),
+        field: 'name',
+        component: 'Input',
+      },
+      {
+        label: t('所属部门'),
+        field: 'office.officeCode',
+        component: 'TreeSelect',
+        componentProps: {
+          api: officeTreeData,
+        },
+      },
+      {
+        label: t('状态'),
+        field: 'status',
+        component: 'Select',
+        componentProps: {
+          dictType: 'sys_search_status',
+          allowClear: true,
+        },
+      },
+    ],
+  };
+
+  const tableColumns: BasicColumn[] = [
+    {
+      title: t('仓库名称'),
+      dataIndex: 'name',
+      key: 'a.name',
+      sorter: true,
+      width: 230,
+      align: 'left',
+      slots: { customRender: 'firstColumn' },
+    },
+    {
+      title: t('所属部门'),
+      dataIndex: 'office.officeName',
+      key: 'a.office_id',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('负责人'),
+      dataIndex: 'responsiblePerson',
+      key: 'a.responsible_person',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('联系电话'),
+      dataIndex: 'phone',
+      key: 'a.phone',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+    {
+      title: t('状态'),
+      dataIndex: 'status',
+      key: 'a.status',
+      sorter: true,
+      width: 130,
+      align: 'center',
+      dictType: 'sys_search_status',
+    },
+    {
+      title: t('更新时间'),
+      dataIndex: 'updateDate',
+      key: 'a.update_date',
+      sorter: true,
+      width: 130,
+      align: 'center',
+    },
+    {
+      title: t('备注信息'),
+      dataIndex: 'remarks',
+      key: 'a.remarks',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+  ];
+
+  const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+      {
+        icon: 'clarity:note-edit-line',
+        title: t('编辑仓库管理'),
+        onClick: handleForm.bind(this, { code: record.code }),
+        auth: 'wms:basic:warehouse:edit',
+      },
+      {
+        icon: 'ant-design:stop-outlined',
+        color: 'error',
+        title: t('停用仓库管理'),
+        popConfirm: {
+          title: t('是否确认停用仓库管理'),
+          confirm: handleDisable.bind(this, { code: record.code }),
+        },
+        auth: 'wms:basic:warehouse:edit',
+        ifShow: () => record.status === '0',
+      },
+      {
+        icon: 'ant-design:check-circle-outlined',
+        color: 'success',
+        title: t('启用仓库管理'),
+        popConfirm: {
+          title: t('是否确认启用仓库管理'),
+          confirm: handleEnable.bind(this, { code: record.code }),
+        },
+        auth: 'wms:basic:warehouse:edit',
+        ifShow: () => record.status === '2',
+      },
+      {
+        icon: 'ant-design:delete-outlined',
+        color: 'error',
+        title: t('删除仓库管理'),
+        popConfirm: {
+          title: t('是否确认删除仓库管理'),
+          confirm: handleDelete.bind(this, { code: record.code }),
+        },
+        auth: 'wms:basic:warehouse:edit',
+      },
+    ],
+  };
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerTable, { reload }] = useTable({
+    api: warehouseListData,
+    beforeFetch: (params) => {
+      return params;
+    },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    formConfig: searchForm,
+    showTableSetting: true,
+    useSearchForm: true,
+    canResize: true,
+  });
+
+  function handleForm(record: Recordable) {
+    openDrawer(true, record);
+  }
+
+  async function handleDisable(record: Recordable) {
+    const res = await warehouseDisable(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleEnable(record: Recordable) {
+    const res = await warehouseEnable(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  async function handleDelete(record: Recordable) {
+    const res = await warehouseDelete(record);
+    showMessage(res.message);
+    handleSuccess();
+  }
+
+  function handleSuccess() {
+    reload();
+  }
+</script>
diff --git a/src/views/wms/basic/wmsBasicDetail.vue b/src/views/wms/basic/wmsBasicDetail.vue
new file mode 100644
index 0000000..aca67ae
--- /dev/null
+++ b/src/views/wms/basic/wmsBasicDetail.vue
@@ -0,0 +1,29 @@
+<template>
+  <PageWrapper title="ViewsBasicMaterialDetail">
+    <div>{{ index }} - 详情页ViewsBasicMaterialDetail此</div>
+  </PageWrapper>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  import { PageWrapper } from '/@/components/Page';
+  //import { useTabs } from '/@/hooks/web/useTabs';
+  //import { useRoute } from 'vue-router';
+
+  export default defineComponent({
+    name: 'ViewswmsBasicDetail',
+    components: { PageWrapper },
+    setup() {
+      //const route = useRoute();
+      //const index = route.params?.id ?? -1;
+      //const from = route.redirectedFrom;
+      //const { setTitle } = useTabs();
+      debugger;
+      // 设置标识
+      setTitle(`ViewswmsBasicDetail`);
+      return {
+        index,
+      };
+    },
+  });
+</script>
-- 
Gitee