diff --git a/src/api/wms/md/merchant/index.ts b/src/api/wms/md/merchant/index.ts
new file mode 100644
index 000000000..7a552a29a
--- /dev/null
+++ b/src/api/wms/md/merchant/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+// WMS 往来企业 VO
+export interface MerchantVO {
+ id?: number
+ code?: string
+ name?: string
+ type?: number
+ level?: string
+ bankName?: string
+ bankAccount?: string
+ address?: string
+ mobile?: string
+ telephone?: string
+ contact?: string
+ email?: string
+ remark?: string
+ createTime?: Date
+}
+
+// WMS 往来企业 API
+export const MerchantApi = {
+ // 查询往来企业分页
+ getMerchantPage: async (params: any) => {
+ return await request.get({ url: '/wms/merchant/page', params })
+ },
+
+ // 查询往来企业精简列表
+ getMerchantSimpleList: async (params?: any) => {
+ return await request.get({ url: '/wms/merchant/simple-list', params })
+ },
+
+ // 查询往来企业详情
+ getMerchant: async (id: number) => {
+ return await request.get({ url: '/wms/merchant/get?id=' + id })
+ },
+
+ // 新增往来企业
+ createMerchant: async (data: MerchantVO) => {
+ return await request.post({ url: '/wms/merchant/create', data })
+ },
+
+ // 修改往来企业
+ updateMerchant: async (data: MerchantVO) => {
+ return await request.put({ url: '/wms/merchant/update', data })
+ },
+
+ // 删除往来企业
+ deleteMerchant: async (id: number) => {
+ return await request.delete({ url: '/wms/merchant/delete?id=' + id })
+ },
+
+ // 导出往来企业
+ exportMerchant: async (params: any) => {
+ return await request.download({ url: '/wms/merchant/export-excel', params })
+ }
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 455c3d656..130c239ab 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -217,7 +217,7 @@ export enum DICT_TYPE {
ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type', // 库存明细的业务类型
// ========== WMS - 仓库管理模块 ==========
- WMS_MERCHANT_TYPE = 'merchant_type', // WMS 供应商企业类型
+ WMS_MERCHANT_TYPE = 'merchant_type', // WMS 往来企业类型
// ========== AI - 人工智能模块 ==========
AI_PLATFORM = 'ai_platform', // AI 平台
diff --git a/src/views/wms/md/merchant/MerchantForm.vue b/src/views/wms/md/merchant/MerchantForm.vue
new file mode 100644
index 000000000..6571f0066
--- /dev/null
+++ b/src/views/wms/md/merchant/MerchantForm.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
diff --git a/src/views/wms/md/merchant/index.vue b/src/views/wms/md/merchant/index.vue
new file mode 100644
index 000000000..5aa27392f
--- /dev/null
+++ b/src/views/wms/md/merchant/index.vue
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+ 重置
+
+
+
+ 新增
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+