diff --git a/src/api/oa/base/templateVariable/index.ts b/src/api/oa/base/templateVariable/index.ts
index 8e8d1a5..1a20aae 100644
--- a/src/api/oa/base/templateVariable/index.ts
+++ b/src/api/oa/base/templateVariable/index.ts
@@ -74,3 +74,11 @@ export function getBaseTemplateVariableList (query) {
         params: query
     });
 };
+
+export function templateAssign(query) {
+  return request({
+    url: '/oa/base/templateVariable/assign',
+    method: 'post',
+    data: query
+  });
+};
diff --git a/src/api/oa/crm/crmSupplierInfo/index.ts b/src/api/oa/crm/crmSupplierInfo/index.ts
new file mode 100644
index 0000000..e74285d
--- /dev/null
+++ b/src/api/oa/crm/crmSupplierInfo/index.ts
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CrmSupplierInfoVO, CrmSupplierInfoForm, CrmSupplierInfoQuery } from '@/api/oa/crm/crmSupplierInfo/types';
+
+/**
+ * 查询供应商信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCrmSupplierInfo = (query?: CrmSupplierInfoQuery): AxiosPromise<CrmSupplierInfoVO[]> => {
+  return request({
+    url: '/oa/crm/crmSupplierInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询供应商信息详细
+ * @param supplierId
+ */
+export const getCrmSupplierInfo = (supplierId: string | number): AxiosPromise<CrmSupplierInfoVO> => {
+  return request({
+    url: '/oa/crm/crmSupplierInfo/' + supplierId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增供应商信息
+ * @param data
+ */
+export const addCrmSupplierInfo = (data: CrmSupplierInfoForm) => {
+  return request({
+    url: '/oa/crm/crmSupplierInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改供应商信息
+ * @param data
+ */
+export const updateCrmSupplierInfo = (data: CrmSupplierInfoForm) => {
+  return request({
+    url: '/oa/crm/crmSupplierInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除供应商信息
+ * @param supplierId
+ */
+export const delCrmSupplierInfo = (supplierId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/crm/crmSupplierInfo/' + supplierId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询供应商信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getCrmSupplierInfoList (query) {
+    return request({
+        url: '/oa/crm/crmSupplierInfo/getCrmSupplierInfoList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/oa/crm/crmSupplierInfo/types.ts b/src/api/oa/crm/crmSupplierInfo/types.ts
new file mode 100644
index 0000000..1d0f481
--- /dev/null
+++ b/src/api/oa/crm/crmSupplierInfo/types.ts
@@ -0,0 +1,401 @@
+export interface CrmSupplierInfoVO {
+  /**
+   * 供应商ID
+   */
+  supplierId: string | number;
+
+  /**
+   * 供应商名称
+   */
+  supplierName: string;
+
+  /**
+   * 助记名称
+   */
+  mnemonicName: string;
+
+  /**
+   * 供应商类型（1企业 2个体户 3其他）
+   */
+  supplierType: string;
+
+  /**
+   * 注册资本（万元）
+   */
+  registeredCapital: number;
+
+  /**
+   * 成立日期
+   */
+  establishmentDate: string;
+
+  /**
+   * 经营范围
+   */
+  businessScope: string;
+
+  /**
+   * 主营行业
+   */
+  mainIndustry: string;
+
+  /**
+   * 法定代表人
+   */
+  legalRepresentative: string;
+
+  /**
+   * 营业执照号码
+   */
+  businessLicenseNumber: string;
+
+  /**
+   * 税号
+   */
+  taxNumber: string;
+
+  /**
+   * 开户银行
+   */
+  bankAccountOpening: string;
+
+  /**
+   * 银行账号
+   */
+  bankNumber: string;
+
+  /**
+   * 注册地址
+   */
+  registeredAddress: string;
+
+  /**
+   * 经营地址
+   */
+  businessAddress: string;
+
+  /**
+   * 联系人
+   */
+  contactPerson: string;
+
+  /**
+   * 联系电话
+   */
+  contactPhone: string;
+
+  /**
+   * 联系手机
+   */
+  contactMobile: string;
+
+  /**
+   * 联系邮箱
+   */
+  contactEmail: string;
+
+  /**
+   * 传真
+   */
+  contactFax: string;
+
+  /**
+   * 网址
+   */
+  website: string;
+
+  /**
+   * 归属人员ID
+   */
+  ownerId: string | number;
+
+  /**
+   * 详细地址
+   */
+  detailedAddress: string;
+
+  /**
+   * 附件ID
+   */
+  ossId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 归属人员名称
+   */
+  ownerName?: string;
+
+}
+
+export interface CrmSupplierInfoForm extends BaseEntity {
+  /**
+   * 供应商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * 助记名称
+   */
+  mnemonicName?: string;
+
+  /**
+   * 供应商类型（1企业 2个体户 3其他）
+   */
+  supplierType?: string;
+
+  /**
+   * 注册资本（万元）
+   */
+  registeredCapital?: number;
+
+  /**
+   * 成立日期
+   */
+  establishmentDate?: string;
+
+  /**
+   * 经营范围
+   */
+  businessScope?: string;
+
+  /**
+   * 主营行业
+   */
+  mainIndustry?: string;
+
+  /**
+   * 法定代表人
+   */
+  legalRepresentative?: string;
+
+  /**
+   * 营业执照号码
+   */
+  businessLicenseNumber?: string;
+
+  /**
+   * 税号
+   */
+  taxNumber?: string;
+
+  /**
+   * 开户银行
+   */
+  bankAccountOpening?: string;
+
+  /**
+   * 银行账号
+   */
+  bankNumber?: string;
+
+  /**
+   * 注册地址
+   */
+  registeredAddress?: string;
+
+  /**
+   * 经营地址
+   */
+  businessAddress?: string;
+
+  /**
+   * 联系人
+   */
+  contactPerson?: string;
+
+  /**
+   * 联系电话
+   */
+  contactPhone?: string;
+
+  /**
+   * 联系手机
+   */
+  contactMobile?: string;
+
+  /**
+   * 联系邮箱
+   */
+  contactEmail?: string;
+
+  /**
+   * 传真
+   */
+  contactFax?: string;
+
+  /**
+   * 网址
+   */
+  website?: string;
+
+  /**
+   * 归属人员ID
+   */
+  ownerId?: string | number;
+
+  /**
+   * 详细地址
+   */
+  detailedAddress?: string;
+
+  /**
+   * 附件ID
+   */
+  ossId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+}
+
+export interface CrmSupplierInfoQuery extends PageQuery {
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * 助记名称
+   */
+  mnemonicName?: string;
+
+  /**
+   * 供应商类型（1企业 2个体户 3其他）
+   */
+  supplierType?: string;
+
+  /**
+   * 注册资本（万元）
+   */
+  registeredCapital?: number;
+
+  /**
+   * 成立日期
+   */
+  establishmentDate?: string;
+
+  /**
+   * 经营范围
+   */
+  businessScope?: string;
+
+  /**
+   * 主营行业
+   */
+  mainIndustry?: string;
+
+  /**
+   * 法定代表人
+   */
+  legalRepresentative?: string;
+
+  /**
+   * 营业执照号码
+   */
+  businessLicenseNumber?: string;
+
+  /**
+   * 税号
+   */
+  taxNumber?: string;
+
+  /**
+   * 开户银行
+   */
+  bankAccountOpening?: string;
+
+  /**
+   * 银行账号
+   */
+  bankNumber?: string;
+
+  /**
+   * 注册地址
+   */
+  registeredAddress?: string;
+
+  /**
+   * 经营地址
+   */
+  businessAddress?: string;
+
+  /**
+   * 联系人
+   */
+  contactPerson?: string;
+
+  /**
+   * 联系电话
+   */
+  contactPhone?: string;
+
+  /**
+   * 联系手机
+   */
+  contactMobile?: string;
+
+  /**
+   * 联系邮箱
+   */
+  contactEmail?: string;
+
+  /**
+   * 传真
+   */
+  contactFax?: string;
+
+  /**
+   * 网址
+   */
+  website?: string;
+
+  /**
+   * 归属人员ID
+   */
+  ownerId?: string | number;
+
+  /**
+   * 详细地址
+   */
+  detailedAddress?: string;
+
+  /**
+   * 附件ID
+   */
+  ossId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+
diff --git a/src/api/oa/crm/customerInfo/types.ts b/src/api/oa/crm/customerInfo/types.ts
index 6aaf6d8..0786699 100644
--- a/src/api/oa/crm/customerInfo/types.ts
+++ b/src/api/oa/crm/customerInfo/types.ts
@@ -44,6 +44,11 @@ export interface CustomerInfoVO {
    */
   ownerId: string | number;
 
+  /**
+   * 归属人员名称
+   */
+  ownerName?: string;
+
   /**
    * 详细地址
    */
@@ -104,6 +109,11 @@ export interface CustomerInfoVO {
    */
   activeFlag: string;
 
+  /**
+   * 本公司标识（1是 0否）
+   */
+  ourCompanyFlag?: string;
+
 }
 
 export interface CustomerInfoForm extends BaseEntity {
@@ -212,6 +222,11 @@ export interface CustomerInfoForm extends BaseEntity {
    */
   activeFlag?: string;
 
+  /**
+   * 本公司标识（1是 0否）
+   */
+  ourCompanyFlag?: string;
+
 }
 
 export interface CustomerInfoQuery extends PageQuery {
@@ -311,6 +326,11 @@ export interface CustomerInfoQuery extends PageQuery {
    */
   activeFlag?: string;
 
+  /**
+   * 本公司标识（1是 0否）
+   */
+  ourCompanyFlag?: string;
+
   /**
    * 日期范围参数
    */
diff --git a/src/api/oa/erp/erpProjectPlan/index.ts b/src/api/oa/erp/erpProjectPlan/index.ts
new file mode 100644
index 0000000..f89e263
--- /dev/null
+++ b/src/api/oa/erp/erpProjectPlan/index.ts
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ErpProjectPlanVO, ErpProjectPlanForm, ErpProjectPlanQuery } from '@/api/oa/erp/erpProjectPlan/types';
+
+/**
+ * 查询项目计划列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listErpProjectPlan = (query?: ErpProjectPlanQuery): AxiosPromise<ErpProjectPlanVO[]> => {
+  return request({
+    url: '/oa/erp/erpProjectPlan/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询项目计划详细
+ * @param projectPlanId
+ */
+export const getErpProjectPlan = (projectPlanId: string | number): AxiosPromise<ErpProjectPlanVO> => {
+  return request({
+    url: '/oa/erp/erpProjectPlan/' + projectPlanId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增项目计划
+ * @param data
+ */
+export const addErpProjectPlan = (data: ErpProjectPlanForm) => {
+  return request({
+    url: '/oa/erp/erpProjectPlan',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改项目计划
+ * @param data
+ */
+export const updateErpProjectPlan = (data: ErpProjectPlanForm) => {
+  return request({
+    url: '/oa/erp/erpProjectPlan',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除项目计划
+ * @param projectPlanId
+ */
+export const delErpProjectPlan = (projectPlanId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/erp/erpProjectPlan/' + projectPlanId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询项目计划列表
+ * @param query
+ * @returns {*}
+ */
+export function getErpProjectPlanList (query) {
+    return request({
+        url: '/oa/erp/erpProjectPlan/getErpProjectPlanList',
+        method: 'get',
+        params: query
+    });
+};
+
+/**
+ * 提交项目计划并发起流程
+ * @param data
+ */
+export const projectPlanSubmitAndFlowStart = (data: ErpProjectPlanForm): AxiosPromise<ErpProjectPlanVO> => {
+  return request({
+    url: '/oa/erp/erpProjectPlan/projectPlanSubmitAndFlowStart',
+    method: 'post',
+    data: data
+  });
+};
diff --git a/src/api/oa/erp/erpProjectPlan/types.ts b/src/api/oa/erp/erpProjectPlan/types.ts
new file mode 100644
index 0000000..6096405
--- /dev/null
+++ b/src/api/oa/erp/erpProjectPlan/types.ts
@@ -0,0 +1,214 @@
+export interface ErpProjectPlanVO {
+  /**
+   * 项目计划ID
+   */
+  projectPlanId: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 项目经理
+   */
+  managerId: string | number;
+
+  /**
+   * 部门负责人
+   */
+  chargeId: string | number;
+
+  /**
+   * 付款方式
+   */
+  paymentMethod: string;
+
+  /**
+   * 项目计划状态(1暂存 2审批中 3可用)
+   */
+  projectPlanStatus: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 合同ID(预留)
+   */
+  contractId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 项目计划阶段列表
+   */
+  planStageList?: any[];
+
+  /**
+   * 项目名称
+   */
+  projectName?: string;
+
+  /**
+   * 项目经理名称
+   */
+  managerName?: string;
+
+  /**
+   * 部门负责人名称
+   */
+  chargeName?: string;
+
+  /**
+   * 合同名称
+   */
+  contractName?: string;
+}
+
+export interface ErpProjectPlanForm extends BaseEntity {
+  /**
+   * 项目计划ID
+   */
+  projectPlanId?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 项目经理
+   */
+  managerId?: string | number;
+
+  /**
+   * 部门负责人
+   */
+  chargeId?: string | number;
+
+  /**
+   * 付款方式
+   */
+  paymentMethod?: string;
+
+  /**
+   * 项目计划状态(1暂存 2审批中 3可用)
+   */
+  projectPlanStatus?: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 合同ID(预留)
+   */
+  contractId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 项目计划阶段列表
+   */
+  planStageList?: any[];
+
+  /**
+   * 流程定义编码
+   */
+  flowCode?: any;
+
+  /**
+   * 流程变量
+   */
+  variables?: any;
+
+  /**
+   * 流程业务扩展信息
+   */
+  bizExt?: any;
+}
+
+export interface ErpProjectPlanQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 项目经理
+   */
+  managerId?: string | number;
+
+  /**
+   * 部门负责人
+   */
+  chargeId?: string | number;
+
+  /**
+   * 付款方式
+   */
+  paymentMethod?: string;
+
+  /**
+   * 项目计划状态(1暂存 2审批中 3可用)
+   */
+  projectPlanStatus?: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 合同ID(预留)
+   */
+  contractId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+
diff --git a/src/api/oa/erp/erpProjectPlanStage/index.ts b/src/api/oa/erp/erpProjectPlanStage/index.ts
new file mode 100644
index 0000000..2b04a95
--- /dev/null
+++ b/src/api/oa/erp/erpProjectPlanStage/index.ts
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ErpProjectPlanStageVO, ErpProjectPlanStageForm, ErpProjectPlanStageQuery } from '@/api/oa/erp/erpProjectPlanStage/types';
+
+/**
+ * 查询项目计划阶段列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listErpProjectPlanStage = (query?: ErpProjectPlanStageQuery): AxiosPromise<ErpProjectPlanStageVO[]> => {
+  return request({
+    url: '/oa/erp/erpProjectPlanStage/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询项目计划阶段详细
+ * @param planStageId
+ */
+export const getErpProjectPlanStage = (planStageId: string | number): AxiosPromise<ErpProjectPlanStageVO> => {
+  return request({
+    url: '/oa/erp/erpProjectPlanStage/' + planStageId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增项目计划阶段
+ * @param data
+ */
+export const addErpProjectPlanStage = (data: ErpProjectPlanStageForm) => {
+  return request({
+    url: '/oa/erp/erpProjectPlanStage',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改项目计划阶段
+ * @param data
+ */
+export const updateErpProjectPlanStage = (data: ErpProjectPlanStageForm) => {
+  return request({
+    url: '/oa/erp/erpProjectPlanStage',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除项目计划阶段
+ * @param planStageId
+ */
+export const delErpProjectPlanStage = (planStageId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/erp/erpProjectPlanStage/' + planStageId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询项目计划阶段列表
+ * @param query
+ * @returns {*}
+ */
+export function getErpProjectPlanStageList (query) {
+    return request({
+        url: '/oa/erp/erpProjectPlanStage/getErpProjectPlanStageList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/oa/erp/erpProjectPlanStage/types.ts b/src/api/oa/erp/erpProjectPlanStage/types.ts
new file mode 100644
index 0000000..417526a
--- /dev/null
+++ b/src/api/oa/erp/erpProjectPlanStage/types.ts
@@ -0,0 +1,291 @@
+export interface ErpProjectPlanStageVO {
+  /**
+   * 计划阶段ID
+   */
+  planStageId: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 项目计划ID
+   */
+  projectPlanId: string | number;
+
+  /**
+   * 项目阶段
+   */
+  projectPhases: string;
+
+  /**
+   * 计划开始时间
+   */
+  planStartTime: string;
+
+  /**
+   * 计划结束时间
+   */
+  planEndTime: string;
+
+  /**
+   * 回款阶段
+   */
+  collectionStage: string;
+
+  /**
+   * 预计回款比例(%)
+   */
+  repaymentRate: number;
+
+  /**
+   * 预计回款金额
+   */
+  repaymentAmount: number;
+
+  /**
+   * 预计回款时间
+   */
+  repaymentTime: string;
+
+  /**
+   * 回款延期天数
+   */
+  delayDay: number;
+
+  /**
+   * 应收款日期
+   */
+  receivableDate: string;
+
+  /**
+   * 原因说明
+   */
+  reasonsExplanation: string;
+
+  /**
+   * 进度备注
+   */
+  scheduleRemark: string;
+
+  /**
+   * 实际开始时间
+   */
+  realStartTime: string;
+
+  /**
+   * 实际结束时间
+   */
+  realEndTime: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+}
+
+export interface ErpProjectPlanStageForm extends BaseEntity {
+  /**
+   * 计划阶段ID
+   */
+  planStageId?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 项目计划ID
+   */
+  projectPlanId?: string | number;
+
+  /**
+   * 项目阶段
+   */
+  projectPhases?: string;
+
+  /**
+   * 计划开始时间
+   */
+  planStartTime?: string;
+
+  /**
+   * 计划结束时间
+   */
+  planEndTime?: string;
+
+  /**
+   * 回款阶段
+   */
+  collectionStage?: string;
+
+  /**
+   * 预计回款比例(%)
+   */
+  repaymentRate?: number;
+
+  /**
+   * 预计回款金额
+   */
+  repaymentAmount?: number;
+
+  /**
+   * 预计回款时间
+   */
+  repaymentTime?: string;
+
+  /**
+   * 回款延期天数
+   */
+  delayDay?: number;
+
+  /**
+   * 应收款日期
+   */
+  receivableDate?: string;
+
+  /**
+   * 原因说明
+   */
+  reasonsExplanation?: string;
+
+  /**
+   * 进度备注
+   */
+  scheduleRemark?: string;
+
+  /**
+   * 实际开始时间
+   */
+  realStartTime?: string;
+
+  /**
+   * 实际结束时间
+   */
+  realEndTime?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+}
+
+export interface ErpProjectPlanStageQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 项目计划ID
+   */
+  projectPlanId?: string | number;
+
+  /**
+   * 项目阶段
+   */
+  projectPhases?: string;
+
+  /**
+   * 计划开始时间
+   */
+  planStartTime?: string;
+
+  /**
+   * 计划结束时间
+   */
+  planEndTime?: string;
+
+  /**
+   * 回款阶段
+   */
+  collectionStage?: string;
+
+  /**
+   * 预计回款比例(%)
+   */
+  repaymentRate?: number;
+
+  /**
+   * 预计回款金额
+   */
+  repaymentAmount?: number;
+
+  /**
+   * 预计回款时间
+   */
+  repaymentTime?: string;
+
+  /**
+   * 回款延期天数
+   */
+  delayDay?: number;
+
+  /**
+   * 应收款日期
+   */
+  receivableDate?: string;
+
+  /**
+   * 原因说明
+   */
+  reasonsExplanation?: string;
+
+  /**
+   * 进度备注
+   */
+  scheduleRemark?: string;
+
+  /**
+   * 实际开始时间
+   */
+  realStartTime?: string;
+
+  /**
+   * 实际结束时间
+   */
+  realEndTime?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+
diff --git a/src/views/oa/base/printTemplate/template.vue b/src/views/oa/base/printTemplate/template.vue
index c2a75db..2b73f9f 100644
--- a/src/views/oa/base/printTemplate/template.vue
+++ b/src/views/oa/base/printTemplate/template.vue
@@ -29,16 +29,7 @@ const template = ref({});
 
 const editorRef = ref();
 
-const fieldList = ref([
-  {
-    name: '字段1',
-    value: '${ziduan1}'
-  },
-  {
-    name: '字段2',
-    value: '${ziduan2}'
-  }
-]);
+const fieldList = ref([]);
 
 const templateData = {
   data0: '合计-1',
@@ -102,7 +93,7 @@ const options = ref({
     },
     autoSave: {
       enabled: true,
-      interval: 300000
+      interval: 1000 * 60 * 5
     }
   },
   page: {
@@ -119,7 +110,7 @@ const options = ref({
   }
 });
 const renderTemplate = (str, data) => {
-  return str.replace(/&\{(.*?)\}/g, (_, path) => {
+  return str.replace(/#\{(.*?)\}/g, (_, path) => {
     // console.log(path.split('.').reduce((o, k) => o?.[k], data) ?? '');
     return path.split('.').reduce((o, k) => o?.[k], data) ?? '';
   });
@@ -207,10 +198,15 @@ const fillData = (e) => {
 
 const insertText = (e) => {
   const editor = editorRef.value;
-  editor.insertContent({
-    type: 'text',
-    text: e.varName
-  });
+  editor.insertContent(
+    {
+      type: 'text',
+      text: e.varName
+    },
+    {
+      updateSelection: false
+    }
+  );
 };
 onMounted(async () => {
   getPrintTemplate(route.query.templateId).then((e) => {
diff --git a/src/views/oa/crm/crmSupplierInfo/index.vue b/src/views/oa/crm/crmSupplierInfo/index.vue
new file mode 100644
index 0000000..ca24e6e
--- /dev/null
+++ b/src/views/oa/crm/crmSupplierInfo/index.vue
@@ -0,0 +1,611 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="mb-[10px]">
+                <el-card shadow="hover">
+                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
+                                    <el-form-item label="供应商名称" prop="supplierName">
+                                        <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="助记名称" prop="mnemonicName">
+                                        <el-input v-model="queryParams.mnemonicName" placeholder="请输入助记名称" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="供应商类型" prop="supplierType">
+                                        <el-select v-model="queryParams.supplierType" placeholder="请选择供应商类型" clearable >
+                                            <el-option v-for="dict in supplier_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                        </el-select>
+                                    </el-form-item>
+<!--                                    <el-form-item label="注册资本" prop="registeredCapital">
+                                        <el-input v-model="queryParams.registeredCapital" placeholder="请输入注册资本" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="成立日期" prop="establishmentDate">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.establishmentDate"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择成立日期"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="经营范围" prop="businessScope">
+                                        <el-input v-model="queryParams.businessScope" placeholder="请输入经营范围" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>-->
+                                    <el-form-item label="主营行业" prop="mainIndustry">
+                                        <el-input v-model="queryParams.mainIndustry" placeholder="请输入主营行业" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+<!--                                    <el-form-item label="法定代表人" prop="legalRepresentative">
+                                        <el-input v-model="queryParams.legalRepresentative" placeholder="请输入法定代表人" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>-->
+<!--                                    <el-form-item label="营业执照号码" prop="businessLicenseNumber">
+                                        <el-input v-model="queryParams.businessLicenseNumber" placeholder="请输入营业执照号码" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="税号" prop="taxNumber">
+                                        <el-input v-model="queryParams.taxNumber" placeholder="请输入税号" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="开户银行" prop="bankAccountOpening">
+                                        <el-input v-model="queryParams.bankAccountOpening" placeholder="请输入开户银行" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="银行账号" prop="bankNumber">
+                                        <el-input v-model="queryParams.bankNumber" placeholder="请输入银行账号" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>-->
+<!--                                    <el-form-item label="注册地址" prop="registeredAddress">
+                                        <el-input v-model="queryParams.registeredAddress" placeholder="请输入注册地址" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="经营地址" prop="businessAddress">
+                                        <el-input v-model="queryParams.businessAddress" placeholder="请输入经营地址" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>-->
+<!--                                    <el-form-item label="联系人" prop="contactPerson">
+                                        <el-input v-model="queryParams.contactPerson" placeholder="请输入联系人" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="联系电话" prop="contactPhone">
+                                        <el-input v-model="queryParams.contactPhone" placeholder="请输入联系电话" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="联系手机" prop="contactMobile">
+                                        <el-input v-model="queryParams.contactMobile" placeholder="请输入联系手机" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="联系邮箱" prop="contactEmail">
+                                        <el-input v-model="queryParams.contactEmail" placeholder="请输入联系邮箱" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="传真" prop="contactFax">
+                                        <el-input v-model="queryParams.contactFax" placeholder="请输入传真" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>-->
+                                    <!-- 注释掉不合理的搜索条件 -->
+                                    <!-- <el-form-item label="网址" prop="website">
+                                        <el-input v-model="queryParams.website" placeholder="请输入网址" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item> -->
+                                    <!-- <el-form-item label="详细地址" prop="detailedAddress">
+                                        <el-input v-model="queryParams.detailedAddress" placeholder="请输入详细地址" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item> -->
+                                    <!-- <el-form-item label="附件ID" prop="ossId">
+                                        <el-input v-model="queryParams.ossId" placeholder="请输入附件ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item> -->
+                                    <el-form-item label="激活标识" prop="activeFlag">
+                                        <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                                            <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                        </el-select>
+                                    </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+            </div>
+        </transition>
+
+        <el-card shadow="never">
+            <template #header>
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/crm:crmSupplierInfo:add']">新增</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/crm:crmSupplierInfo:edit']">修改</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/crm:crmSupplierInfo:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:crmSupplierInfo:export']">导出</el-button>
+                    </el-col>
+                    <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+                </el-row>
+            </template>
+
+            <el-table v-loading="loading" border :data="crmSupplierInfoList" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column label="供应商ID" align="center" prop="supplierId" v-if="columns[0].visible"/>
+                        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[2].visible"/>
+                        <el-table-column label="助记名称" align="center" prop="mnemonicName" v-if="columns[3].visible"/>
+                        <el-table-column label="供应商类型" align="center" prop="supplierType" v-if="columns[4].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="supplier_type" :value="scope.row.supplierType"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="注册资本" align="center" prop="registeredCapital" v-if="columns[5].visible"/>
+                        <el-table-column label="成立日期" align="center" prop="establishmentDate" width="180" v-if="columns[6].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.establishmentDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="经营范围" align="center" prop="businessScope" v-if="columns[7].visible"/>
+                        <el-table-column label="主营行业" align="center" prop="mainIndustry" v-if="columns[8].visible"/>
+                        <el-table-column label="法定代表人" align="center" prop="legalRepresentative" v-if="columns[9].visible"/>
+                        <el-table-column label="营业执照号码" align="center" prop="businessLicenseNumber" v-if="columns[10].visible"/>
+                        <el-table-column label="税号" align="center" prop="taxNumber" v-if="columns[11].visible"/>
+                        <el-table-column label="开户银行" align="center" prop="bankAccountOpening" v-if="columns[12].visible"/>
+                        <el-table-column label="银行账号" align="center" prop="bankNumber" v-if="columns[13].visible"/>
+                        <el-table-column label="注册地址" align="center" prop="registeredAddress" v-if="columns[14].visible"/>
+                        <el-table-column label="经营地址" align="center" prop="businessAddress" v-if="columns[15].visible"/>
+                        <el-table-column label="联系人" align="center" prop="contactPerson" v-if="columns[16].visible"/>
+                        <el-table-column label="联系电话" align="center" prop="contactPhone" v-if="columns[17].visible"/>
+                        <el-table-column label="联系手机" align="center" prop="contactMobile" v-if="columns[18].visible"/>
+                        <el-table-column label="联系邮箱" align="center" prop="contactEmail" v-if="columns[19].visible"/>
+                        <el-table-column label="传真" align="center" prop="contactFax" v-if="columns[20].visible"/>
+                        <el-table-column label="网址" align="center" prop="website" v-if="columns[21].visible"/>
+                        <el-table-column label="归属人员" align="center" prop="ownerName" v-if="columns[22].visible"/>
+                        <el-table-column label="详细地址" align="center" prop="detailedAddress" v-if="columns[23].visible"/>
+                        <el-table-column label="附件ID" align="center" prop="ossId" v-if="columns[24].visible"/>
+                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[25].visible"/>
+                        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[26].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+                            </template>
+                        </el-table-column>
+                <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-tooltip content="修改" placement="top">
+                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:crmSupplierInfo:edit']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="删除" placement="top">
+                            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/crm:crmSupplierInfo:remove']"></el-button>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+        <!-- 添加或修改供应商信息对话框 -->
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="760px" append-to-body>
+            <el-form ref="crmSupplierInfoFormRef" :model="form" :rules="rules" label-width="110px" class="supplier-form">
+                <el-card shadow="never" class="mb-12" body-class="pb-2">
+                    <template #header>
+                        <span class="section-title">基础信息</span>
+                    </template>
+                    <el-row :gutter="16">
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="供应商名称" prop="supplierName">
+                                <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="助记名称" prop="mnemonicName">
+                                <el-input v-model="form.mnemonicName" placeholder="请输入助记名称" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="供应商类型" prop="supplierType">
+                                <el-select v-model="form.supplierType" placeholder="请选择供应商类型">
+                                    <el-option
+                                        v-for="dict in supplier_type"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                    />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="成立日期" prop="establishmentDate">
+                                <el-date-picker
+                                    v-model="form.establishmentDate"
+                                    type="date"
+                                    value-format="YYYY-MM-DD"
+                                    placeholder="请选择成立日期"
+                                    clearable
+                                />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="主营行业" prop="mainIndustry">
+                                <el-input v-model="form.mainIndustry" placeholder="请输入主营行业" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="注册资本" prop="registeredCapital">
+                                <el-input v-model="form.registeredCapital" placeholder="请输入注册资本" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="24">
+                            <el-form-item label="经营范围" prop="businessScope">
+                                <el-input v-model="form.businessScope" placeholder="请输入经营范围" maxlength="500" show-word-limit type="textarea" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+
+                <el-card shadow="never" class="mb-12" body-class="pb-2">
+                    <template #header>
+                        <span class="section-title">联系方式</span>
+                    </template>
+                    <el-row :gutter="16">
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="联系人" prop="contactPerson">
+                                <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="联系电话" prop="contactPhone">
+                                <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="联系手机" prop="contactMobile">
+                                <el-input v-model="form.contactMobile" placeholder="请输入联系手机" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="联系邮箱" prop="contactEmail">
+                                <el-input v-model="form.contactEmail" placeholder="请输入联系邮箱" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="传真" prop="contactFax">
+                                <el-input v-model="form.contactFax" placeholder="请输入传真" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="网址" prop="website">
+                                <el-input v-model="form.website" placeholder="请输入网址" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="24">
+                            <el-form-item label="归属人员" prop="ownerId">
+                                <el-select v-model="form.ownerId" placeholder="请选择归属人员" clearable filterable>
+                                    <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+
+                <el-card shadow="never" class="mb-12" body-class="pb-2">
+                    <template #header>
+                        <span class="section-title">办公与财务信息</span>
+                    </template>
+                    <el-row :gutter="16">
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="法定代表人" prop="legalRepresentative">
+                                <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="营业执照号码" prop="businessLicenseNumber">
+                                <el-input v-model="form.businessLicenseNumber" placeholder="请输入营业执照号码" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="税号" prop="taxNumber">
+                                <el-input v-model="form.taxNumber" placeholder="请输入税号" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="开户银行" prop="bankAccountOpening">
+                                <el-input v-model="form.bankAccountOpening" placeholder="请输入开户银行" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="银行账号" prop="bankNumber">
+                                <el-input v-model="form.bankNumber" placeholder="请输入银行账号" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="注册地址" prop="registeredAddress">
+                                <el-input v-model="form.registeredAddress" type="textarea" placeholder="请输入注册地址" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="经营地址" prop="businessAddress">
+                                <el-input v-model="form.businessAddress" type="textarea" placeholder="请输入经营地址" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+
+                <el-card shadow="never" body-class="pb-2">
+                    <template #header>
+                        <span class="section-title">附件与其他</span>
+                    </template>
+                    <el-row :gutter="16">
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="附件" prop="ossId">
+                                <FileUpload v-model="form.ossId" :limit="1" :is-show-tip="true" :file-size="10" />
+                                <span class="upload-tip">仅支持单文件上传，大小不超过10MB</span>
+                                <div v-if="form.attachmentList?.length" class="mt-2">
+                                    <el-tag
+                                        v-for="item in form.attachmentList"
+                                        :key="item.ossId"
+                                        size="small"
+                                        class="mr-2 mb-2"
+                                    >
+                                        <el-link :href="item.url" target="_blank" type="primary">
+                                            {{ item.originalName || item.name }}
+                                        </el-link>
+                                    </el-tag>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="12" :sm="24">
+                            <el-form-item label="激活标识" prop="activeFlag">
+                                <el-radio-group v-model="form.activeFlag">
+                                    <el-radio
+                                        v-for="dict in active_flag"
+                                        :key="dict.value"
+                                        :value="dict.value"
+                                    >{{ dict.label }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :md="24">
+                            <el-form-item label="备注" prop="remark">
+                                <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="300" show-word-limit />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="CrmSupplierInfo" lang="ts">
+    import { listCrmSupplierInfo, getCrmSupplierInfo, delCrmSupplierInfo, addCrmSupplierInfo, updateCrmSupplierInfo } from '@/api/oa/crm/crmSupplierInfo';
+    import { CrmSupplierInfoVO, CrmSupplierInfoQuery, CrmSupplierInfoForm } from '@/api/oa/crm/crmSupplierInfo/types';
+    import { listUser } from '@/api/system/user';
+    import { UserVO } from '@/api/system/user/types';
+    import FileUpload from '@/components/FileUpload/index.vue';
+
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+        const { active_flag, supplier_type } = toRefs<any>(proxy?.useDict('active_flag', 'supplier_type'));
+
+    const crmSupplierInfoList = ref<CrmSupplierInfoVO[]>([]);
+    const userList = ref<UserVO[]>([]);
+    const buttonLoading = ref(false);
+    const loading = ref(true);
+    const showSearch = ref(true);
+    const ids = ref<Array<string | number>>([]);
+    const single = ref(true);
+    const multiple = ref(true);
+    const total = ref(0);
+
+    const queryFormRef = ref<ElFormInstance>();
+    const crmSupplierInfoFormRef = ref<ElFormInstance>();
+
+    const dialog = reactive<DialogOption>({
+        visible: false,
+        title: ''
+    });
+
+    // 列显隐信息
+    const columns = ref<FieldOption[]>([
+            { key: 0, label: `供应商ID`, visible: false },
+            { key: 1, label: `租户编号`, visible: false },
+            { key: 2, label: `供应商名称`, visible: true },
+            { key: 3, label: `助记名称`, visible: true },
+            { key: 4, label: `供应商类型`, visible: true },
+            { key: 5, label: `注册资本`, visible: false },
+            { key: 6, label: `成立日期`, visible: false },
+            { key: 7, label: `经营范围`, visible: false },
+            { key: 8, label: `主营行业`, visible: true },
+            { key: 9, label: `法定代表人`, visible: false },
+            { key: 10, label: `营业执照号码`, visible: false },
+            { key: 11, label: `税号`, visible: false },
+            { key: 12, label: `开户银行`, visible: false },
+            { key: 13, label: `银行账号`, visible: false },
+            { key: 14, label: `注册地址`, visible: false },
+            { key: 15, label: `经营地址`, visible: false },
+            { key: 16, label: `联系人`, visible: false },
+            { key: 17, label: `联系电话`, visible: false },
+            { key: 18, label: `联系手机`, visible: false },
+            { key: 19, label: `联系邮箱`, visible: false },
+            { key: 20, label: `传真`, visible: false },
+            { key: 21, label: `网址`, visible: false },
+            { key: 22, label: `归属人员`, visible: true },
+            { key: 23, label: `详细地址`, visible: false },
+            { key: 24, label: `附件ID`, visible: false },
+            { key: 25, label: `备注`, visible: true },
+            { key: 26, label: `激活标识`, visible: true },
+            { key: 27, label: `删除标志`, visible: false },
+            { key: 28, label: `创建部门`, visible: false },
+            { key: 29, label: `创建人`, visible: false },
+            { key: 30, label: `创建时间`, visible: false },
+            { key: 31, label: `更新人`, visible: false },
+            { key: 32, label: `更新时间`, visible: false },
+    ]);
+
+    const initFormData: CrmSupplierInfoForm = {
+                        supplierId: undefined,
+                        supplierName: undefined,
+                        mnemonicName: undefined,
+                        supplierType: undefined,
+                        registeredCapital: undefined,
+                        establishmentDate: undefined,
+                        businessScope: undefined,
+                        mainIndustry: undefined,
+                        legalRepresentative: undefined,
+                        businessLicenseNumber: undefined,
+                        taxNumber: undefined,
+                        bankAccountOpening: undefined,
+                        bankNumber: undefined,
+                        registeredAddress: undefined,
+                        businessAddress: undefined,
+                        contactPerson: undefined,
+                        contactPhone: undefined,
+                        contactMobile: undefined,
+                        contactEmail: undefined,
+                        contactFax: undefined,
+                        website: undefined,
+                        ownerId: undefined,
+                        detailedAddress: undefined,
+                        ossId: undefined,
+                        remark: undefined,
+                        activeFlag: undefined,
+    }
+    const data = reactive<PageData<CrmSupplierInfoForm, CrmSupplierInfoQuery>>({
+        form: {...initFormData},
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+                            supplierName: undefined,
+                            mnemonicName: undefined,
+                            supplierType: undefined,
+                            registeredCapital: undefined,
+                            establishmentDate: undefined,
+                            businessScope: undefined,
+                            mainIndustry: undefined,
+                            legalRepresentative: undefined,
+                            businessLicenseNumber: undefined,
+                            taxNumber: undefined,
+                            bankAccountOpening: undefined,
+                            bankNumber: undefined,
+                            registeredAddress: undefined,
+                            businessAddress: undefined,
+                            contactPerson: undefined,
+                            contactPhone: undefined,
+                            contactMobile: undefined,
+                            contactEmail: undefined,
+                            contactFax: undefined,
+                            website: undefined,
+                            ownerId: undefined,
+                            detailedAddress: undefined,
+                            ossId: undefined,
+                            activeFlag: undefined,
+            params: {
+            }
+        },
+        rules: {
+                            supplierName: [
+                            { required: true, message: "供应商名称不能为空", trigger: "blur" }
+                        ],
+                            mnemonicName: [
+                            { required: true, message: "助记名称不能为空", trigger: "blur" }
+                        ],
+                            supplierType: [
+                            { required: true, message: "供应商类型不能为空", trigger: "change" }
+                        ],
+                            mainIndustry: [
+                            { required: true, message: "主营行业不能为空", trigger: "blur" }
+                        ]
+        }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询供应商信息列表 */
+    const getList = async () => {
+        loading.value = true;
+        const res = await listCrmSupplierInfo(queryParams.value);
+            crmSupplierInfoList.value = res.rows;
+        total.value = res.total;
+        loading.value = false;
+    }
+
+    /** 获取用户列表 */
+    const getUserList = async () => {
+        const res = await listUser({ pageNum: 1, pageSize: 1000 });
+        userList.value = res.rows;
+    }
+
+    /** 取消按钮 */
+    const cancel = () => {
+        reset();
+        dialog.visible = false;
+    }
+
+    /** 表单重置 */
+    const reset = () => {
+        form.value = {...initFormData};
+            crmSupplierInfoFormRef.value?.resetFields();
+    }
+
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        queryFormRef.value?.resetFields();
+        handleQuery();
+    }
+
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: CrmSupplierInfoVO[]) => {
+        ids.value = selection.map(item => item.supplierId);
+        single.value = selection.length != 1;
+        multiple.value = !selection.length;
+    }
+
+    /** 新增按钮操作 */
+    const handleAdd = () => {
+        reset();
+        form.value.activeFlag = '1';
+        dialog.visible = true;
+        dialog.title = "添加供应商信息";
+    }
+
+    /** 修改按钮操作 */
+    const handleUpdate = async (row?: CrmSupplierInfoVO) => {
+        reset();
+        const _supplierId = row?.supplierId || ids.value[0]
+        const res = await getCrmSupplierInfo(_supplierId);
+        Object.assign(form.value, res.data);
+        dialog.visible = true;
+        dialog.title = "修改供应商信息";
+    }
+
+    /** 提交按钮 */
+    const submitForm = () => {
+            crmSupplierInfoFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                buttonLoading.value = true;
+                if (form.value.supplierId) {
+                    await updateCrmSupplierInfo(form.value).finally(() =>  buttonLoading.value = false);
+                } else {
+                    await addCrmSupplierInfo(form.value).finally(() =>  buttonLoading.value = false);
+                }
+                proxy?.$modal.msgSuccess("操作成功");
+                dialog.visible = false;
+                await getList();
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: CrmSupplierInfoVO) => {
+        const _supplierIds = row?.supplierId || ids.value;
+        await proxy?.$modal.confirm('是否确认删除供应商信息编号为"' + _supplierIds + '"的数据项？').finally(() => loading.value = false);
+        await delCrmSupplierInfo(_supplierIds);
+        proxy?.$modal.msgSuccess("删除成功");
+        await getList();
+    }
+
+    /** 导出按钮操作 */
+    const handleExport = () => {
+        proxy?.download('oa/crm/crmSupplierInfo/export', {
+            ...queryParams.value
+        }, `crmSupplierInfo_${new Date().getTime()}.xlsx`)
+    }
+
+    onMounted(() => {
+        getList();
+        getUserList();
+    });
+</script>
diff --git a/src/views/oa/crm/customerContact/index.vue b/src/views/oa/crm/customerContact/index.vue
index 28537f5..6f2cfc1 100644
--- a/src/views/oa/crm/customerContact/index.vue
+++ b/src/views/oa/crm/customerContact/index.vue
@@ -3,38 +3,33 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='80px'>
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="80px">
             <el-form-item label="所属客户" prop="customerId">
-              <el-select v-model="queryParams.customerId" placeholder="请选择所属客户" filterable clearable @keyup.enter="handleQuery" >
-                <el-option
-                  v-for="item in customerInfoList"
-                  :key="item.customerId"
-                  :label="item.customerName"
-                  :value="item.customerId"
-                />
+              <el-select v-model="queryParams.customerId" placeholder="请选择所属客户" filterable clearable @keyup.enter="handleQuery">
+                <el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
               </el-select>
             </el-form-item>
-            <el-form-item label="联系人姓名" prop="contactName" label-width='100px'>
+            <el-form-item label="联系人姓名" prop="contactName" label-width="100px">
               <el-input v-model="queryParams.contactName" placeholder="请输入联系人姓名" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-<!--            <el-form-item label="尊称" prop="sexType">-->
-<!--              <el-select v-model="queryParams.sexType" placeholder="请选择尊称" clearable>-->
-<!--                <el-option v-for="dict in sex_type" :key="dict.value" :label="dict.label" :value="dict.value" />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
+            <!--            <el-form-item label="尊称" prop="sexType">-->
+            <!--              <el-select v-model="queryParams.sexType" placeholder="请选择尊称" clearable>-->
+            <!--                <el-option v-for="dict in sex_type" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
             <el-form-item label="角色" prop="roleType">
               <el-select v-model="queryParams.roleType" placeholder="请选择角色" clearable>
                 <el-option v-for="dict in role_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="是否首要联系人" prop="firstFlag" label-width='110px'>
+            <el-form-item label="是否首要联系人" prop="firstFlag" label-width="110px">
               <el-select v-model="queryParams.firstFlag" placeholder="请选择是否首要联系人" clearable>
                 <el-option v-for="dict in first_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-<!--            <el-form-item label="激活标识" prop="activeFlag">-->
-<!--              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />-->
-<!--            </el-form-item>-->
+            <!--            <el-form-item label="激活标识" prop="activeFlag">-->
+            <!--              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -101,9 +96,9 @@
         <el-table-column label="微信账号" align="center" prop="wechatAccount" v-if="columns[14].visible" />
         <el-table-column label="QQ号码" align="center" prop="qqNumber" v-if="columns[15].visible" />
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[16].visible" />
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[17].visible" >
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[17].visible">
           <template #default="scope">
-            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
@@ -131,12 +126,7 @@
       <el-form ref="customerContactFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="所属客户" prop="customerId">
           <el-select v-model="form.customerId" placeholder="请选择所属客户" filterable clearable>
-            <el-option
-              v-for="item in customerInfoList"
-              :key="item.customerId"
-              :label="item.customerName"
-              :value="item.customerId"
-            />
+            <el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
           </el-select>
         </el-form-item>
         <el-form-item label="联系人姓名" prop="contactName">
@@ -158,8 +148,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="生日" prop="birthday">
-          <el-date-picker clearable v-model="form.birthday" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择生日">
-          </el-date-picker>
+          <el-date-picker clearable v-model="form.birthday" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择生日"> </el-date-picker>
         </el-form-item>
         <el-form-item label="部门职务" prop="departmentPosition">
           <el-input v-model="form.departmentPosition" placeholder="请输入部门职务" />
@@ -228,7 +217,7 @@ const dialog = reactive<DialogOption>({
 /** 查询客户信息下拉框结构 */
 const customerInfoList = ref([]);
 const getCustomerInfoListSelect = async () => {
-  let res = await getCrmCustomerInfoList(null);
+  let res = await getCrmCustomerInfoList({ ourCompanyFlag: '0'});
   customerInfoList.value = res.data;
 };
 
diff --git a/src/views/oa/crm/customerInfo/index.vue b/src/views/oa/crm/customerInfo/index.vue
index 7358421..3dd8320 100644
--- a/src/views/oa/crm/customerInfo/index.vue
+++ b/src/views/oa/crm/customerInfo/index.vue
@@ -70,57 +70,60 @@
 
       <el-table v-loading="loading" border :data="customerInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="客户ID" align="center" prop="customerId"  v-if="columns[0].visible"/>
-        <el-table-column label="客户名称" align="center" prop="customerName" width="120" v-if="columns[2].visible"/>
-        <el-table-column label="助记名称" align="center" prop="mnemonicName" v-if="columns[3].visible"/>
-        <el-table-column label="所属行业" align="center" prop="industryId" v-if="columns[4].visible">
+        <el-table-column label="客户ID" align="center" prop="customerId" width="80" v-if="columns[0].visible"/>
+        <el-table-column label="客户名称" align="center" prop="customerName" width="200" v-if="columns[2].visible" show-overflow-tooltip/>
+        <el-table-column label="助记名称" align="center" prop="mnemonicName" width="130" v-if="columns[3].visible" show-overflow-tooltip/>
+        <el-table-column label="所属行业" align="center" prop="industryId" width="110" v-if="columns[4].visible">
           <template #default="scope">
             <dict-tag :options="industry_id" :value="scope.row.industryId"/>
           </template>
         </el-table-column>
-        <el-table-column label="客户类型" align="center" prop="customerType" v-if="columns[5].visible">
+        <el-table-column label="客户类型" align="center" prop="customerType" width="110" v-if="columns[5].visible">
           <template #default="scope">
             <dict-tag :options="customer_type" :value="scope.row.customerType"/>
           </template>
         </el-table-column>
-        <el-table-column label="客户状态" align="center" prop="customerStatus" v-if="columns[6].visible">
+        <el-table-column label="客户状态" align="center" prop="customerStatus" width="120" v-if="columns[6].visible">
           <template #default="scope">
             <dict-tag :options="customer_status" :value="scope.row.customerStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="客户级别" align="center" prop="customerLevel" v-if="columns[7].visible">
+        <el-table-column label="客户级别" align="center" prop="customerLevel" width="110" v-if="columns[7].visible">
           <template #default="scope">
             <dict-tag :options="customer_level" :value="scope.row.customerLevel"/>
           </template>
         </el-table-column>
-        <el-table-column label="客户来源" align="center" prop="customerSource" v-if="columns[8].visible">
+        <el-table-column label="客户来源" align="center" prop="customerSource" width="130" v-if="columns[8].visible">
           <template #default="scope">
             <dict-tag :options="customer_source" :value="scope.row.customerSource"/>
           </template>
         </el-table-column>
-        <el-table-column label="归属人员" align="center" prop="ownerId" v-if="columns[9].visible"/>
-        <el-table-column label="详细地址" align="center" prop="detailedAddress" v-if="columns[10].visible"/>
-        <el-table-column label="企业规模" align="center" prop="customerScale" v-if="columns[11].visible">
+        <el-table-column label="客户经理" align="center" prop="ownerName" width="120" v-if="columns[9].visible" show-overflow-tooltip/>
+        <el-table-column label="详细地址" align="center" prop="detailedAddress" width="200" v-if="columns[10].visible" show-overflow-tooltip/>
+        <el-table-column label="企业规模" align="center" prop="customerScale" width="120" v-if="columns[11].visible">
           <template #default="scope">
             <dict-tag :options="customer_scale" :value="scope.row.customerScale"/>
           </template>
         </el-table-column>
-        <el-table-column label="下级客户" align="center" prop="parentCustomerId" v-if="columns[12].visible"/>
-        <el-table-column label="客户关系" align="center" prop="customerRelationship" v-if="columns[13].visible"/>
-        <el-table-column label="法定代表人" align="center" prop="legalRepresentative" width="120" v-if="columns[14].visible"/>
-        <el-table-column label="营业执照号码" align="center" prop="businessLicenseNumber" width="120" v-if="columns[15].visible"/>
-        <el-table-column label="税号" align="center" prop="taxNumber" v-if="columns[16].visible"/>
-        <el-table-column label="开户银行" align="center" prop="bankAccountOpening" v-if="columns[17].visible"/>
-        <el-table-column label="银行账号" align="center" prop="bankNumber" v-if="columns[18].visible"/>
-        <el-table-column label="附件ID" align="center" prop="ossId" v-if="columns[19].visible"/>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[20].visible"/>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[21].visible">
+        <el-table-column label="上级客户" align="center" prop="parentCustomerId" width="100" v-if="columns[12].visible"/>
+        <el-table-column label="客户关系" align="center" prop="customerRelationship" width="120" v-if="columns[13].visible" show-overflow-tooltip/>
+        <el-table-column label="法定代表人" align="center" prop="legalRepresentative" width="130" v-if="columns[14].visible" show-overflow-tooltip/>
+        <el-table-column label="营业执照号码" align="center" prop="businessLicenseNumber" width="150" v-if="columns[15].visible" show-overflow-tooltip/>
+        <el-table-column label="税号" align="center" prop="taxNumber" width="150" v-if="columns[16].visible" show-overflow-tooltip/>
+        <el-table-column label="开户银行" align="center" prop="bankAccountOpening" width="180" v-if="columns[17].visible" show-overflow-tooltip/>
+        <el-table-column label="银行账号" align="center" prop="bankNumber" width="180" v-if="columns[18].visible" show-overflow-tooltip/>
+        <el-table-column label="附件ID" align="center" prop="ossId" width="100" v-if="columns[19].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" width="200" v-if="columns[20].visible" show-overflow-tooltip/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" width="100" v-if="columns[21].visible">
           <template #default="scope">
             <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
           <template #default="scope">
+            <el-tooltip content="客户关系" placement="top">
+              <el-button link type="primary" icon="Connection" @click="handleViewRelation(scope.row)"></el-button>
+            </el-tooltip>
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:customerInfo:edit']"></el-button>
             </el-tooltip>
@@ -134,107 +137,203 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改客户信息对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
       <el-form ref="customerInfoFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-        </el-form-item>
-        <el-form-item label="助记名称" prop="mnemonicName">
-          <el-input v-model="form.mnemonicName" placeholder="请输入助记名称" />
-        </el-form-item>
-        <el-form-item label="所属行业" prop="industryId">
-          <el-select v-model="form.industryId" placeholder="请选择所属行业">
-            <el-option
-              v-for="dict in industry_id"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="客户类型" prop="customerType">
-          <el-select v-model="form.customerType" placeholder="请选择客户类型">
-            <el-option
-              v-for="dict in customer_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="客户状态" prop="customerStatus">
-          <el-select v-model="form.customerStatus" placeholder="请选择客户状态">
-            <el-option
-              v-for="dict in customer_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="客户级别" prop="customerLevel">
-          <el-select v-model="form.customerLevel" placeholder="请选择客户级别">
-            <el-option
-              v-for="dict in customer_level"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="客户来源" prop="customerSource">
-          <el-select v-model="form.customerSource" placeholder="请选择客户来源">
-            <el-option
-              v-for="dict in customer_source"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="归属人员" prop="ownerId">
-          <el-input v-model="form.ownerId" placeholder="请输入归属人员" />
-        </el-form-item>
-        <el-form-item label="详细地址" prop="detailedAddress">
-          <el-input v-model="form.detailedAddress" placeholder="请输入详细地址" />
-        </el-form-item>
-        <el-form-item label="企业规模" prop="customerScale">
-          <el-select v-model="form.customerScale" placeholder="请选择企业规模">
-            <el-option
-              v-for="dict in customer_scale"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="下级客户" prop="parentCustomerId">
-          <el-input v-model="form.parentCustomerId" placeholder="请输入下级客户" />
-        </el-form-item>
-        <el-form-item label="客户关系" prop="customerRelationship">
-          <el-input v-model="form.customerRelationship" placeholder="请输入客户关系" />
-        </el-form-item>
-        <el-form-item label="法定代表人" prop="legalRepresentative">
-          <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
-        </el-form-item>
-        <el-form-item label="营业执照号码" prop="businessLicenseNumber">
-          <el-input v-model="form.businessLicenseNumber" placeholder="请输入营业执照号码" />
-        </el-form-item>
-        <el-form-item label="税号" prop="taxNumber">
-          <el-input v-model="form.taxNumber" placeholder="请输入税号" />
-        </el-form-item>
-        <el-form-item label="开户银行" prop="bankAccountOpening">
-          <el-input v-model="form.bankAccountOpening" placeholder="请输入开户银行" />
-        </el-form-item>
-        <el-form-item label="银行账号" prop="bankNumber">
-          <el-input v-model="form.bankNumber" placeholder="请输入银行账号" />
-        </el-form-item>
-        <el-form-item label="附件ID" prop="ossId">
-          <el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户名称" prop="customerName">
+              <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="助记名称" prop="mnemonicName">
+              <el-input v-model="form.mnemonicName" placeholder="请输入助记名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所属行业" prop="industryId">
+              <el-select v-model="form.industryId" placeholder="请选择所属行业" style="width: 100%">
+                <el-option
+                  v-for="dict in industry_id"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户类型" prop="customerType">
+              <el-select v-model="form.customerType" placeholder="请选择客户类型" style="width: 100%">
+                <el-option
+                  v-for="dict in customer_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户状态" prop="customerStatus">
+              <el-select v-model="form.customerStatus" placeholder="请选择客户状态" style="width: 100%">
+                <el-option
+                  v-for="dict in customer_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户级别" prop="customerLevel">
+              <el-select v-model="form.customerLevel" placeholder="请选择客户级别" style="width: 100%">
+                <el-option
+                  v-for="dict in customer_level"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户来源" prop="customerSource">
+              <el-select v-model="form.customerSource" placeholder="请选择客户来源" style="width: 100%">
+                <el-option
+                  v-for="dict in customer_source"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户经理" prop="ownerId">
+              <el-select
+                v-model="form.ownerId"
+                placeholder="请选择客户经理"
+                filterable
+                remote
+                :remote-method="remoteUserMethod"
+                :loading="userLoading"
+                style="width: 100%"
+                clearable
+              >
+                <el-option
+                  v-for="user in userOptions"
+                  :key="user.userId"
+                  :label="user.nickName"
+                  :value="user.userId"
+                >
+                  <span style="float: left">{{ user.nickName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ user.userName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="详细地址" prop="detailedAddress">
+              <el-input v-model="form.detailedAddress" placeholder="请输入详细地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="企业规模" prop="customerScale">
+              <el-select v-model="form.customerScale" placeholder="请选择企业规模" style="width: 100%">
+                <el-option
+                  v-for="dict in customer_scale"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="上级客户" prop="parentCustomerId">
+              <el-select
+                v-model="form.parentCustomerId"
+                placeholder="请选择上级客户"
+                filterable
+                :loading="customerLoading"
+                style="width: 100%"
+                clearable
+              >
+                <el-option
+                  v-for="customer in customerOptions"
+                  :key="customer.customerId"
+                  :label="customer.customerName"
+                  :value="customer.customerId"
+                >
+                  <span style="float: left">{{ customer.customerName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ customer.mnemonicName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户关系" prop="customerRelationship">
+              <el-input v-model="form.customerRelationship" placeholder="请输入客户关系" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人" prop="legalRepresentative">
+              <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="营业执照号码" prop="businessLicenseNumber">
+              <el-input v-model="form.businessLicenseNumber" placeholder="请输入营业执照号码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="税号" prop="taxNumber">
+              <el-input v-model="form.taxNumber" placeholder="请输入税号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="开户银行" prop="bankAccountOpening">
+              <el-input v-model="form.bankAccountOpening" placeholder="请输入开户银行" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="银行账号" prop="bankNumber">
+              <el-input v-model="form.bankNumber" placeholder="请输入银行账号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="附件" prop="ossId">
+              <FileUpload v-model="ossIdString" :limit="5" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 <!--        <el-form-item label="激活标识" prop="activeFlag">-->
 <!--          <el-radio-group v-model="form.activeFlag">-->
 <!--            <el-radio-->
@@ -252,12 +351,163 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 客户关系查看对话框 -->
+    <el-dialog title="客户关系" v-model="relationDialog.visible" width="1000px" append-to-body>
+      <div v-loading="relationLoading">
+        <!-- 当前客户信息卡片 -->
+        <el-card shadow="hover" style="margin-bottom: 20px;">
+          <template #header>
+            <div style="display: flex; align-items: center; justify-content: space-between;">
+              <span style="font-size: 16px; font-weight: bold; color: #409EFF;">
+                当前客户
+              </span>
+            </div>
+          </template>
+          <el-descriptions :column="3" border>
+            <el-descriptions-item label="客户名称" :span="2">
+              <strong style="font-size: 16px; color: #303133;">{{ currentCustomer.customerName }}</strong>
+            </el-descriptions-item>
+            <el-descriptions-item label="助记名称">
+              {{ currentCustomer.mnemonicName || '-' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="客户类型">
+              <dict-tag :options="customer_type" :value="currentCustomer.customerType"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="客户状态">
+              <dict-tag :options="customer_status" :value="currentCustomer.customerStatus"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="客户级别">
+              <dict-tag :options="customer_level" :value="currentCustomer.customerLevel"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="客户经理">
+              {{ currentCustomer.ownerName || '-' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="所属行业">
+              <dict-tag :options="industry_id" :value="currentCustomer.industryId"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="企业规模">
+              <dict-tag :options="customer_scale" :value="currentCustomer.customerScale"/>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+
+        <!-- 客户关系结构 -->
+        <el-row :gutter="20">
+          <!-- 上级客户 -->
+          <el-col :span="12">
+            <el-card shadow="hover">
+              <template #header>
+                <div style="display: flex; align-items: center; justify-content: space-between;">
+                  <span style="font-size: 14px; font-weight: bold;">
+                    上级客户
+                  </span>
+                  <el-tag type="success" size="small">{{ parentCustomerList.length }} 个</el-tag>
+                </div>
+              </template>
+              <div v-if="parentCustomerList.length > 0">
+                <el-table :data="parentCustomerList" border size="small" max-height="400">
+                  <el-table-column label="客户名称" prop="customerName" min-width="150" show-overflow-tooltip>
+                    <template #default="scope">
+                      <el-link type="primary" @click="handleViewRelation(scope.row)" style="font-weight: 500;">
+                        {{ scope.row.customerName }}
+                      </el-link>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="助记名称" prop="mnemonicName" width="120" show-overflow-tooltip/>
+                  <el-table-column label="客户类型" prop="customerType" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_type" :value="scope.row.customerType"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="客户状态" prop="customerStatus" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_status" :value="scope.row.customerStatus"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="客户级别" prop="customerLevel" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_level" :value="scope.row.customerLevel"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="客户经理" prop="ownerName" width="100" show-overflow-tooltip/>
+                </el-table>
+              </div>
+              <el-empty v-else description="暂无上级客户" :image-size="60" style="padding: 40px 0;">
+                <el-text type="info" size="small">该客户没有上级客户</el-text>
+              </el-empty>
+            </el-card>
+          </el-col>
+
+          <!-- 下级客户 -->
+          <el-col :span="12">
+            <el-card shadow="hover">
+              <template #header>
+                <div style="display: flex; align-items: center; justify-content: space-between;">
+                  <span style="font-size: 14px; font-weight: bold;">
+                    下级客户
+                  </span>
+                  <el-tag type="warning" size="small">{{ childCustomerList.length }} 个</el-tag>
+                </div>
+              </template>
+              <div v-if="childCustomerList.length > 0">
+                <el-table :data="childCustomerList" border size="small" max-height="400">
+                  <el-table-column label="客户名称" prop="customerName" min-width="150" show-overflow-tooltip>
+                    <template #default="scope">
+                      <el-link type="primary" @click="handleViewRelation(scope.row)" style="font-weight: 500;">
+                        {{ scope.row.customerName }}
+                      </el-link>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="助记名称" prop="mnemonicName" width="120" show-overflow-tooltip/>
+                  <el-table-column label="客户类型" prop="customerType" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_type" :value="scope.row.customerType"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="客户状态" prop="customerStatus" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_status" :value="scope.row.customerStatus"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="客户级别" prop="customerLevel" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_level" :value="scope.row.customerLevel"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="客户经理" prop="ownerName" width="100" show-overflow-tooltip/>
+                </el-table>
+              </div>
+              <el-empty v-else description="暂无下级客户" :image-size="60" style="padding: 40px 0;">
+                <el-text type="info" size="small">该客户没有下级客户</el-text>
+              </el-empty>
+            </el-card>
+          </el-col>
+        </el-row>
+      </div>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="relationDialog.visible = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="CustomerInfo" lang="ts">
-import { listCustomerInfo, getCustomerInfo, delCustomerInfo, addCustomerInfo, updateCustomerInfo } from '@/api/oa/crm/customerInfo';
+import {
+  listCustomerInfo,
+  getCustomerInfo,
+  delCustomerInfo,
+  addCustomerInfo,
+  updateCustomerInfo,
+  getCrmCustomerInfoList
+} from '@/api/oa/crm/customerInfo';
 import { CustomerInfoVO, CustomerInfoQuery, CustomerInfoForm } from '@/api/oa/crm/customerInfo/types';
+import { listUser, optionSelect } from '@/api/system/user';
+import { UserVO } from '@/api/system/user/types';
+import FileUpload from '@/components/FileUpload/index.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { customer_type, active_flag, industry_id, customer_source, customer_scale, customer_status, customer_level } = toRefs<any>(proxy?.useDict('customer_type', 'active_flag', 'industry_id', 'customer_source', 'customer_scale', 'customer_status', 'customer_level'));
@@ -270,15 +520,41 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
+const userOptions = ref<UserVO[]>([]);
+const userLoading = ref(false);
+const customerOptions = ref<CustomerInfoVO[]>([]);
+const customerLoading = ref(false);
+const relationLoading = ref(false);
+const parentCustomerList = ref<CustomerInfoVO[]>([]);
+const childCustomerList = ref<CustomerInfoVO[]>([]);
+const currentCustomer = ref<CustomerInfoVO>({} as CustomerInfoVO);
 
 const queryFormRef = ref<ElFormInstance>();
 const customerInfoFormRef = ref<ElFormInstance>();
 
+// 附件ID字符串转换（用于FileUpload组件）
+const ossIdString = computed({
+  get: () => {
+    if (form.value.ossId === undefined || form.value.ossId === null) {
+      return '';
+    }
+    return String(form.value.ossId);
+  },
+  set: (val: string) => {
+    form.value.ossId = val || undefined;
+  }
+});
+
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
 
+const relationDialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
 // 列显隐信息
 const columns = ref<FieldOption[]>([
   { key: 0, label: `客户ID`, visible: false },
@@ -290,10 +566,10 @@ const columns = ref<FieldOption[]>([
   { key: 6, label: `客户状态`, visible: true },
   { key: 7, label: `客户级别`, visible: true },
   { key: 8, label: `客户来源`, visible: true },
-  { key: 9, label: `归属人员`, visible: true },
+  { key: 9, label: `客户经理`, visible: true },
   { key: 10, label: `详细地址`, visible: true },
   { key: 11, label: `企业规模`, visible: true },
-  { key: 12, label: `下级客户`, visible: true },
+  { key: 12, label: `上级客户`, visible: true },
   { key: 13, label: `客户关系`, visible: true },
   { key: 14, label: `法定代表人`, visible: true },
   { key: 15, label: `营业执照号码`, visible: true },
@@ -308,7 +584,7 @@ const columns = ref<FieldOption[]>([
   { key: 24, label: `创建人`, visible: false },
   { key: 25, label: `创建时间`, visible: false },
   { key: 26, label: `更新人`, visible: false },
-  { key: 27, label: `更新时间`, visible: false },
+  { key: 27, label: `更新时间`, visible: false }
 ]);
 
 const initFormData: CustomerInfoForm = {
@@ -333,6 +609,7 @@ const initFormData: CustomerInfoForm = {
   ossId: undefined,
   remark: undefined,
   activeFlag: undefined,
+  ourCompanyFlag: undefined,
 }
 const data = reactive<PageData<CustomerInfoForm, CustomerInfoQuery>>({
   form: {...initFormData},
@@ -358,6 +635,7 @@ const data = reactive<PageData<CustomerInfoForm, CustomerInfoQuery>>({
     bankNumber: undefined,
     ossId: undefined,
     activeFlag: undefined,
+    ourCompanyFlag: '0',
     params: {
     }
   },
@@ -386,6 +664,8 @@ const cancel = () => {
 const reset = () => {
   form.value = {...initFormData};
   customerInfoFormRef.value?.resetFields();
+  userOptions.value = [];
+  customerOptions.value = [];
 }
 
 /** 搜索按钮操作 */
@@ -407,9 +687,30 @@ const handleSelectionChange = (selection: CustomerInfoVO[]) => {
   multiple.value = !selection.length;
 }
 
+/** 加载客户列表 */
+const loadCustomerList = async () => {
+  customerLoading.value = true;
+  try {
+    const res = await getCrmCustomerInfoList(null);
+    // 过滤掉当前正在编辑的客户（避免选择自己作为上级）
+    const filteredList = res.data?.filter((customer: CustomerInfoVO) =>
+      customer.customerId !== form.value.customerId
+    ) || [];
+    customerOptions.value = filteredList;
+  } catch (error) {
+    console.error('加载客户列表失败:', error);
+    customerOptions.value = [];
+  } finally {
+    customerLoading.value = false;
+  }
+}
+
 /** 新增按钮操作 */
-const handleAdd = () => {
+const handleAdd = async () => {
   reset();
+  userOptions.value = [];
+  customerOptions.value = [];
+  await loadCustomerList();
   dialog.visible = true;
   dialog.title = "添加客户信息";
 }
@@ -420,10 +721,72 @@ const handleUpdate = async (row?: CustomerInfoVO) => {
   const _customerId = row?.customerId || ids.value[0]
   const res = await getCustomerInfo(_customerId);
   Object.assign(form.value, res.data);
+  // 加载客户列表
+  await loadCustomerList();
+  // 如果已选上级客户不在列表中（可能被过滤），需要单独加载
+  if (form.value.parentCustomerId) {
+    const exists = customerOptions.value.some(
+      (customer: CustomerInfoVO) => customer.customerId === form.value.parentCustomerId
+    );
+    if (!exists) {
+      try {
+        const customerRes = await getCustomerInfo(form.value.parentCustomerId);
+        if (customerRes.data) {
+          customerOptions.value.unshift(customerRes.data);
+        }
+      } catch (error) {
+        console.error('加载已选上级客户失败:', error);
+      }
+    }
+  }
+  // 加载已选用户信息
+  if (form.value.ownerId) {
+    await loadSelectedUser(form.value.ownerId);
+  }
   dialog.visible = true;
   dialog.title = "修改客户信息";
 }
 
+/** 加载已选用户信息 */
+const loadSelectedUser = async (userId: string | number) => {
+  try {
+    const res = await optionSelect([userId]);
+    if (res.data && res.data.length > 0) {
+      userOptions.value = res.data;
+    }
+  } catch (error) {
+    console.error('加载用户信息失败:', error);
+  }
+}
+
+/** 远程搜索用户 */
+const remoteUserMethod = async (query: string) => {
+  if (query) {
+    userLoading.value = true;
+    try {
+      const res = await listUser({
+        pageNum: 1,
+        pageSize: 20,
+        nickName: query,
+        status: '0'
+      });
+      userOptions.value = res.rows || [];
+    } catch (error) {
+      console.error('搜索用户失败:', error);
+      userOptions.value = [];
+    } finally {
+      userLoading.value = false;
+    }
+  } else {
+    userOptions.value = [];
+    // 如果有已选用户，加载已选用户信息
+    if (form.value.ownerId) {
+      await loadSelectedUser(form.value.ownerId);
+    }
+  }
+}
+
+
 /** 提交按钮 */
 const submitForm = () => {
   customerInfoFormRef.value?.validate(async (valid: boolean) => {
@@ -457,6 +820,44 @@ const handleExport = () => {
   }, `customerInfo_${new Date().getTime()}.xlsx`)
 }
 
+/** 查看客户关系 */
+const handleViewRelation = async (row: CustomerInfoVO) => {
+  relationLoading.value = true;
+  currentCustomer.value = row;
+  parentCustomerList.value = [];
+  childCustomerList.value = [];
+
+  try {
+    // 查询上级客户（如果有parentCustomerId）
+    if (row.parentCustomerId) {
+      try {
+        const parentRes = await getCustomerInfo(row.parentCustomerId);
+        if (parentRes.data) {
+          parentCustomerList.value = [parentRes.data];
+        }
+      } catch (error) {
+        console.error('查询上级客户失败:', error);
+      }
+    }
+
+    // 查询下级客户（parentCustomerId等于当前客户ID的客户）
+    const childRes = await getCrmCustomerInfoList({
+      parentCustomerId: row.customerId
+    });
+    // 统一使用 data 字段，如果返回的是 rows 则使用 rows
+    const childList = childRes.data || childRes.rows || [];
+    if (childList.length > 0) {
+      childCustomerList.value = childList;
+    }
+  } catch (error) {
+    console.error('查询客户关系失败:', error);
+    proxy?.$modal.msgError('查询客户关系失败');
+  } finally {
+    relationLoading.value = false;
+    relationDialog.visible = true;
+  }
+}
+
 onMounted(() => {
   getList();
 });
diff --git a/src/views/oa/crm/customerInfo/ourIndex.vue b/src/views/oa/crm/customerInfo/ourIndex.vue
new file mode 100644
index 0000000..6dd4008
--- /dev/null
+++ b/src/views/oa/crm/customerInfo/ourIndex.vue
@@ -0,0 +1,824 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="公司名称" prop="customerName">
+              <el-input v-model="queryParams.customerName" placeholder="请输入公司名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="助记名称" prop="mnemonicName">
+              <el-input v-model="queryParams.mnemonicName" placeholder="请输入助记名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="所属行业" prop="industryId">
+              <el-select v-model="queryParams.industryId" placeholder="请选择所属行业" clearable>
+                <el-option v-for="dict in industry_id" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="公司类型" prop="customerType">
+              <el-select v-model="queryParams.customerType" placeholder="请选择公司类型" clearable>
+                <el-option v-for="dict in customer_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="公司状态" prop="customerStatus">
+              <el-select v-model="queryParams.customerStatus" placeholder="请选择公司状态" clearable>
+                <el-option v-for="dict in customer_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="公司级别" prop="customerLevel">
+              <el-select v-model="queryParams.customerLevel" placeholder="请选择公司级别" clearable>
+                <el-option v-for="dict in customer_level" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="公司来源" prop="customerSource">
+              <el-select v-model="queryParams.customerSource" placeholder="请选择公司来源" clearable>
+                <el-option v-for="dict in customer_source" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="企业规模" prop="customerScale">
+              <el-select v-model="queryParams.customerScale" placeholder="请选择企业规模" clearable>
+                <el-option v-for="dict in customer_scale" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <!--      <template #header>-->
+      <!--        <el-row :gutter="10" class="mb8">-->
+      <!--          <el-col :span="1.5">-->
+      <!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/crm:customerInfo:add']">新增</el-button>-->
+      <!--          </el-col>-->
+      <!--          <el-col :span="1.5">-->
+      <!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/crm:customerInfo:edit']">修改</el-button>-->
+      <!--          </el-col>-->
+      <!--          <el-col :span="1.5">-->
+      <!--            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/crm:customerInfo:remove']">删除</el-button>-->
+      <!--          </el-col>-->
+      <!--          <el-col :span="1.5">-->
+      <!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:customerInfo:export']">导出</el-button>-->
+      <!--          </el-col>-->
+      <!--          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>-->
+      <!--        </el-row>-->
+      <!--      </template>-->
+
+      <el-table v-loading="loading" border :data="customerInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="公司ID" align="center" prop="customerId" width="80" v-if="columns[0].visible" />
+        <el-table-column label="公司名称" align="center" prop="customerName" width="200" v-if="columns[2].visible" show-overflow-tooltip />
+        <el-table-column label="助记名称" align="center" prop="mnemonicName" width="130" v-if="columns[3].visible" show-overflow-tooltip />
+        <el-table-column label="所属行业" align="center" prop="industryId" width="110" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="industry_id" :value="scope.row.industryId" />
+          </template>
+        </el-table-column>
+        <el-table-column label="公司类型" align="center" prop="customerType" width="110" v-if="columns[5].visible">
+          <template #default="scope">
+            <dict-tag :options="customer_type" :value="scope.row.customerType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="公司状态" align="center" prop="customerStatus" width="120" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="customer_status" :value="scope.row.customerStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="公司级别" align="center" prop="customerLevel" width="110" v-if="columns[7].visible">
+          <template #default="scope">
+            <dict-tag :options="customer_level" :value="scope.row.customerLevel" />
+          </template>
+        </el-table-column>
+        <el-table-column label="公司来源" align="center" prop="customerSource" width="130" v-if="columns[8].visible">
+          <template #default="scope">
+            <dict-tag :options="customer_source" :value="scope.row.customerSource" />
+          </template>
+        </el-table-column>
+        <el-table-column label="公司经理" align="center" prop="ownerName" width="120" v-if="columns[9].visible" show-overflow-tooltip />
+        <el-table-column label="详细地址" align="center" prop="detailedAddress" width="200" v-if="columns[10].visible" show-overflow-tooltip />
+        <el-table-column label="企业规模" align="center" prop="customerScale" width="120" v-if="columns[11].visible">
+          <template #default="scope">
+            <dict-tag :options="customer_scale" :value="scope.row.customerScale" />
+          </template>
+        </el-table-column>
+        <el-table-column label="上级公司" align="center" prop="parentCustomerId" width="100" v-if="columns[12].visible" />
+        <el-table-column label="公司关系" align="center" prop="customerRelationship" width="120" v-if="columns[13].visible" show-overflow-tooltip />
+        <el-table-column label="法定代表人" align="center" prop="legalRepresentative" width="130" v-if="columns[14].visible" show-overflow-tooltip />
+        <el-table-column
+          label="营业执照号码"
+          align="center"
+          prop="businessLicenseNumber"
+          width="150"
+          v-if="columns[15].visible"
+          show-overflow-tooltip
+        />
+        <el-table-column label="税号" align="center" prop="taxNumber" width="150" v-if="columns[16].visible" show-overflow-tooltip />
+        <el-table-column label="开户银行" align="center" prop="bankAccountOpening" width="180" v-if="columns[17].visible" show-overflow-tooltip />
+        <el-table-column label="银行账号" align="center" prop="bankNumber" width="180" v-if="columns[18].visible" show-overflow-tooltip />
+        <el-table-column label="附件ID" align="center" prop="ossId" width="100" v-if="columns[19].visible" />
+        <el-table-column label="备注" align="center" prop="remark" width="200" v-if="columns[20].visible" show-overflow-tooltip />
+        <el-table-column label="激活标识" align="center" prop="activeFlag" width="100" v-if="columns[21].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!--            <el-tooltip content="公司关系" placement="top">-->
+            <!--              <el-button link type="primary" icon="Connection" @click="handleViewRelation(scope.row)"></el-button>-->
+            <!--            </el-tooltip>-->
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:customerInfo:edit']"></el-button>
+            </el-tooltip>
+            <!--            <el-tooltip content="删除" placement="top">-->
+            <!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/crm:customerInfo:remove']"></el-button>-->
+            <!--            </el-tooltip>-->
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改公司信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
+      <el-form ref="customerInfoFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="公司名称" prop="customerName">
+              <el-input v-model="form.customerName" placeholder="请输入公司名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="助记名称" prop="mnemonicName">
+              <el-input v-model="form.mnemonicName" placeholder="请输入助记名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所属行业" prop="industryId">
+              <el-select v-model="form.industryId" placeholder="请选择所属行业" style="width: 100%">
+                <el-option v-for="dict in industry_id" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司类型" prop="customerType">
+              <el-select v-model="form.customerType" placeholder="请选择公司类型" style="width: 100%">
+                <el-option v-for="dict in customer_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="公司状态" prop="customerStatus">
+              <el-select v-model="form.customerStatus" placeholder="请选择公司状态" style="width: 100%">
+                <el-option v-for="dict in customer_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司级别" prop="customerLevel">
+              <el-select v-model="form.customerLevel" placeholder="请选择公司级别" style="width: 100%">
+                <el-option v-for="dict in customer_level" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="公司来源" prop="customerSource">
+              <el-select v-model="form.customerSource" placeholder="请选择公司来源" style="width: 100%">
+                <el-option v-for="dict in customer_source" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司经理" prop="ownerId">
+              <el-select
+                v-model="form.ownerId"
+                placeholder="请选择公司经理"
+                filterable
+                remote
+                :remote-method="remoteUserMethod"
+                :loading="userLoading"
+                style="width: 100%"
+                clearable
+              >
+                <el-option v-for="user in userOptions" :key="user.userId" :label="user.nickName" :value="user.userId">
+                  <span style="float: left">{{ user.nickName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ user.userName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="详细地址" prop="detailedAddress">
+              <el-input v-model="form.detailedAddress" placeholder="请输入详细地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="企业规模" prop="customerScale">
+              <el-select v-model="form.customerScale" placeholder="请选择企业规模" style="width: 100%">
+                <el-option v-for="dict in customer_scale" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="上级公司" prop="parentCustomerId">
+              <el-select
+                v-model="form.parentCustomerId"
+                placeholder="请选择上级公司"
+                filterable
+                :loading="customerLoading"
+                style="width: 100%"
+                clearable
+              >
+                <el-option v-for="customer in customerOptions" :key="customer.customerId" :label="customer.customerName" :value="customer.customerId">
+                  <span style="float: left">{{ customer.customerName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ customer.mnemonicName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="公司关系" prop="customerRelationship">
+              <el-input v-model="form.customerRelationship" placeholder="请输入公司关系" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人" prop="legalRepresentative">
+              <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="营业执照号码" prop="businessLicenseNumber">
+              <el-input v-model="form.businessLicenseNumber" placeholder="请输入营业执照号码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="税号" prop="taxNumber">
+              <el-input v-model="form.taxNumber" placeholder="请输入税号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="开户银行" prop="bankAccountOpening">
+              <el-input v-model="form.bankAccountOpening" placeholder="请输入开户银行" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="银行账号" prop="bankNumber">
+              <el-input v-model="form.bankNumber" placeholder="请输入银行账号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="附件" prop="ossId">
+              <FileUpload v-model="ossIdString" :limit="5" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!--        <el-form-item label="激活标识" prop="activeFlag">-->
+        <!--          <el-radio-group v-model="form.activeFlag">-->
+        <!--            <el-radio-->
+        <!--              v-for="dict in active_flag"-->
+        <!--              :key="dict.value"-->
+        <!--              :value="dict.value"-->
+        <!--            >{{dict.label}}</el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 公司关系查看对话框 -->
+    <el-dialog title="公司关系" v-model="relationDialog.visible" width="1000px" append-to-body>
+      <div v-loading="relationLoading">
+        <!-- 当前公司信息卡片 -->
+        <el-card shadow="hover" style="margin-bottom: 20px">
+          <template #header>
+            <div style="display: flex; align-items: center; justify-content: space-between">
+              <span style="font-size: 16px; font-weight: bold; color: #409eff"> 当前公司 </span>
+            </div>
+          </template>
+          <el-descriptions :column="3" border>
+            <el-descriptions-item label="公司名称" :span="2">
+              <strong style="font-size: 16px; color: #303133">{{ currentCustomer.customerName }}</strong>
+            </el-descriptions-item>
+            <el-descriptions-item label="助记名称">
+              {{ currentCustomer.mnemonicName || '-' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="公司类型">
+              <dict-tag :options="customer_type" :value="currentCustomer.customerType" />
+            </el-descriptions-item>
+            <el-descriptions-item label="公司状态">
+              <dict-tag :options="customer_status" :value="currentCustomer.customerStatus" />
+            </el-descriptions-item>
+            <el-descriptions-item label="公司级别">
+              <dict-tag :options="customer_level" :value="currentCustomer.customerLevel" />
+            </el-descriptions-item>
+            <el-descriptions-item label="公司经理">
+              {{ currentCustomer.ownerName || '-' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="所属行业">
+              <dict-tag :options="industry_id" :value="currentCustomer.industryId" />
+            </el-descriptions-item>
+            <el-descriptions-item label="企业规模">
+              <dict-tag :options="customer_scale" :value="currentCustomer.customerScale" />
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+
+        <!-- 公司关系结构 -->
+        <el-row :gutter="20">
+          <!-- 上级公司 -->
+          <el-col :span="12">
+            <el-card shadow="hover">
+              <template #header>
+                <div style="display: flex; align-items: center; justify-content: space-between">
+                  <span style="font-size: 14px; font-weight: bold"> 上级公司 </span>
+                  <el-tag type="success" size="small">{{ parentCustomerList.length }} 个</el-tag>
+                </div>
+              </template>
+              <div v-if="parentCustomerList.length > 0">
+                <el-table :data="parentCustomerList" border size="small" max-height="400">
+                  <el-table-column label="公司名称" prop="customerName" min-width="150" show-overflow-tooltip>
+                    <template #default="scope">
+                      <el-link type="primary" @click="handleViewRelation(scope.row)" style="font-weight: 500">
+                        {{ scope.row.customerName }}
+                      </el-link>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="助记名称" prop="mnemonicName" width="120" show-overflow-tooltip />
+                  <el-table-column label="公司类型" prop="customerType" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_type" :value="scope.row.customerType" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="公司状态" prop="customerStatus" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_status" :value="scope.row.customerStatus" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="公司级别" prop="customerLevel" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_level" :value="scope.row.customerLevel" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="公司经理" prop="ownerName" width="100" show-overflow-tooltip />
+                </el-table>
+              </div>
+              <el-empty v-else description="暂无上级公司" :image-size="60" style="padding: 40px 0">
+                <el-text type="info" size="small">该公司没有上级公司</el-text>
+              </el-empty>
+            </el-card>
+          </el-col>
+
+          <!-- 下级公司 -->
+          <el-col :span="12">
+            <el-card shadow="hover">
+              <template #header>
+                <div style="display: flex; align-items: center; justify-content: space-between">
+                  <span style="font-size: 14px; font-weight: bold"> 下级公司 </span>
+                  <el-tag type="warning" size="small">{{ childCustomerList.length }} 个</el-tag>
+                </div>
+              </template>
+              <div v-if="childCustomerList.length > 0">
+                <el-table :data="childCustomerList" border size="small" max-height="400">
+                  <el-table-column label="公司名称" prop="customerName" min-width="150" show-overflow-tooltip>
+                    <template #default="scope">
+                      <el-link type="primary" @click="handleViewRelation(scope.row)" style="font-weight: 500">
+                        {{ scope.row.customerName }}
+                      </el-link>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="助记名称" prop="mnemonicName" width="120" show-overflow-tooltip />
+                  <el-table-column label="公司类型" prop="customerType" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_type" :value="scope.row.customerType" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="公司状态" prop="customerStatus" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_status" :value="scope.row.customerStatus" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="公司级别" prop="customerLevel" width="100">
+                    <template #default="scope">
+                      <dict-tag :options="customer_level" :value="scope.row.customerLevel" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="公司经理" prop="ownerName" width="100" show-overflow-tooltip />
+                </el-table>
+              </div>
+              <el-empty v-else description="暂无下级公司" :image-size="60" style="padding: 40px 0">
+                <el-text type="info" size="small">该公司没有下级公司</el-text>
+              </el-empty>
+            </el-card>
+          </el-col>
+        </el-row>
+      </div>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="relationDialog.visible = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="CustomerInfo" lang="ts">
+import {
+  listCustomerInfo,
+  getCustomerInfo,
+  delCustomerInfo,
+  addCustomerInfo,
+  updateCustomerInfo,
+  getCrmCustomerInfoList
+} from '@/api/oa/crm/customerInfo';
+import { CustomerInfoVO, CustomerInfoQuery, CustomerInfoForm } from '@/api/oa/crm/customerInfo/types';
+import { listUser, optionSelect } from '@/api/system/user';
+import { UserVO } from '@/api/system/user/types';
+import FileUpload from '@/components/FileUpload/index.vue';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { customer_type, active_flag, industry_id, customer_source, customer_scale, customer_status, customer_level } = toRefs<any>(
+  proxy?.useDict('customer_type', 'active_flag', 'industry_id', 'customer_source', 'customer_scale', 'customer_status', 'customer_level')
+);
+
+const customerInfoList = ref<CustomerInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(false);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const userOptions = ref<UserVO[]>([]);
+const userLoading = ref(false);
+const customerOptions = ref<CustomerInfoVO[]>([]);
+const customerLoading = ref(false);
+const relationLoading = ref(false);
+const parentCustomerList = ref<CustomerInfoVO[]>([]);
+const childCustomerList = ref<CustomerInfoVO[]>([]);
+const currentCustomer = ref<CustomerInfoVO>({} as CustomerInfoVO);
+
+const queryFormRef = ref<ElFormInstance>();
+const customerInfoFormRef = ref<ElFormInstance>();
+
+// 附件ID字符串转换（用于FileUpload组件）
+const ossIdString = computed({
+  get: () => {
+    if (form.value.ossId === undefined || form.value.ossId === null) {
+      return '';
+    }
+    return String(form.value.ossId);
+  },
+  set: (val: string) => {
+    form.value.ossId = val || undefined;
+  }
+});
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const relationDialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `公司ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `公司名称`, visible: true },
+  { key: 3, label: `助记名称`, visible: true },
+  { key: 4, label: `所属行业`, visible: true },
+  { key: 5, label: `公司类型`, visible: true },
+  { key: 6, label: `公司状态`, visible: true },
+  { key: 7, label: `公司级别`, visible: true },
+  { key: 8, label: `公司来源`, visible: true },
+  { key: 9, label: `公司经理`, visible: true },
+  { key: 10, label: `详细地址`, visible: true },
+  { key: 11, label: `企业规模`, visible: true },
+  { key: 12, label: `上级公司`, visible: true },
+  { key: 13, label: `公司关系`, visible: true },
+  { key: 14, label: `法定代表人`, visible: true },
+  { key: 15, label: `营业执照号码`, visible: true },
+  { key: 16, label: `税号`, visible: true },
+  { key: 17, label: `开户银行`, visible: true },
+  { key: 18, label: `银行账号`, visible: true },
+  { key: 19, label: `附件ID`, visible: false },
+  { key: 20, label: `备注`, visible: false },
+  { key: 21, label: `激活标识`, visible: false },
+  { key: 22, label: `删除标志`, visible: false },
+  { key: 23, label: `创建部门`, visible: false },
+  { key: 24, label: `创建人`, visible: false },
+  { key: 25, label: `创建时间`, visible: false },
+  { key: 26, label: `更新人`, visible: false },
+  { key: 27, label: `更新时间`, visible: false }
+]);
+
+const initFormData: CustomerInfoForm = {
+  customerId: undefined,
+  customerName: undefined,
+  mnemonicName: undefined,
+  industryId: undefined,
+  customerType: undefined,
+  customerStatus: undefined,
+  customerLevel: undefined,
+  customerSource: undefined,
+  ownerId: undefined,
+  detailedAddress: undefined,
+  customerScale: undefined,
+  parentCustomerId: undefined,
+  customerRelationship: undefined,
+  legalRepresentative: undefined,
+  businessLicenseNumber: undefined,
+  taxNumber: undefined,
+  bankAccountOpening: undefined,
+  bankNumber: undefined,
+  ossId: undefined,
+  remark: undefined,
+  activeFlag: undefined,
+  ourCompanyFlag: undefined
+};
+const data = reactive<PageData<CustomerInfoForm, CustomerInfoQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    customerName: undefined,
+    mnemonicName: undefined,
+    industryId: undefined,
+    customerType: undefined,
+    customerStatus: undefined,
+    customerLevel: undefined,
+    customerSource: undefined,
+    ownerId: undefined,
+    detailedAddress: undefined,
+    customerScale: undefined,
+    parentCustomerId: undefined,
+    customerRelationship: undefined,
+    legalRepresentative: undefined,
+    businessLicenseNumber: undefined,
+    taxNumber: undefined,
+    bankAccountOpening: undefined,
+    bankNumber: undefined,
+    ossId: undefined,
+    activeFlag: undefined,
+    ourCompanyFlag: '1',
+    params: {}
+  },
+  rules: {}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询公司信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listCustomerInfo(queryParams.value);
+  customerInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  customerInfoFormRef.value?.resetFields();
+  userOptions.value = [];
+  customerOptions.value = [];
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CustomerInfoVO[]) => {
+  ids.value = selection.map((item) => item.customerId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 加载公司列表 */
+const loadCustomerList = async () => {
+  customerLoading.value = true;
+  try {
+    const res = await getCrmCustomerInfoList(null);
+    // 过滤掉当前正在编辑的公司（避免选择自己作为上级）
+    const filteredList = res.data?.filter((customer: CustomerInfoVO) => customer.customerId !== form.value.customerId) || [];
+    customerOptions.value = filteredList;
+  } catch (error) {
+    console.error('加载公司列表失败:', error);
+    customerOptions.value = [];
+  } finally {
+    customerLoading.value = false;
+  }
+};
+
+/** 新增按钮操作 */
+const handleAdd = async () => {
+  reset();
+  userOptions.value = [];
+  customerOptions.value = [];
+  await loadCustomerList();
+  dialog.visible = true;
+  dialog.title = '添加公司信息';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CustomerInfoVO) => {
+  reset();
+  const _customerId = row?.customerId || ids.value[0];
+  const res = await getCustomerInfo(_customerId);
+  Object.assign(form.value, res.data);
+  // 加载公司列表
+  await loadCustomerList();
+  // 如果已选上级公司不在列表中（可能被过滤），需要单独加载
+  if (form.value.parentCustomerId) {
+    const exists = customerOptions.value.some((customer: CustomerInfoVO) => customer.customerId === form.value.parentCustomerId);
+    if (!exists) {
+      try {
+        const customerRes = await getCustomerInfo(form.value.parentCustomerId);
+        if (customerRes.data) {
+          customerOptions.value.unshift(customerRes.data);
+        }
+      } catch (error) {
+        console.error('加载已选上级公司失败:', error);
+      }
+    }
+  }
+  // 加载已选用户信息
+  if (form.value.ownerId) {
+    await loadSelectedUser(form.value.ownerId);
+  }
+  dialog.visible = true;
+  dialog.title = '修改公司信息';
+};
+
+/** 加载已选用户信息 */
+const loadSelectedUser = async (userId: string | number) => {
+  try {
+    const res = await optionSelect([userId]);
+    if (res.data && res.data.length > 0) {
+      userOptions.value = res.data;
+    }
+  } catch (error) {
+    console.error('加载用户信息失败:', error);
+  }
+};
+
+/** 远程搜索用户 */
+const remoteUserMethod = async (query: string) => {
+  if (query) {
+    userLoading.value = true;
+    try {
+      const res = await listUser({
+        pageNum: 1,
+        pageSize: 20,
+        nickName: query,
+        status: '0'
+      });
+      userOptions.value = res.rows || [];
+    } catch (error) {
+      console.error('搜索用户失败:', error);
+      userOptions.value = [];
+    } finally {
+      userLoading.value = false;
+    }
+  } else {
+    userOptions.value = [];
+    // 如果有已选用户，加载已选用户信息
+    if (form.value.ownerId) {
+      await loadSelectedUser(form.value.ownerId);
+    }
+  }
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  customerInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.customerId) {
+        await updateCustomerInfo(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addCustomerInfo(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CustomerInfoVO) => {
+  const _customerIds = row?.customerId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除公司信息编号为"' + _customerIds + '"的数据项？').finally(() => (loading.value = false));
+  await delCustomerInfo(_customerIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'oa/crm/customerInfo/export',
+    {
+      ...queryParams.value
+    },
+    `customerInfo_${new Date().getTime()}.xlsx`
+  );
+};
+
+/** 查看公司关系 */
+const handleViewRelation = async (row: CustomerInfoVO) => {
+  relationLoading.value = true;
+  currentCustomer.value = row;
+  parentCustomerList.value = [];
+  childCustomerList.value = [];
+
+  try {
+    // 查询上级公司（如果有parentCustomerId）
+    if (row.parentCustomerId) {
+      try {
+        const parentRes = await getCustomerInfo(row.parentCustomerId);
+        if (parentRes.data) {
+          parentCustomerList.value = [parentRes.data];
+        }
+      } catch (error) {
+        console.error('查询上级公司失败:', error);
+      }
+    }
+
+    // 查询下级公司（parentCustomerId等于当前公司ID的公司）
+    const childRes = await getCrmCustomerInfoList({
+      parentCustomerId: row.customerId
+    });
+    // 统一使用 data 字段，如果返回的是 rows 则使用 rows
+    const childList = childRes.data || childRes.rows || [];
+    if (childList.length > 0) {
+      childCustomerList.value = childList;
+    }
+  } catch (error) {
+    console.error('查询公司关系失败:', error);
+    proxy?.$modal.msgError('查询公司关系失败');
+  } finally {
+    relationLoading.value = false;
+    relationDialog.visible = true;
+  }
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/oa/erp/contractInfo/contract.vue b/src/views/oa/erp/contractInfo/contract.vue
new file mode 100644
index 0000000..698fa5f
--- /dev/null
+++ b/src/views/oa/erp/contractInfo/contract.vue
@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <div style="width: 100%; display: inline-block; vertical-align: top; height: calc(100vh - 50px - 34px)">
+      <umo-editor v-bind="options" ref="editorRef" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { UmoEditor } from '@umoteam/editor';
+import { getPrintTemplate, updatePrintTemplate } from '@/api/oa/base/printTemplate';
+import router from '@/router/index.js';
+import { useRoute } from 'vue-router';
+import { getBaseTemplateVariableList, templateAssign } from '@/api/oa/base/templateVariable/index.js';
+
+const route = useRoute();
+
+const template = ref({});
+
+const editorRef = ref();
+
+const fieldList = ref([]);
+
+let templateData = {};
+const options = ref({
+  document: {
+    title: '',
+    content: {
+      type: 'doc',
+      content: []
+    },
+    placeholder: {
+      en_US: 'Please enter the document content...',
+      zh_CN: '请输入文档内容...'
+    },
+    enableSpellcheck: true,
+    enableMarkdown: false,
+    enableBubbleMenu: true,
+    enableBlockMenu: true,
+    readOnly: false,
+    autofocus: true,
+    characterLimit: 0,
+    typographyRules: {
+      emDash: false
+    },
+    editorProps: {},
+    parseOptions: {
+      preserveWhitespace: 'full'
+    },
+    autoSave: {
+      enabled: true,
+      interval: 1000 * 60 * 5
+    }
+  },
+  page: {
+    showBreakMarks: false
+  },
+  onSave: async (e) => {
+    return true;
+  }
+});
+// 常量赋值
+const renderTemplate = (str, data) => {
+  return str.replace(/#\{(.*?)\}/g, (_, path) => {
+    return path.split('.').reduce((o, k) => o?.[k], data) ?? ' ';
+  });
+};
+// 数组赋值
+const rowRenderTemplate = (str, index) => {
+  return str.replace(/\^\{(.*?)\}/g, (_, path) => {
+    return templateData[path][index] || ' ';
+  });
+};
+// 是否进行数组赋值
+const hasCaretPattern = (arr) => {
+  // 正则匹配 ^{xxx}
+  const regex = /\^\{.*?\}/;
+  let length = 0;
+  let res = false;
+
+  function traverse(items) {
+    for (const item of items) {
+      if (item.text && regex.test(item.text)) {
+        length = Math.max(length, templateData[extractPlaceholders(item.text)].length || 0);
+        res = true; // 找到匹配
+      }
+      if (item.content && Array.isArray(item.content)) {
+        traverse(item.content);
+      }
+    }
+  }
+
+  traverse(arr);
+
+  return [res, length];
+};
+
+// 数据填充;
+const fillRowData = (e, index) => {
+  if (Array.isArray(e.content)) {
+    e.content.map((item) => {
+      return fillRowData(item, index);
+    });
+  } else {
+    e.text = rowRenderTemplate(e.text || '', index);
+  }
+  console.log(e);
+  return e;
+};
+
+// 表格处理
+const tableTemplate = (table) => {
+  let data = JSON.parse(JSON.stringify(table));
+  let arr = [];
+  data.forEach((item) => {
+    let [bol, length] = hasCaretPattern(JSON.parse(JSON.stringify(item.content)));
+    if (bol) {
+      let obj = JSON.parse(JSON.stringify(item));
+      Array(length)
+        .fill(0)
+        .forEach((_, index) => {
+          arr.push(fillRowData(JSON.parse(JSON.stringify(obj)), index));
+        });
+      // arr.push(fillRowData(JSON.parse(JSON.stringify({ ...item, content: row })), requestData[key]));
+    } else {
+      arr.push(fillData(item));
+    }
+  });
+  return arr.filter((item) => item);
+};
+
+// 根据变量赋值
+const fillData = (e) => {
+  if (e.type === 'table') {
+    e.content = tableTemplate(e.content);
+  } else {
+    if (Array.isArray(e.content)) {
+      e.content.map((item) => {
+        return fillData(item);
+      });
+    } else {
+      e.text = renderTemplate(e.text || '', templateData);
+    }
+  }
+  return e;
+};
+
+const insertText = (e) => {
+  const editor = editorRef.value;
+  editor.insertContent(
+    {
+      type: 'text',
+      text: e.varName
+    },
+    {
+      updateSelection: false
+    }
+  );
+};
+
+function extractPlaceholders(str) {
+  const regex = /[#\^]\{([^}]+)\}/g; // 匹配 #{...} 或 ^{...}
+  const result = [];
+  let match;
+  while ((match = regex.exec(str)) !== null) {
+    result.push(match[1]);
+  }
+  return result;
+}
+
+onMounted(async () => {
+  const { data: assignData } = await templateAssign({ templateType: 1, contractId: route.query.contractId });
+  templateData = {};
+  assignData.forEach((item) => {
+    templateData[extractPlaceholders(item.varName)] = item.varValue;
+  });
+  // console.log(templateData);
+  getPrintTemplate(route.query.templateId).then((e) => {
+    template.value = e.data;
+    const editor = editorRef.value;
+    let docData = JSON.parse(e.data.templateData || '{}');
+    let data = fillData(docData);
+    // console.log(data);
+    // console.log(JSON.parse(e.data.templateData || '{}'));
+    // editor.setContent(JSON.parse(e.data.templateData || '{}'));
+    editor.setContent(data);
+  });
+});
+</script>
+
+<style scoped>
+.title {
+  width: 100%;
+  line-height: 40px;
+  font-size: 14px;
+  color: #666;
+  text-align: center;
+}
+
+.fieldList {
+  width: 100%;
+  height: calc(100vh - 50px - 34px - 40px);
+  overflow-y: auto;
+
+  .fieldItem {
+    width: 80%;
+    font-size: 12px;
+    padding-left: 15px;
+    color: #333;
+    cursor: pointer;
+
+    .btn {
+      padding: 10px;
+
+      &:hover {
+        background-color: #eee;
+        border-radius: 10px;
+      }
+    }
+  }
+}
+</style>
+<style>
+.umo-footer {
+  position: sticky;
+  bottom: 0px;
+}
+</style>
diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue
index 3a8124b..1bf69e2 100644
--- a/src/views/oa/erp/contractInfo/index.vue
+++ b/src/views/oa/erp/contractInfo/index.vue
@@ -163,9 +163,12 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="查看" placement="top"  v-if="scope.row.contractStatus !== '1'">
+            <el-tooltip content="查看" placement="top" v-if="scope.row.contractStatus !== '1'">
               <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
             </el-tooltip>
+            <el-tooltip content="查看合同" placement="top" v-if="scope.row.contractStatus !== '1'">
+              <el-button link type="info" icon="Reading" @click="contractView(scope.row)"></el-button>
+            </el-tooltip>
             <el-tooltip content="修改" placement="top" v-if="scope.row.contractStatus === '1'">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:contractInfo:edit']"></el-button>
             </el-tooltip>
@@ -436,4 +439,10 @@ const downloadFinalContract = (ossId: string | number) => {
 const handleApprovalRecord = (row: ContractInfoVO) => {
   approvalRecordRef.value?.init(row.contractId);
 };
+
+// 查看合同
+const contractView = (e) => {
+  console.log(e);
+  router.push({ path: '/contract/contractView', query: { templateId: e.templateId, contractId: e.contractId } });
+};
 </script>
diff --git a/src/views/oa/erp/erpProjectPlan/edit.vue b/src/views/oa/erp/erpProjectPlan/edit.vue
new file mode 100644
index 0000000..1c47f79
--- /dev/null
+++ b/src/views/oa/erp/erpProjectPlan/edit.vue
@@ -0,0 +1,602 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <div v-if="showApprovalButton" class="mb-3 flex items-center justify-between">
+        <div>
+          <el-button
+            v-if="showSubmitButtons"
+            type="info"
+            :loading="draftLoading"
+            :disabled="submitLoading"
+            @click="handleSubmitAction('draft')"
+          >暂存</el-button>
+          <el-button
+            v-if="showSubmitButtons"
+            type="primary"
+            :loading="submitLoading"
+            :disabled="draftLoading"
+            @click="handleSubmitAction('submit')"
+          >提交</el-button>
+          <el-button
+            v-if="showApprovalAction"
+            type="primary"
+            :disabled="draftLoading || submitLoading"
+            @click="approvalVerifyOpen"
+          >审批</el-button>
+          <el-button
+            v-if="showProgressButton"
+            type="primary"
+            :disabled="draftLoading || submitLoading"
+            @click="handleApprovalRecord"
+          >流程进度</el-button>
+        </div>
+        <div>
+          <el-button @click="goBack">返回</el-button>
+        </div>
+      </div>
+      <div v-else-if="showLimitedActions" class="mb-3 text-right">
+        <el-button type="primary" :loading="buttonLoading" @click="handleSave">保存</el-button>
+        <el-button @click="goBack">返回</el-button>
+      </div>
+      <el-form ref="projectPlanFormRef" :model="form" :rules="rules" :disabled="isViewMode" label-width="120px">
+        <el-divider content-position="left">基本信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="projectId">
+              <el-select v-model="form.projectId" placeholder="请选择项目" filterable :disabled="!isBasicEditable" @change="handleProjectChange">
+                <el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目经理" prop="managerId">
+              <el-select v-model="form.managerId" placeholder="请选择项目经理" filterable disabled>
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门负责人" prop="chargeId">
+              <el-select v-model="form.chargeId" placeholder="请选择部门负责人" filterable disabled>
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="关联合同" prop="contractId">
+              <el-select v-model="form.contractId" placeholder="请选择合同" filterable clearable :disabled="!isBasicEditable">
+                <el-option v-for="item in contractInfoList" :key="item.contractId" :label="item.contractName" :value="item.contractId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="付款方式" prop="paymentMethod">
+              <el-input v-model="form.paymentMethod" placeholder="（如：3-3-3-1）" :disabled="!isBasicEditable" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目计划状态" prop="projectPlanStatus">
+              <el-select v-model="form.projectPlanStatus" placeholder="请选择项目计划状态" :disabled="!isBasicEditable">
+                <el-option v-for="dict in project_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" :disabled="!isBasicEditable" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left">项目阶段计划</el-divider>
+        <el-row :gutter="10" class="mb8" v-if="isBasicEditable">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="Plus" @click="handleAddStage">添加阶段</el-button>
+          </el-col>
+        </el-row>
+        
+        <el-table :data="form.planStageList" border stripe max-height="600">
+          <el-table-column label="序号" type="index" width="60" align="center" />
+          <el-table-column label="项目阶段" width="150" align="center">
+            <template #default="scope">
+              <el-select v-model="scope.row.projectPhases" placeholder="请选择项目阶段" style="width: 100%" :disabled="!isBasicEditable">
+                <el-option v-for="dict in project_phases" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="计划开始时间" width="160" align="center">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.planStartTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" :disabled="!isBasicEditable"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="160" align="center">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.planEndTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" :disabled="!isBasicEditable"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="回款阶段" width="150" align="center">
+            <template #default="scope">
+              <el-select v-model="scope.row.collectionStage" placeholder="请选择回款阶段" style="width: 100%" :disabled="!isBasicEditable">
+                <el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="回款比例(%)" width="120" align="center">
+            <template #default="scope">
+              <el-input-number v-model="scope.row.repaymentRate" :min="0" :max="100" :precision="2" controls-position="right" style="width: 100%" :disabled="!isBasicEditable" @change="calculateRepaymentAmount(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="预计回款金额" width="140" align="center">
+            <template #default="scope">
+              <el-input-number v-model="scope.row.repaymentAmount" :min="0" :precision="2" controls-position="right" style="width: 100%" :disabled="!isBasicEditable"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="预计回款时间" width="160" align="center">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.repaymentTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" :disabled="!isBasicEditable" @change="recalcReceivableDate(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="回款延期天数" width="140" align="center">
+            <template #default="scope">
+              <el-input-number v-model="scope.row.delayDay" :min="0" :step="1" controls-position="right" style="width: 100%" :disabled="!canEditLimited" @change="recalcReceivableDate(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="应收款日期" width="160" align="center">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.receivableDate" type="date" value-format="YYYY-MM-DD" placeholder="自动计算" style="width: 100%" disabled/>
+            </template>
+          </el-table-column>
+          <el-table-column label="进度备注" width="200" align="center">
+            <template #default="scope">
+              <el-input v-model="scope.row.scheduleRemark" placeholder="请输入进度备注" :disabled="!canEditLimited"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="80" align="center" fixed="right" v-if="isBasicEditable">
+            <template #default="scope">
+              <el-button type="danger" link icon="Delete" @click="handleDeleteStage(scope.$index)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-form>
+    </el-card>
+
+    <!-- 提交审批组件 -->
+    <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+    <!-- 审批记录 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script setup lang="ts" name="ErpProjectPlanEdit">
+import { ref, reactive, onMounted, getCurrentInstance, watch, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { getErpProjectPlan, addErpProjectPlan, updateErpProjectPlan, projectPlanSubmitAndFlowStart } from '@/api/oa/erp/erpProjectPlan';
+import { ErpProjectPlanForm } from '@/api/oa/erp/erpProjectPlan/types';
+import { listUser } from '@/api/system/user';
+import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo';
+import { getErpContractInfoList } from '@/api/oa/erp/contractInfo';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import { useUserStore } from '@/store/modules/user';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { project_plan_status , project_phases, collection_stage } = toRefs<any>(
+  proxy?.useDict('project_plan_status', 'project_phases', 'collection_stage')
+);
+const route = useRoute();
+const router = useRouter();
+const userStore = useUserStore();
+
+// 审批相关组件引用
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+// 路由参数
+const routeParams = ref<any>({});
+const syncRouteParams = () => {
+  const projectPlanId = (route.params.projectPlanId as string) || (route.query.id as string);
+  const type = (route.query.type as string) || (route.params.type as string) || 'edit';
+  const taskId = (route.query.taskId as string) || (route.params.taskId as string);
+  routeParams.value = {
+    projectPlanId,
+    type,
+    taskId
+  };
+};
+
+syncRouteParams();
+watch(
+  () => route.fullPath,
+  () => {
+    syncRouteParams();
+  }
+);
+
+// approvalButton组件的pageType（将'edit'转换为'update'）
+const approvalPageType = computed(() => {
+  if (routeParams.value.type === 'edit') {
+    return 'update';
+  }
+  return routeParams.value.type;
+});
+
+// 是否只读模式
+const isViewMode = computed(() => ['view', 'approval'].includes(routeParams.value.type));
+
+// 流程相关数据
+const taskVariables = ref<any>({});
+
+// 计算属性：判断基础信息是否可编辑
+const isBasicEditable = computed(() => {
+  if (isViewMode.value) {
+    return false;
+  }
+  // 草稿、驳回、撤回均允许项目经理完整编辑
+  return (
+    form.value.projectPlanStatus === '1' ||
+    ['back', 'cancel'].includes(form.value.flowStatus as string)
+  );
+});
+
+// 计算属性：判断是否可编辑延迟/备注等有限字段
+const canEditLimited = computed(() => {
+  if (isViewMode.value) {
+    return false;
+  }
+  if (isBasicEditable.value) {
+    return true;
+  }
+  // 审批完成允许维护延期与进度备注
+  return form.value.projectPlanStatus === '3' || form.value.flowStatus === 'finish';
+});
+
+// 限制模式（审批完成，仅维护部分字段）
+const isLimitedMode = computed(() => !isBasicEditable.value && canEditLimited.value);
+
+// 按钮展示控制
+const showApprovalButton = computed(() => {
+  if (isLimitedMode.value) {
+    return false;
+  }
+  if (routeParams.value.type === 'approval') {
+    return true;
+  }
+  return !isViewMode.value;
+});
+const showLimitedActions = computed(() => !isViewMode.value && isLimitedMode.value);
+
+const showSubmitButtons = computed(() => {
+  if (approvalPageType.value === 'add') return true;
+  if (
+    approvalPageType.value === 'update' &&
+    form.value.flowStatus &&
+    ['draft', 'cancel', 'back'].includes(form.value.flowStatus as string)
+  ) {
+    return true;
+  }
+  return false;
+});
+
+const showApprovalAction = computed(() => {
+  return approvalPageType.value === 'approval' && form.value.flowStatus === 'waiting';
+});
+
+const showProgressButton = computed(() => {
+  return !!form.value.projectPlanId && form.value.flowStatus !== 'draft';
+});
+
+const projectPlanFormRef = ref<ElFormInstance>();
+const buttonLoading = ref(false);
+const draftLoading = ref(false);
+const submitLoading = ref(false);
+const currentAction = ref<'draft' | 'submit' | null>(null);
+const projectInfoList = ref<any[]>([]);
+const userList = ref<any[]>([]);
+const contractInfoList = ref<any[]>([]);
+const contractTotalPrice = ref<number>(0);
+
+const form = ref<ErpProjectPlanForm>({
+  projectPlanId: undefined,
+  projectId: undefined,
+  managerId: undefined,
+  chargeId: undefined,
+  paymentMethod: undefined,
+  projectPlanStatus: '1',
+  flowStatus: 'draft',
+  contractId: undefined,
+  remark: undefined,
+  planStageList: []
+});
+
+const rules = reactive({
+  projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
+  managerId: [{ required: true, message: '请选择项目经理', trigger: 'change' }]
+});
+
+/** 获取项目列表 */
+const getProjectInfoList = async () => {
+  const res = await getErpProjectInfoList({});
+  projectInfoList.value = res.data;
+};
+
+/** 获取用户列表 */
+const getUserList = async () => {
+  const res = await listUser({ pageNum: 1, pageSize: 9999 });
+  userList.value = res.rows;
+};
+
+/** 获取合同列表 */
+const getContractInfoList = async () => {
+  const res = await getErpContractInfoList({});
+  contractInfoList.value = res.data;
+};
+
+/** 添加阶段 */
+const handleAddStage = () => {
+  const newStage = {
+    planStageId: undefined,
+    projectId: form.value.projectId,
+    projectPlanId: form.value.projectPlanId,
+    projectPhases: undefined,
+    planStartTime: undefined,
+    planEndTime: undefined,
+    collectionStage: undefined,
+    repaymentRate: undefined,
+    repaymentAmount: undefined,
+    repaymentTime: undefined,
+    delayDay: undefined,
+    receivableDate: undefined,
+    reasonsExplanation: undefined,
+    scheduleRemark: undefined,
+    realStartTime: undefined,
+    realEndTime: undefined,
+    sortOrder: (form.value.planStageList?.length || 0) + 1
+  };
+  if (!form.value.planStageList) {
+    form.value.planStageList = [];
+  }
+  form.value.planStageList.push(newStage);
+};
+
+/** 删除阶段 */
+const handleDeleteStage = (index: number) => {
+  form.value.planStageList?.splice(index, 1);
+};
+
+/** 处理项目选择变化，自动填充项目经理和部门负责人 */
+const handleProjectChange = (projectId: number) => {
+  if (!projectId) {
+    form.value.managerId = undefined;
+    form.value.chargeId = undefined;
+    return;
+  }
+  const project = projectInfoList.value.find(p => p.projectId === projectId);
+  if (project) {
+    form.value.managerId = project.managerId;
+    form.value.chargeId = project.chargeId;
+  }
+};
+
+/** 根据回款比例计算回款金额 */
+const calculateRepaymentAmount = (row: any) => {
+  if (row.repaymentRate && contractTotalPrice.value > 0) {
+    row.repaymentAmount = parseFloat((contractTotalPrice.value * row.repaymentRate / 100).toFixed(2));
+  }
+};
+
+/** 根据回款时间与延期天数生成应收款日期 */
+const recalcReceivableDate = (row: any) => {
+  if (!row) return;
+  const time = row.repaymentTime;
+  const delay = Number(row.delayDay || 0);
+  if (!time) {
+    row.receivableDate = undefined;
+    return;
+  }
+  const base = new Date(time as string);
+  if (isNaN(base.getTime())) {
+    row.receivableDate = undefined;
+    return;
+  }
+  const target = new Date(base.getTime());
+  target.setDate(target.getDate() + delay);
+  // 使用系统已有的parseTime进行格式化，保持与全局一致
+  row.receivableDate = proxy?.parseTime ? proxy.parseTime(target, '{y}-{m}-{d}') : target.toISOString().slice(0, 10);
+};
+
+/** 监听合同变化，更新合同总价 */
+watch(() => form.value.contractId, (newContractId) => {
+  if (newContractId) {
+    const contract = contractInfoList.value.find(c => c.contractId === newContractId);
+    if (contract) {
+      contractTotalPrice.value = contract.totalPrice || 0;
+    }
+  } else {
+    contractTotalPrice.value = 0;
+  }
+});
+
+/** 提交表单 */
+const submitForm = async (status = 'draft') => {
+  currentAction.value = status as 'draft' | 'submit';
+  if (currentAction.value === 'draft') {
+    draftLoading.value = true;
+  } else if (currentAction.value === 'submit') {
+    submitLoading.value = true;
+  }
+
+  // 权限校验：只有项目经理才能提交（超级管理员跳过校验）
+  if (!form.value.managerId) {
+    proxy?.$modal.msgError('请先选择项目');
+    resetActionLoading();
+    return;
+  }
+  // 超级管理员跳过权限校验
+  const isSuperAdmin = userStore.roles.includes('admin') || userStore.roles.includes('superadmin');
+  if (!isSuperAdmin && userStore.userId !== form.value.managerId) {
+    proxy?.$modal.msgError('只有项目经理才能提交项目计划');
+    resetActionLoading();
+    return;
+  }
+
+  projectPlanFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        // 更新阶段的projectId
+        if (form.value.planStageList) {
+          form.value.planStageList.forEach(stage => {
+            stage.projectId = form.value.projectId;
+          });
+        }
+        
+        // 提交审批
+        if (status === 'submit') {
+          const project = projectInfoList.value.find(p => p.projectId === form.value.projectId);
+          form.value.flowCode = 'OAPS';
+          form.value.variables = {
+            projectId: form.value.projectId,
+            projectName: project?.projectName,
+            managerId: form.value.managerId
+          };
+          form.value.bizExt = {
+            businessTitle: '项目计划审批',
+            businessCode: project?.projectName
+          };
+          form.value.projectPlanStatus = '2';
+          form.value.flowStatus = 'waiting';
+          const res = await projectPlanSubmitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
+          form.value = res.data;
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('操作成功');
+          proxy?.$tab.closePage();
+          router.go(-1);
+        } else {
+          // 暂存
+          if (status === 'draft') {
+            form.value.projectPlanStatus = '1';
+            form.value.flowStatus = 'draft';
+          }
+          if (form.value.projectPlanId) {
+            await updateErpProjectPlan(form.value).finally(() => (buttonLoading.value = false));
+          } else {
+            await addErpProjectPlan(form.value).finally(() => (buttonLoading.value = false));
+          }
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('暂存成功');
+          proxy?.$tab.closePage();
+          router.go(-1);
+        }
+      } finally {
+        buttonLoading.value = false;
+        resetActionLoading();
+      }
+    } else {
+      resetActionLoading();
+      buttonLoading.value = false;
+    }
+  });
+};
+
+const handleSubmitAction = (type: 'draft' | 'submit') => {
+  if (draftLoading.value || submitLoading.value) return;
+  submitForm(type);
+};
+
+const resetActionLoading = () => {
+  if (currentAction.value === 'draft') {
+    draftLoading.value = false;
+  }
+  if (currentAction.value === 'submit') {
+    submitLoading.value = false;
+  }
+  currentAction.value = null;
+};
+
+/** 保存按钮 - 保存为草稿 */
+const handleSave = () => {
+  if (isLimitedMode.value) {
+    saveLimited();
+  } else {
+    submitForm('draft');
+  }
+};
+
+/** 审批完成后的保存逻辑 */
+const saveLimited = () => {
+  projectPlanFormRef.value?.validate(async (valid: boolean) => {
+    if (!valid) return;
+    buttonLoading.value = true;
+    try {
+      if (form.value.planStageList) {
+        form.value.planStageList.forEach(stage => {
+          stage.projectId = form.value.projectId;
+        });
+      }
+      await updateErpProjectPlan(form.value);
+      proxy?.$modal.msgSuccess('保存成功');
+      proxy?.$tab.closePage();
+      router.go(-1);
+    } finally {
+      buttonLoading.value = false;
+    }
+  });
+};
+
+/** 返回列表 */
+const goBack = () => {
+  router.back();
+};
+
+/** 初始化数据 */
+const initData = async () => {
+  await Promise.all([getProjectInfoList(), getUserList(), getContractInfoList()]);
+  
+  syncRouteParams();
+  const projectPlanId = routeParams.value.projectPlanId;
+  if (projectPlanId && projectPlanId !== '0') {
+    const res = await getErpProjectPlan(projectPlanId as string);
+    form.value = res.data;
+    
+    // 确保flowStatus有默认值（用于approvalButton组件显示）
+    if (!form.value.flowStatus) {
+      form.value.flowStatus = 'draft';
+    }
+    
+    // 获取合同总价用于计算回款金额
+    if (form.value.contractId) {
+      const contract = contractInfoList.value.find(c => c.contractId === form.value.contractId);
+      if (contract) {
+        contractTotalPrice.value = contract.totalPrice || 0;
+      }
+    }
+  }
+};
+
+// 审批
+const approvalVerifyOpen = async () => {
+  await submitVerifyRef.value?.openDialog(routeParams.value.taskId);
+};
+
+// 审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value?.init(form.value.projectPlanId);
+};
+
+// 提交回调
+const submitCallback = async () => {
+  await proxy?.$tab.closePage(route);
+  router.go(-1);
+};
+
+onMounted(() => {
+  initData();
+});
+</script>
+
+<style scoped lang="scss">
+.el-divider {
+  margin: 20px 0;
+}
+</style>
diff --git a/src/views/oa/erp/erpProjectPlan/edit.vue.back b/src/views/oa/erp/erpProjectPlan/edit.vue.back
new file mode 100644
index 0000000..5f248ad
--- /dev/null
+++ b/src/views/oa/erp/erpProjectPlan/edit.vue.back
@@ -0,0 +1,484 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <!-- 审批按钮组件 -->
+      <approvalButton
+        @submitForm="submitForm"
+        @approvalVerifyOpen="approvalVerifyOpen"
+        @handleApprovalRecord="handleApprovalRecord"
+        :buttonLoading="buttonLoading"
+        :id="form.projectPlanId"
+        :status="form.flowStatus"
+        :pageType="approvalPageType"
+        :mode="false"
+      />
+      <el-form ref="projectPlanFormRef" :model="form" :rules="rules" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" label-width="120px">
+        <el-divider content-position="left">基本信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="projectId">
+              <el-select v-model="form.projectId" placeholder="请选择项目" filterable @change="handleProjectChange">
+                <el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目经理" prop="managerId">
+              <el-select v-model="form.managerId" placeholder="请选择项目经理" filterable disabled>
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门负责人" prop="chargeId">
+              <el-select v-model="form.chargeId" placeholder="请选择部门负责人" filterable disabled>
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="关联合同" prop="contractId">
+              <el-select v-model="form.contractId" placeholder="请选择合同" filterable clearable>
+                <el-option v-for="item in contractInfoList" :key="item.contractId" :label="item.contractName" :value="item.contractId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="付款方式" prop="paymentMethod">
+              <el-input v-model="form.paymentMethod" placeholder="（如：3-3-3-1）" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目计划状态" prop="projectPlanStatus">
+              <el-select v-model="form.projectPlanStatus" placeholder="请选择项目计划状态">
+                <el-option v-for="dict in project_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left">项目阶段计划</el-divider>
+        <el-row :gutter="10" class="mb8" v-if="isBasicEditable">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="Plus" @click="handleAddStage">添加阶段</el-button>
+          </el-col>
+        </el-row>
+        
+        <el-table :data="form.planStageList" border stripe max-height="600">
+          <el-table-column label="序号" type="index" width="60" align="center" />
+          <el-table-column label="项目阶段" width="150" align="center">
+            <template #default="scope">
+              <el-select v-model="scope.row.projectPhases" placeholder="请选择项目阶段" style="width: 100%" :disabled="!isBasicEditable">
+                <el-option v-for="dict in project_phases" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="计划开始时间" width="160" align="center">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.planStartTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" :disabled="!isBasicEditable"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="160" align="center">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.planEndTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" :disabled="!isBasicEditable"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="回款阶段" width="150" align="center">
+            <template #default="scope">
+              <el-select v-model="scope.row.collectionStage" placeholder="请选择回款阶段" style="width: 100%" :disabled="!isBasicEditable">
+                <el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="回款比例(%)" width="120" align="center">
+            <template #default="scope">
+              <el-input-number v-model="scope.row.repaymentRate" :min="0" :max="100" :precision="2" controls-position="right" style="width: 100%" :disabled="!isBasicEditable" @change="calculateRepaymentAmount(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="预计回款金额" width="140" align="center">
+            <template #default="scope">
+              <el-input-number v-model="scope.row.repaymentAmount" :min="0" :precision="2" controls-position="right" style="width: 100%" :disabled="!isBasicEditable"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="预计回款时间" width="160" align="center">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.repaymentTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" :disabled="!isBasicEditable" @change="recalcReceivableDate(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="回款延期天数" width="140" align="center">
+            <template #default="scope">
+              <el-input-number v-model="scope.row.delayDay" :min="0" :step="1" controls-position="right" style="width: 100%" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" @change="recalcReceivableDate(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="应收款日期" width="160" align="center">
+            <template #default="scope">
+              <el-date-picker v-model="scope.row.receivableDate" type="date" value-format="YYYY-MM-DD" placeholder="自动计算" style="width: 100%" disabled/>
+            </template>
+          </el-table-column>
+          <el-table-column label="进度备注" width="200" align="center">
+            <template #default="scope">
+              <el-input v-model="scope.row.scheduleRemark" placeholder="请输入进度备注" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="80" align="center" fixed="right" v-if="isBasicEditable">
+            <template #default="scope">
+              <el-button type="danger" link icon="Delete" @click="handleDeleteStage(scope.$index)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 底部操作按钮 -->
+        <el-row :gutter="20" class="mt-4" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
+          <el-col :span="24" style="text-align: center">
+            <el-button type="primary" :loading="buttonLoading" @click="handleSave">暂存</el-button>
+            <el-button @click="goBack">返回</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <!-- 提交审批组件 -->
+    <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+    <!-- 审批记录 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script setup lang="ts" name="ErpProjectPlanEdit">
+import { ref, reactive, onMounted, getCurrentInstance, watch, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { getErpProjectPlan, addErpProjectPlan, updateErpProjectPlan, projectPlanSubmitAndFlowStart } from '@/api/oa/erp/erpProjectPlan';
+import { ErpProjectPlanForm } from '@/api/oa/erp/erpProjectPlan/types';
+import { listUser } from '@/api/system/user';
+import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo';
+import { getErpContractInfoList } from '@/api/oa/erp/contractInfo';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { useUserStore } from '@/store/modules/user';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { project_plan_status , project_phases, collection_stage } = toRefs<any>(
+  proxy?.useDict('project_plan_status', 'project_phases', 'collection_stage')
+);
+const route = useRoute();
+const router = useRouter();
+const userStore = useUserStore();
+
+// 审批相关组件引用
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+// 路由参数
+const routeParams = ref<any>({});
+const syncRouteParams = () => {
+  const projectPlanId = (route.params.projectPlanId as string) || (route.query.id as string);
+  const type = (route.query.type as string) || (route.params.type as string) || 'edit';
+  const taskId = (route.query.taskId as string) || (route.params.taskId as string);
+  routeParams.value = {
+    projectPlanId,
+    type,
+    taskId
+  };
+};
+
+syncRouteParams();
+watch(
+  () => route.fullPath,
+  () => {
+    syncRouteParams();
+  }
+);
+
+// approvalButton组件的pageType（将'edit'转换为'update'）
+const approvalPageType = computed(() => {
+  if (routeParams.value.type === 'edit') {
+    return 'update';
+  }
+  return routeParams.value.type;
+});
+
+// 流程相关数据
+const taskVariables = ref<any>({});
+
+// 计算属性：判断基础信息是否可编辑（草稿状态才能全面编辑）
+const isBasicEditable = computed(() => {
+  // 查看模式或审批模式不可编辑
+  if (routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+    return false;
+  }
+  // 草稿状态（'1'）可编辑，其他状态不可编辑
+  return form.value.projectPlanStatus === '1';
+});
+
+const projectPlanFormRef = ref<ElFormInstance>();
+const buttonLoading = ref(false);
+const projectInfoList = ref<any[]>([]);
+const userList = ref<any[]>([]);
+const contractInfoList = ref<any[]>([]);
+const contractTotalPrice = ref<number>(0);
+
+const form = ref<ErpProjectPlanForm>({
+  projectPlanId: undefined,
+  projectId: undefined,
+  managerId: undefined,
+  chargeId: undefined,
+  paymentMethod: undefined,
+  projectPlanStatus: '1',
+  flowStatus: 'draft',
+  contractId: undefined,
+  remark: undefined,
+  planStageList: []
+});
+
+const rules = reactive({
+  projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
+  managerId: [{ required: true, message: '请选择项目经理', trigger: 'change' }]
+});
+
+/** 获取项目列表 */
+const getProjectInfoList = async () => {
+  const res = await getErpProjectInfoList({});
+  projectInfoList.value = res.data;
+};
+
+/** 获取用户列表 */
+const getUserList = async () => {
+  const res = await listUser({ pageNum: 1, pageSize: 9999 });
+  userList.value = res.rows;
+};
+
+/** 获取合同列表 */
+const getContractInfoList = async () => {
+  const res = await getErpContractInfoList({});
+  contractInfoList.value = res.data;
+};
+
+/** 添加阶段 */
+const handleAddStage = () => {
+  const newStage = {
+    planStageId: undefined,
+    projectId: form.value.projectId,
+    projectPlanId: form.value.projectPlanId,
+    projectPhases: undefined,
+    planStartTime: undefined,
+    planEndTime: undefined,
+    collectionStage: undefined,
+    repaymentRate: undefined,
+    repaymentAmount: undefined,
+    repaymentTime: undefined,
+    delayDay: undefined,
+    receivableDate: undefined,
+    reasonsExplanation: undefined,
+    scheduleRemark: undefined,
+    realStartTime: undefined,
+    realEndTime: undefined,
+    sortOrder: (form.value.planStageList?.length || 0) + 1
+  };
+  if (!form.value.planStageList) {
+    form.value.planStageList = [];
+  }
+  form.value.planStageList.push(newStage);
+};
+
+/** 删除阶段 */
+const handleDeleteStage = (index: number) => {
+  form.value.planStageList?.splice(index, 1);
+};
+
+/** 处理项目选择变化，自动填充项目经理和部门负责人 */
+const handleProjectChange = (projectId: number) => {
+  if (!projectId) {
+    form.value.managerId = undefined;
+    form.value.chargeId = undefined;
+    return;
+  }
+  const project = projectInfoList.value.find(p => p.projectId === projectId);
+  if (project) {
+    form.value.managerId = project.managerId;
+    form.value.chargeId = project.chargeId;
+  }
+};
+
+/** 根据回款比例计算回款金额 */
+const calculateRepaymentAmount = (row: any) => {
+  if (row.repaymentRate && contractTotalPrice.value > 0) {
+    row.repaymentAmount = parseFloat((contractTotalPrice.value * row.repaymentRate / 100).toFixed(2));
+  }
+};
+
+/** 根据回款时间与延期天数生成应收款日期 */
+const recalcReceivableDate = (row: any) => {
+  if (!row) return;
+  const time = row.repaymentTime;
+  const delay = Number(row.delayDay || 0);
+  if (!time) {
+    row.receivableDate = undefined;
+    return;
+  }
+  const base = new Date(time as string);
+  if (isNaN(base.getTime())) {
+    row.receivableDate = undefined;
+    return;
+  }
+  const target = new Date(base.getTime());
+  target.setDate(target.getDate() + delay);
+  // 使用系统已有的parseTime进行格式化，保持与全局一致
+  row.receivableDate = proxy?.parseTime ? proxy.parseTime(target, '{y}-{m}-{d}') : target.toISOString().slice(0, 10);
+};
+
+/** 监听合同变化，更新合同总价 */
+watch(() => form.value.contractId, (newContractId) => {
+  if (newContractId) {
+    const contract = contractInfoList.value.find(c => c.contractId === newContractId);
+    if (contract) {
+      contractTotalPrice.value = contract.totalPrice || 0;
+    }
+  } else {
+    contractTotalPrice.value = 0;
+  }
+});
+
+/** 提交表单 */
+const submitForm = async (status = 'draft') => {
+  // 权限校验：只有项目经理才能提交（超级管理员跳过校验）
+  if (!form.value.managerId) {
+    proxy?.$modal.msgError('请先选择项目');
+    return;
+  }
+  // 超级管理员跳过权限校验
+  const isSuperAdmin = userStore.roles.includes('admin') || userStore.roles.includes('superadmin');
+  if (!isSuperAdmin && userStore.userId !== form.value.managerId) {
+    proxy?.$modal.msgError('只有项目经理才能提交项目计划');
+    return;
+  }
+
+  projectPlanFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        // 更新阶段的projectId
+        if (form.value.planStageList) {
+          form.value.planStageList.forEach(stage => {
+            stage.projectId = form.value.projectId;
+          });
+        }
+        
+        // 提交审批
+        if (status === 'submit') {
+          const project = projectInfoList.value.find(p => p.projectId === form.value.projectId);
+          form.value.flowCode = 'OAPS';
+          form.value.variables = {
+            projectId: form.value.projectId,
+            projectName: project?.projectName,
+            managerId: form.value.managerId
+          };
+          form.value.bizExt = {
+            businessTitle: '项目计划审批',
+            businessCode: project?.projectName
+          };
+          form.value.projectPlanStatus = '2';
+          form.value.flowStatus = 'waiting';
+          const res = await projectPlanSubmitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
+          form.value = res.data;
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('操作成功');
+          proxy?.$tab.closePage();
+          router.go(-1);
+        } else {
+          // 暂存
+          if (status === 'draft') {
+            form.value.projectPlanStatus = '1';
+            form.value.flowStatus = 'draft';
+          }
+          if (form.value.projectPlanId) {
+            await updateErpProjectPlan(form.value).finally(() => (buttonLoading.value = false));
+          } else {
+            await addErpProjectPlan(form.value).finally(() => (buttonLoading.value = false));
+          }
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('暂存成功');
+          proxy?.$tab.closePage();
+          router.go(-1);
+        }
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+/** 保存按钮 - 保存为草稿 */
+const handleSave = () => {
+  submitForm('draft');
+};
+
+/** 返回列表 */
+const goBack = () => {
+  router.back();
+};
+
+/** 初始化数据 */
+const initData = async () => {
+  await Promise.all([getProjectInfoList(), getUserList(), getContractInfoList()]);
+  
+  syncRouteParams();
+  const projectPlanId = routeParams.value.projectPlanId;
+  if (projectPlanId && projectPlanId !== '0') {
+    const res = await getErpProjectPlan(projectPlanId as string);
+    form.value = res.data;
+    
+    // 确保flowStatus有默认值（用于approvalButton组件显示）
+    if (!form.value.flowStatus) {
+      form.value.flowStatus = 'draft';
+    }
+    
+    // 获取合同总价用于计算回款金额
+    if (form.value.contractId) {
+      const contract = contractInfoList.value.find(c => c.contractId === form.value.contractId);
+      if (contract) {
+        contractTotalPrice.value = contract.totalPrice || 0;
+      }
+    }
+  }
+  
+  // 添加调试日志（完成后可删除）
+  console.log('=== approvalButton 显示条件 ===');
+  console.log('form.projectPlanId:', form.value.projectPlanId);
+  console.log('form.flowStatus:', form.value.flowStatus);
+  console.log('routeParams.type:', routeParams.value.type);
+  console.log('approvalPageType:', approvalPageType.value);
+  console.log('URL:', window.location.href);
+};
+
+// 审批
+const approvalVerifyOpen = async () => {
+  await submitVerifyRef.value?.openDialog(routeParams.value.taskId);
+};
+
+// 审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value?.init(form.value.projectPlanId);
+};
+
+// 提交回调
+const submitCallback = async () => {
+  await proxy?.$tab.closePage(route);
+  router.go(-1);
+};
+
+onMounted(() => {
+  initData();
+});
+</script>
+
+<style scoped lang="scss">
+.el-divider {
+  margin: 20px 0;
+}
+</style>
diff --git a/src/views/oa/erp/erpProjectPlan/index.vue b/src/views/oa/erp/erpProjectPlan/index.vue
new file mode 100644
index 0000000..d66efb2
--- /dev/null
+++ b/src/views/oa/erp/erpProjectPlan/index.vue
@@ -0,0 +1,411 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="mb-[10px]">
+                <el-card shadow="hover">
+                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
+                                    <el-form-item label="项目名称" prop="projectId">
+                                        <el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable filterable>
+                                            <el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
+                                        </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="项目经理" prop="managerId">
+                                        <el-select v-model="queryParams.managerId" placeholder="请选择项目经理" clearable filterable>
+                                            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+                                        </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="项目计划状态" prop="projectPlanStatus">
+                                        <el-select v-model="queryParams.projectPlanStatus" placeholder="请选择项目计划状态" clearable >
+                                            <el-option v-for="dict in project_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                        </el-select>
+                                    </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+            </div>
+        </transition>
+
+        <el-card shadow="never">
+            <template #header>
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:erpProjectPlan:add']">新增</el-button>
+                    </el-col>
+                    <!-- 顶部修改按钮暂不启用，改由操作列提供入口 -->
+                    <!-- <el-col :span="1.5">
+                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:erpProjectPlan:edit']">修改</el-button>
+                    </el-col> -->
+                    <el-col :span="1.5">
+                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:erpProjectPlan:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:erpProjectPlan:export']">导出</el-button>
+                    </el-col>
+                    <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+                </el-row>
+            </template>
+
+            <el-table v-loading="loading" border :data="erpProjectPlanList" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column label="项目计划ID" align="center" prop="projectPlanId" v-if="columns[0].visible"/>
+                        <el-table-column label="项目名称" align="center" prop="projectName" width="200" v-if="columns[2].visible"/>
+                        <el-table-column label="项目经理" align="center" prop="managerName" v-if="columns[3].visible"/>
+                        <el-table-column label="部门负责人" align="center" prop="chargeName" v-if="columns[4].visible"/>
+                        <el-table-column label="付款方式" align="center" prop="paymentMethod" v-if="columns[5].visible"/>
+                        <el-table-column label="项目计划状态" align="center" prop="projectPlanStatus" v-if="columns[6].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="project_plan_status" :value="scope.row.projectPlanStatus"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[7].visible"/>
+                        <el-table-column label="合同名称" align="center" prop="contractName" width="200" v-if="columns[8].visible"/>
+                        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[9].visible"/>
+                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
+                        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[11].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[12].visible"/>
+                        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[13].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                <el-table-column label="操作" align="center" width="150" fixed="right"  class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-tooltip content="查看" placement="top" v-if="scope.row.projectPlanStatus !== '1'">
+                            <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)" v-hasPermi="['oa/erp:erpProjectPlan:query']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="修改" placement="top" v-if="scope.row.projectPlanStatus === '1'">
+                            <el-button link type="primary" icon="Edit" @click="handleEdit(scope.row)" v-hasPermi="['oa/erp:erpProjectPlan:edit']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="维护进度" placement="top" v-if="scope.row.projectPlanStatus === '3' || scope.row.flowStatus === 'finish'">
+                            <el-button link type="primary" icon="EditPen" @click="handleProgress(scope.row)" v-hasPermi="['oa/erp:erpProjectPlan:edit']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="审批记录" placement="top" v-if="scope.row.projectPlanStatus === '2' || scope.row.projectPlanStatus === '3'">
+                            <el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></el-button>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+        <!-- 审批记录 -->
+        <ApprovalRecord ref="approvalRecordRef" />
+        <!-- 添加或修改项目计划对话框 -->
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
+            <el-form ref="erpProjectPlanFormRef" :model="form" :rules="rules" label-width="120px">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="项目名称" prop="projectId">
+                            <el-select v-model="form.projectId" placeholder="请选择项目" filterable @change="handleProjectChangeInDialog">
+                                <el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="项目经理" prop="managerId">
+                            <el-select v-model="form.managerId" placeholder="请选择项目经理" filterable disabled>
+                                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="部门负责人" prop="chargeId">
+                            <el-select v-model="form.chargeId" placeholder="请选择部门负责人" filterable disabled>
+                                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="合同" prop="contractId">
+                            <el-select v-model="form.contractId" placeholder="请选择合同" filterable clearable>
+                                <el-option v-for="item in contractInfoList" :key="item.contractId" :label="item.contractName" :value="item.contractId"/>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="付款方式" prop="paymentMethod">
+                            <el-input v-model="form.paymentMethod" placeholder="（如：3-3-3-1）" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="项目计划状态" prop="projectPlanStatus">
+                            <el-select v-model="form.projectPlanStatus" placeholder="请选择项目计划状态">
+                                <el-option v-for="dict in project_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="排序号" prop="sortOrder">
+                            <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="激活标识" prop="activeFlag">
+                            <el-radio-group v-model="form.activeFlag">
+                                <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{dict.label}}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="ErpProjectPlan" lang="ts">
+    import { listErpProjectPlan, getErpProjectPlan, delErpProjectPlan, addErpProjectPlan, updateErpProjectPlan } from '@/api/oa/erp/erpProjectPlan';
+    import { ErpProjectPlanVO, ErpProjectPlanQuery, ErpProjectPlanForm } from '@/api/oa/erp/erpProjectPlan/types';
+    import { listUser } from '@/api/system/user';
+    import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo';
+    import { getErpContractInfoList } from '@/api/oa/erp/contractInfo';
+    import { useRouter } from 'vue-router';
+    import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+    const router = useRouter();
+        const { active_flag, project_plan_status , project_phases, collection_stage} = toRefs<any>(proxy?.useDict('active_flag', 'project_plan_status', 'project_phases', 'collection_stage'));
+
+    const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+    const erpProjectPlanList = ref<ErpProjectPlanVO[]>([]);
+    const projectInfoList = ref<any[]>([]);
+    const userList = ref<any[]>([]);
+    const contractInfoList = ref<any[]>([]);
+    const buttonLoading = ref(false);
+    const loading = ref(true);
+    const showSearch = ref(true);
+    const ids = ref<Array<string | number>>([]);
+    const single = ref(true);
+    const multiple = ref(true);
+    const total = ref(0);
+
+    const queryFormRef = ref<ElFormInstance>();
+    const erpProjectPlanFormRef = ref<ElFormInstance>();
+
+    const dialog = reactive<DialogOption>({
+        visible: false,
+        title: ''
+    });
+
+    // 列显隐信息
+    const columns = ref<FieldOption[]>([
+            { key: 0, label: `项目计划ID`, visible: false },
+            { key: 1, label: `租户编号`, visible: false },
+            { key: 2, label: `项目名称`, visible: true },
+            { key: 3, label: `项目经理`, visible: true },
+            { key: 4, label: `部门负责人`, visible: true },
+            { key: 5, label: `付款方式`, visible: true },
+            { key: 6, label: `项目计划状态`, visible: true },
+            { key: 7, label: `流程状态`, visible: false },
+            { key: 8, label: `合同名称`, visible: true },
+            { key: 9, label: `排序号`, visible: false },
+            { key: 10, label: `备注`, visible: false },
+            { key: 11, label: `激活标识`, visible: false },
+            { key: 12, label: `创建人`, visible: true },
+            { key: 13, label: `创建时间`, visible: true },
+    ]);
+
+    const initFormData: ErpProjectPlanForm = {
+                        projectPlanId: undefined,
+                        projectId: undefined,
+                        managerId: undefined,
+                        chargeId: undefined,
+                        paymentMethod: undefined,
+                        projectPlanStatus: undefined,
+                        flowStatus: undefined,
+                        sortOrder: undefined,
+                        contractId: undefined,
+                        remark: undefined,
+                        activeFlag: undefined,
+    }
+    const data = reactive<PageData<ErpProjectPlanForm, ErpProjectPlanQuery>>({
+        form: {...initFormData},
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+                            projectId: undefined,
+                            managerId: undefined,
+                            chargeId: undefined,
+                            paymentMethod: undefined,
+                            projectPlanStatus: undefined,
+                            flowStatus: undefined,
+                            sortOrder: undefined,
+                            contractId: undefined,
+                            activeFlag: undefined,
+            params: {
+            }
+        },
+        rules: {
+                            projectPlanId: [
+                            { required: true, message: "项目计划ID不能为空", trigger: "blur" }
+                        ],
+        }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询项目计划列表 */
+    const getList = async () => {
+        loading.value = true;
+        const res = await listErpProjectPlan(queryParams.value);
+            erpProjectPlanList.value = res.rows;
+        total.value = res.total;
+        loading.value = false;
+    }
+
+    /** 获取项目列表 */
+    const getProjectInfoList = async () => {
+        const res = await getErpProjectInfoList({});
+        projectInfoList.value = res.data;
+    }
+
+    /** 获取用户列表 */
+    const getUserList = async () => {
+        const res = await listUser({ pageNum: 1, pageSize: 9999 });
+        userList.value = res.rows;
+    }
+
+    /** 获取合同列表 */
+    const getContractInfoList = async () => {
+        const res = await getErpContractInfoList({});
+        contractInfoList.value = res.data;
+    }
+
+    /** 取消按钮 */
+    const cancel = () => {
+        reset();
+        dialog.visible = false;
+    }
+
+    /** 表单重置 */
+    const reset = () => {
+        form.value = {...initFormData};
+            erpProjectPlanFormRef.value?.resetFields();
+    }
+
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        queryFormRef.value?.resetFields();
+        handleQuery();
+    }
+
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: ErpProjectPlanVO[]) => {
+        ids.value = selection.map(item => item.projectPlanId);
+        single.value = selection.length != 1;
+        multiple.value = !selection.length;
+    }
+
+    /** 对话框中处理项目选择变化，自动填充项目经理和部门负责人 */
+    const handleProjectChangeInDialog = (projectId: number) => {
+        if (!projectId) {
+            form.value.managerId = undefined;
+            form.value.chargeId = undefined;
+            return;
+        }
+        const project = projectInfoList.value.find(p => p.projectId === projectId);
+        if (project) {
+            form.value.managerId = project.managerId;
+            form.value.chargeId = project.chargeId;
+        }
+    }
+
+    /** 新增按钮操作 */
+    const handleAdd = () => {
+        router.push('/oa/erp/erpProjectPlan/edit/0');
+    }
+
+    /** 查看按钮操作 */
+    const handleView = (row: ErpProjectPlanVO) => {
+        router.push(`/oa/erp/erpProjectPlan/view/${row.projectPlanId}?type=view`);
+    }
+
+    /** 编辑按钮操作 */
+    const handleEdit = (row: ErpProjectPlanVO) => {
+        router.push(`/oa/erp/erpProjectPlan/edit/${row.projectPlanId}?type=edit`);
+    }
+
+    /** 审批完成后维护延期与进度 */
+    const handleProgress = (row: ErpProjectPlanVO) => {
+        router.push(`/oa/erp/erpProjectPlan/edit/${row.projectPlanId}?type=edit`);
+    }
+
+    // 查看审批记录
+    const handleApprovalRecord = (row: ErpProjectPlanVO) => {
+        approvalRecordRef.value?.init(row.projectPlanId);
+    }
+
+    /** 修改按钮操作（保留用于对话框形式） */
+    const handleUpdate = async (row?: ErpProjectPlanVO) => {
+        reset();
+        const _projectPlanId = row?.projectPlanId || ids.value[0]
+        const res = await getErpProjectPlan(_projectPlanId);
+        Object.assign(form.value, res.data);
+        dialog.visible = true;
+        dialog.title = "修改项目计划";
+    }
+
+    /** 提交按钮 */
+    const submitForm = () => {
+            erpProjectPlanFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                buttonLoading.value = true;
+                if (form.value.projectPlanId) {
+                    await updateErpProjectPlan(form.value).finally(() =>  buttonLoading.value = false);
+                } else {
+                    await addErpProjectPlan(form.value).finally(() =>  buttonLoading.value = false);
+                }
+                proxy?.$modal.msgSuccess("操作成功");
+                dialog.visible = false;
+                await getList();
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: ErpProjectPlanVO) => {
+        const _projectPlanIds = row?.projectPlanId || ids.value;
+        await proxy?.$modal.confirm('是否确认删除项目计划编号为"' + _projectPlanIds + '"的数据项？').finally(() => loading.value = false);
+        await delErpProjectPlan(_projectPlanIds);
+        proxy?.$modal.msgSuccess("删除成功");
+        await getList();
+    }
+
+    /** 导出按钮操作 */
+    const handleExport = () => {
+        proxy?.download('oa/erp/erpProjectPlan/export', {
+            ...queryParams.value
+        }, `erpProjectPlan_${new Date().getTime()}.xlsx`)
+    }
+
+    onMounted(() => {
+        getList();
+        getProjectInfoList();
+        getUserList();
+        getContractInfoList();
+    });
+</script>
diff --git a/src/views/oa/erp/erpProjectPlan/index.vue.backup b/src/views/oa/erp/erpProjectPlan/index.vue.backup
new file mode 100644
index 0000000..7416f93
--- /dev/null
+++ b/src/views/oa/erp/erpProjectPlan/index.vue.backup
@@ -0,0 +1,402 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="mb-[10px]">
+                <el-card shadow="hover">
+                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
+                                    <el-form-item label="项目名称" prop="projectId">
+                                        <el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable filterable>
+                                            <el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
+                                        </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="项目经理" prop="managerId">
+                                        <el-select v-model="queryParams.managerId" placeholder="请选择项目经理" clearable filterable>
+                                            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+                                        </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="项目计划状态" prop="projectPlanStatus">
+                                        <el-select v-model="queryParams.projectPlanStatus" placeholder="请选择项目计划状态" clearable >
+                                            <el-option v-for="dict in project_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                        </el-select>
+                                    </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+            </div>
+        </transition>
+
+        <el-card shadow="never">
+            <template #header>
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:erpProjectPlan:add']">新增</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:erpProjectPlan:edit']">修改</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:erpProjectPlan:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:erpProjectPlan:export']">导出</el-button>
+                    </el-col>
+                    <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+                </el-row>
+            </template>
+
+            <el-table v-loading="loading" border :data="erpProjectPlanList" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column label="项目计划ID" align="center" prop="projectPlanId" v-if="columns[0].visible"/>
+                        <el-table-column label="项目名称" align="center" prop="projectName" width="200" v-if="columns[2].visible"/>
+                        <el-table-column label="项目经理" align="center" prop="managerName" v-if="columns[3].visible"/>
+                        <el-table-column label="部门负责人" align="center" prop="chargeName" v-if="columns[4].visible"/>
+                        <el-table-column label="付款方式" align="center" prop="paymentMethod" v-if="columns[5].visible"/>
+                        <el-table-column label="项目计划状态" align="center" prop="projectPlanStatus" v-if="columns[6].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="project_plan_status" :value="scope.row.projectPlanStatus"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[7].visible"/>
+                        <el-table-column label="合同名称" align="center" prop="contractName" width="200" v-if="columns[8].visible"/>
+                        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[9].visible"/>
+                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
+                        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[11].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[12].visible"/>
+                        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[13].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                <el-table-column label="操作" align="center" width="150" fixed="right"  class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-tooltip content="查看" placement="top" v-if="scope.row.projectPlanStatus !== '1'">
+                            <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)" v-hasPermi="['oa/erp:erpProjectPlan:query']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="修改" placement="top" v-if="scope.row.projectPlanStatus === '1'">
+                            <el-button link type="primary" icon="Edit" @click="handleEdit(scope.row)" v-hasPermi="['oa/erp:erpProjectPlan:edit']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="审批记录" placement="top" v-if="scope.row.projectPlanStatus === '2' || scope.row.projectPlanStatus === '3'">
+                            <el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></el-button>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+        <!-- 审批记录 -->
+        <ApprovalRecord ref="approvalRecordRef" />
+        <!-- 添加或修改项目计划对话框 -->
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
+            <el-form ref="erpProjectPlanFormRef" :model="form" :rules="rules" label-width="120px">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="项目名称" prop="projectId">
+                            <el-select v-model="form.projectId" placeholder="请选择项目" filterable @change="handleProjectChangeInDialog">
+                                <el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="项目经理" prop="managerId">
+                            <el-select v-model="form.managerId" placeholder="请选择项目经理" filterable disabled>
+                                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="部门负责人" prop="chargeId">
+                            <el-select v-model="form.chargeId" placeholder="请选择部门负责人" filterable disabled>
+                                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="合同" prop="contractId">
+                            <el-select v-model="form.contractId" placeholder="请选择合同" filterable clearable>
+                                <el-option v-for="item in contractInfoList" :key="item.contractId" :label="item.contractName" :value="item.contractId"/>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="付款方式" prop="paymentMethod">
+                            <el-input v-model="form.paymentMethod" placeholder="（如：3-3-3-1）" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="项目计划状态" prop="projectPlanStatus">
+                            <el-select v-model="form.projectPlanStatus" placeholder="请选择项目计划状态">
+                                <el-option v-for="dict in project_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="排序号" prop="sortOrder">
+                            <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="激活标识" prop="activeFlag">
+                            <el-radio-group v-model="form.activeFlag">
+                                <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{dict.label}}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="ErpProjectPlan" lang="ts">
+    import { listErpProjectPlan, getErpProjectPlan, delErpProjectPlan, addErpProjectPlan, updateErpProjectPlan } from '@/api/oa/erp/erpProjectPlan';
+    import { ErpProjectPlanVO, ErpProjectPlanQuery, ErpProjectPlanForm } from '@/api/oa/erp/erpProjectPlan/types';
+    import { listUser } from '@/api/system/user';
+    import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo';
+    import { getErpContractInfoList } from '@/api/oa/erp/contractInfo';
+    import { useRouter } from 'vue-router';
+    import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+    const router = useRouter();
+        const { active_flag, project_plan_status , project_phases, collection_stage} = toRefs<any>(proxy?.useDict('active_flag', 'project_plan_status', 'project_phases', 'collection_stage'));
+
+    const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+    const erpProjectPlanList = ref<ErpProjectPlanVO[]>([]);
+    const projectInfoList = ref<any[]>([]);
+    const userList = ref<any[]>([]);
+    const contractInfoList = ref<any[]>([]);
+    const buttonLoading = ref(false);
+    const loading = ref(true);
+    const showSearch = ref(true);
+    const ids = ref<Array<string | number>>([]);
+    const single = ref(true);
+    const multiple = ref(true);
+    const total = ref(0);
+
+    const queryFormRef = ref<ElFormInstance>();
+    const erpProjectPlanFormRef = ref<ElFormInstance>();
+
+    const dialog = reactive<DialogOption>({
+        visible: false,
+        title: ''
+    });
+
+    // 列显隐信息
+    const columns = ref<FieldOption[]>([
+            { key: 0, label: `项目计划ID`, visible: false },
+            { key: 1, label: `租户编号`, visible: false },
+            { key: 2, label: `项目名称`, visible: true },
+            { key: 3, label: `项目经理`, visible: true },
+            { key: 4, label: `部门负责人`, visible: true },
+            { key: 5, label: `付款方式`, visible: true },
+            { key: 6, label: `项目计划状态`, visible: true },
+            { key: 7, label: `流程状态`, visible: false },
+            { key: 8, label: `合同名称`, visible: true },
+            { key: 9, label: `排序号`, visible: false },
+            { key: 10, label: `备注`, visible: false },
+            { key: 11, label: `激活标识`, visible: false },
+            { key: 12, label: `创建人`, visible: true },
+            { key: 13, label: `创建时间`, visible: true },
+    ]);
+
+    const initFormData: ErpProjectPlanForm = {
+                        projectPlanId: undefined,
+                        projectId: undefined,
+                        managerId: undefined,
+                        chargeId: undefined,
+                        paymentMethod: undefined,
+                        projectPlanStatus: undefined,
+                        flowStatus: undefined,
+                        sortOrder: undefined,
+                        contractId: undefined,
+                        remark: undefined,
+                        activeFlag: undefined,
+    }
+    const data = reactive<PageData<ErpProjectPlanForm, ErpProjectPlanQuery>>({
+        form: {...initFormData},
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+                            projectId: undefined,
+                            managerId: undefined,
+                            chargeId: undefined,
+                            paymentMethod: undefined,
+                            projectPlanStatus: undefined,
+                            flowStatus: undefined,
+                            sortOrder: undefined,
+                            contractId: undefined,
+                            activeFlag: undefined,
+            params: {
+            }
+        },
+        rules: {
+                            projectPlanId: [
+                            { required: true, message: "项目计划ID不能为空", trigger: "blur" }
+                        ],
+        }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询项目计划列表 */
+    const getList = async () => {
+        loading.value = true;
+        const res = await listErpProjectPlan(queryParams.value);
+            erpProjectPlanList.value = res.rows;
+        total.value = res.total;
+        loading.value = false;
+    }
+
+    /** 获取项目列表 */
+    const getProjectInfoList = async () => {
+        const res = await getErpProjectInfoList({});
+        projectInfoList.value = res.data;
+    }
+
+    /** 获取用户列表 */
+    const getUserList = async () => {
+        const res = await listUser({ pageNum: 1, pageSize: 9999 });
+        userList.value = res.rows;
+    }
+
+    /** 获取合同列表 */
+    const getContractInfoList = async () => {
+        const res = await getErpContractInfoList({});
+        contractInfoList.value = res.data;
+    }
+
+    /** 取消按钮 */
+    const cancel = () => {
+        reset();
+        dialog.visible = false;
+    }
+
+    /** 表单重置 */
+    const reset = () => {
+        form.value = {...initFormData};
+            erpProjectPlanFormRef.value?.resetFields();
+    }
+
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        queryFormRef.value?.resetFields();
+        handleQuery();
+    }
+
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: ErpProjectPlanVO[]) => {
+        ids.value = selection.map(item => item.projectPlanId);
+        single.value = selection.length != 1;
+        multiple.value = !selection.length;
+    }
+
+    /** 对话框中处理项目选择变化，自动填充项目经理和部门负责人 */
+    const handleProjectChangeInDialog = (projectId: number) => {
+        if (!projectId) {
+            form.value.managerId = undefined;
+            form.value.chargeId = undefined;
+            return;
+        }
+        const project = projectInfoList.value.find(p => p.projectId === projectId);
+        if (project) {
+            form.value.managerId = project.managerId;
+            form.value.chargeId = project.chargeId;
+        }
+    }
+
+    /** 新增按钮操作 */
+    const handleAdd = () => {
+        router.push('/oa/erp/erpProjectPlan/edit/0');
+    }
+
+    /** 查看按钮操作 */
+    const handleView = (row: ErpProjectPlanVO) => {
+        router.push(`/oa/erp/erpProjectPlan/view/${row.projectPlanId}?type=view`);
+    }
+
+    /** 编辑按钮操作 */
+    const handleEdit = (row: ErpProjectPlanVO) => {
+        router.push(`/oa/erp/erpProjectPlan/edit/${row.projectPlanId}?type=edit`);
+    }
+
+    // 查看审批记录
+    const handleApprovalRecord = (row: ErpProjectPlanVO) => {
+        approvalRecordRef.value?.init(row.projectPlanId);
+    }
+
+    /** 修改按钮操作（保留用于对话框形式） */
+    const handleUpdate = async (row?: ErpProjectPlanVO) => {
+        reset();
+        const _projectPlanId = row?.projectPlanId || ids.value[0]
+        const res = await getErpProjectPlan(_projectPlanId);
+        Object.assign(form.value, res.data);
+        dialog.visible = true;
+        dialog.title = "修改项目计划";
+    }
+
+    /** 提交按钮 */
+    const submitForm = () => {
+            erpProjectPlanFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                buttonLoading.value = true;
+                if (form.value.projectPlanId) {
+                    await updateErpProjectPlan(form.value).finally(() =>  buttonLoading.value = false);
+                } else {
+                    await addErpProjectPlan(form.value).finally(() =>  buttonLoading.value = false);
+                }
+                proxy?.$modal.msgSuccess("操作成功");
+                dialog.visible = false;
+                await getList();
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: ErpProjectPlanVO) => {
+        const _projectPlanIds = row?.projectPlanId || ids.value;
+        await proxy?.$modal.confirm('是否确认删除项目计划编号为"' + _projectPlanIds + '"的数据项？').finally(() => loading.value = false);
+        await delErpProjectPlan(_projectPlanIds);
+        proxy?.$modal.msgSuccess("删除成功");
+        await getList();
+    }
+
+    /** 导出按钮操作 */
+    const handleExport = () => {
+        proxy?.download('oa/erp/erpProjectPlan/export', {
+            ...queryParams.value
+        }, `erpProjectPlan_${new Date().getTime()}.xlsx`)
+    }
+
+    onMounted(() => {
+        getList();
+        getProjectInfoList();
+        getUserList();
+        getContractInfoList();
+    });
+</script>
diff --git a/src/views/oa/erp/erpProjectPlanStage/index.vue b/src/views/oa/erp/erpProjectPlanStage/index.vue
new file mode 100644
index 0000000..7ead168
--- /dev/null
+++ b/src/views/oa/erp/erpProjectPlanStage/index.vue
@@ -0,0 +1,511 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="mb-[10px]">
+                <el-card shadow="hover">
+                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
+                                    <el-form-item label="项目ID" prop="projectId">
+                                        <el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="项目计划ID" prop="projectPlanId">
+                                        <el-input v-model="queryParams.projectPlanId" placeholder="请输入项目计划ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="项目阶段" prop="projectPhases">
+                                        <el-input v-model="queryParams.projectPhases" placeholder="请输入项目阶段" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="计划开始时间" prop="planStartTime">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.planStartTime"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择计划开始时间"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="计划结束时间" prop="planEndTime">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.planEndTime"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择计划结束时间"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="回款阶段" prop="collectionStage">
+                                        <el-input v-model="queryParams.collectionStage" placeholder="请输入回款阶段" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="预计回款比例(%)" prop="repaymentRate">
+                                        <el-input v-model="queryParams.repaymentRate" placeholder="请输入预计回款比例(%)" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="预计回款金额" prop="repaymentAmount">
+                                        <el-input v-model="queryParams.repaymentAmount" placeholder="请输入预计回款金额" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="预计回款时间" prop="repaymentTime">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.repaymentTime"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择预计回款时间"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="回款延期天数" prop="delayDay">
+                                        <el-input v-model="queryParams.delayDay" placeholder="请输入回款延期天数" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="应收款日期" prop="receivableDate">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.receivableDate"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择应收款日期"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="原因说明" prop="reasonsExplanation">
+                                        <el-input v-model="queryParams.reasonsExplanation" placeholder="请输入原因说明" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="进度备注" prop="scheduleRemark">
+                                        <el-input v-model="queryParams.scheduleRemark" placeholder="请输入进度备注" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="实际开始时间" prop="realStartTime">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.realStartTime"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择实际开始时间"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="实际结束时间" prop="realEndTime">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.realEndTime"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择实际结束时间"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="排序号" prop="sortOrder">
+                                        <el-input v-model="queryParams.sortOrder" placeholder="请输入排序号" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="激活标识" prop="activeFlag">
+                                        <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                                            <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                        </el-select>
+                                    </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+            </div>
+        </transition>
+
+        <el-card shadow="never">
+            <template #header>
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:erpProjectPlanStage:add']">新增</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:erpProjectPlanStage:edit']">修改</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:erpProjectPlanStage:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:erpProjectPlanStage:export']">导出</el-button>
+                    </el-col>
+                    <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+                </el-row>
+            </template>
+
+            <el-table v-loading="loading" border :data="erpProjectPlanStageList" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column label="计划阶段ID" align="center" prop="planStageId" v-if="columns[0].visible"/>
+                        <el-table-column label="项目ID" align="center" prop="projectId" v-if="columns[2].visible"/>
+                        <el-table-column label="项目计划ID" align="center" prop="projectPlanId" v-if="columns[3].visible"/>
+                        <el-table-column label="项目阶段" align="center" prop="projectPhases" v-if="columns[4].visible"/>
+                        <el-table-column label="计划开始时间" align="center" prop="planStartTime" width="180" v-if="columns[5].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="计划结束时间" align="center" prop="planEndTime" width="180" v-if="columns[6].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="回款阶段" align="center" prop="collectionStage" v-if="columns[7].visible"/>
+                        <el-table-column label="预计回款比例(%)" align="center" prop="repaymentRate" v-if="columns[8].visible"/>
+                        <el-table-column label="预计回款金额" align="center" prop="repaymentAmount" v-if="columns[9].visible"/>
+                        <el-table-column label="预计回款时间" align="center" prop="repaymentTime" width="180" v-if="columns[10].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.repaymentTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="回款延期天数" align="center" prop="delayDay" v-if="columns[11].visible"/>
+                        <el-table-column label="应收款日期" align="center" prop="receivableDate" width="180" v-if="columns[12].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.receivableDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="原因说明" align="center" prop="reasonsExplanation" v-if="columns[13].visible"/>
+                        <el-table-column label="进度备注" align="center" prop="scheduleRemark" v-if="columns[14].visible"/>
+                        <el-table-column label="实际开始时间" align="center" prop="realStartTime" width="180" v-if="columns[15].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.realStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="实际结束时间" align="center" prop="realEndTime" width="180" v-if="columns[16].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[17].visible"/>
+                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[18].visible"/>
+                        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[19].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+                            </template>
+                        </el-table-column>
+                <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-tooltip content="修改" placement="top">
+                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:erpProjectPlanStage:edit']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="删除" placement="top">
+                            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/erp:erpProjectPlanStage:remove']"></el-button>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+        <!-- 添加或修改项目计划阶段对话框 -->
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+            <el-form ref="erpProjectPlanStageFormRef" :model="form" :rules="rules" label-width="120px">
+                            <el-form-item label="项目ID" prop="projectId">
+                                <el-input v-model="form.projectId" placeholder="请输入项目ID" />
+                            </el-form-item>
+                            <el-form-item label="项目计划ID" prop="projectPlanId">
+                                <el-input v-model="form.projectPlanId" placeholder="请输入项目计划ID" />
+                            </el-form-item>
+                            <el-form-item label="项目阶段" prop="projectPhases">
+                                <el-select v-model="form.projectPhases" placeholder="请选择项目阶段" clearable style="width: 100%">
+                                    <el-option v-for="dict in project_phases" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="计划开始时间" prop="planStartTime">
+                                <el-date-picker clearable
+                                                v-model="form.planStartTime"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择计划开始时间">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="计划结束时间" prop="planEndTime">
+                                <el-date-picker clearable
+                                                v-model="form.planEndTime"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择计划结束时间">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="回款阶段" prop="collectionStage">
+                                <el-select v-model="form.collectionStage" placeholder="请选择回款阶段" clearable style="width: 100%">
+                                    <el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="预计回款比例(%)" prop="repaymentRate">
+                                <el-input v-model="form.repaymentRate" placeholder="请输入预计回款比例(%)" />
+                            </el-form-item>
+                            <el-form-item label="预计回款金额" prop="repaymentAmount">
+                                <el-input v-model="form.repaymentAmount" placeholder="请输入预计回款金额" />
+                            </el-form-item>
+                            <el-form-item label="预计回款时间" prop="repaymentTime">
+                                <el-date-picker clearable
+                                                v-model="form.repaymentTime"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择预计回款时间"
+                                                @change="recalcReceivableDate(form)">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="回款延期天数" prop="delayDay">
+                                <el-input v-model="form.delayDay" placeholder="请输入回款延期天数" @change="recalcReceivableDate(form)" />
+                            </el-form-item>
+                            <el-form-item label="应收款日期" prop="receivableDate">
+                                <el-date-picker clearable
+                                                v-model="form.receivableDate"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择应收款日期">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="原因说明" prop="reasonsExplanation">
+                                <el-input v-model="form.reasonsExplanation" type="textarea" placeholder="请输入内容" />
+                            </el-form-item>
+                            <el-form-item label="进度备注" prop="scheduleRemark">
+                                <el-input v-model="form.scheduleRemark" placeholder="请输入进度备注" />
+                            </el-form-item>
+                            <el-form-item label="实际开始时间" prop="realStartTime">
+                                <el-date-picker clearable
+                                                v-model="form.realStartTime"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择实际开始时间">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="实际结束时间" prop="realEndTime">
+                                <el-date-picker clearable
+                                                v-model="form.realEndTime"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择实际结束时间">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="排序号" prop="sortOrder">
+                                <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+                            </el-form-item>
+                            <el-form-item label="备注" prop="remark">
+                                <el-input v-model="form.remark" placeholder="请输入备注" />
+                            </el-form-item>
+                            <el-form-item label="激活标识" prop="activeFlag">
+                                <el-radio-group v-model="form.activeFlag">
+                                    <el-radio
+                                        v-for="dict in active_flag"
+                                        :key="dict.value"
+                                        :value="dict.value"
+                                    >{{dict.label}}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="ErpProjectPlanStage" lang="ts">
+    import { listErpProjectPlanStage, getErpProjectPlanStage, delErpProjectPlanStage, addErpProjectPlanStage, updateErpProjectPlanStage } from '@/api/oa/erp/erpProjectPlanStage';
+    import { ErpProjectPlanStageVO, ErpProjectPlanStageQuery, ErpProjectPlanStageForm } from '@/api/oa/erp/erpProjectPlanStage/types';
+
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+        const { active_flag, project_plan_status , project_phases, collection_stage} = toRefs<any>(proxy?.useDict('active_flag', 'project_plan_status', 'project_phases', 'collection_stage'));
+
+    const erpProjectPlanStageList = ref<ErpProjectPlanStageVO[]>([]);
+    const buttonLoading = ref(false);
+    const loading = ref(true);
+    const showSearch = ref(true);
+    const ids = ref<Array<string | number>>([]);
+    const single = ref(true);
+    const multiple = ref(true);
+    const total = ref(0);
+
+    const queryFormRef = ref<ElFormInstance>();
+    const erpProjectPlanStageFormRef = ref<ElFormInstance>();
+
+    const dialog = reactive<DialogOption>({
+        visible: false,
+        title: ''
+    });
+
+    // 列显隐信息
+    const columns = ref<FieldOption[]>([
+            { key: 0, label: `计划阶段ID`, visible: true },
+            { key: 1, label: `租户编号`, visible: true },
+            { key: 2, label: `项目ID`, visible: true },
+            { key: 3, label: `项目计划ID`, visible: true },
+            { key: 4, label: `项目阶段`, visible: true },
+            { key: 5, label: `计划开始时间`, visible: true },
+            { key: 6, label: `计划结束时间`, visible: true },
+            { key: 7, label: `回款阶段`, visible: true },
+            { key: 8, label: `预计回款比例(%)`, visible: true },
+            { key: 9, label: `预计回款金额`, visible: true },
+            { key: 10, label: `预计回款时间`, visible: true },
+            { key: 11, label: `回款延期天数`, visible: true },
+            { key: 12, label: `应收款日期`, visible: true },
+            { key: 13, label: `原因说明`, visible: true },
+            { key: 14, label: `进度备注`, visible: true },
+            { key: 15, label: `实际开始时间`, visible: true },
+            { key: 16, label: `实际结束时间`, visible: true },
+            { key: 17, label: `排序号`, visible: true },
+            { key: 18, label: `备注`, visible: true },
+            { key: 19, label: `激活标识`, visible: true },
+            { key: 20, label: `删除标志`, visible: true },
+            { key: 21, label: `创建部门`, visible: true },
+            { key: 22, label: `创建人`, visible: true },
+            { key: 23, label: `创建时间`, visible: true },
+            { key: 24, label: `更新人`, visible: true },
+            { key: 25, label: `更新时间`, visible: true },
+    ]);
+
+    const initFormData: ErpProjectPlanStageForm = {
+                        planStageId: undefined,
+                        projectId: undefined,
+                        projectPlanId: undefined,
+                        projectPhases: undefined,
+                        planStartTime: undefined,
+                        planEndTime: undefined,
+                        collectionStage: undefined,
+                        repaymentRate: undefined,
+                        repaymentAmount: undefined,
+                        repaymentTime: undefined,
+                        delayDay: undefined,
+                        receivableDate: undefined,
+                        reasonsExplanation: undefined,
+                        scheduleRemark: undefined,
+                        realStartTime: undefined,
+                        realEndTime: undefined,
+                        sortOrder: undefined,
+                        remark: undefined,
+                        activeFlag: undefined,
+    }
+    const data = reactive<PageData<ErpProjectPlanStageForm, ErpProjectPlanStageQuery>>({
+        form: {...initFormData},
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+                            projectId: undefined,
+                            projectPlanId: undefined,
+                            projectPhases: undefined,
+                            planStartTime: undefined,
+                            planEndTime: undefined,
+                            collectionStage: undefined,
+                            repaymentRate: undefined,
+                            repaymentAmount: undefined,
+                            repaymentTime: undefined,
+                            delayDay: undefined,
+                            receivableDate: undefined,
+                            reasonsExplanation: undefined,
+                            scheduleRemark: undefined,
+                            realStartTime: undefined,
+                            realEndTime: undefined,
+                            sortOrder: undefined,
+                            activeFlag: undefined,
+            params: {
+            }
+        },
+        rules: {
+                            planStageId: [
+                            { required: true, message: "计划阶段ID不能为空", trigger: "blur" }
+                        ],
+        }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询项目计划阶段列表 */
+    const getList = async () => {
+        loading.value = true;
+        const res = await listErpProjectPlanStage(queryParams.value);
+            erpProjectPlanStageList.value = res.rows;
+        total.value = res.total;
+        loading.value = false;
+    }
+
+    /** 取消按钮 */
+    const cancel = () => {
+        reset();
+        dialog.visible = false;
+    }
+
+    /** 表单重置 */
+    const reset = () => {
+        form.value = {...initFormData};
+            erpProjectPlanStageFormRef.value?.resetFields();
+    }
+
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        queryFormRef.value?.resetFields();
+        handleQuery();
+    }
+
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: ErpProjectPlanStageVO[]) => {
+        ids.value = selection.map(item => item.planStageId);
+        single.value = selection.length != 1;
+        multiple.value = !selection.length;
+    }
+
+    /** 新增按钮操作 */
+    const handleAdd = () => {
+        reset();
+        dialog.visible = true;
+        dialog.title = "添加项目计划阶段";
+    }
+
+    /** 修改按钮操作 */
+    const handleUpdate = async (row?: ErpProjectPlanStageVO) => {
+        reset();
+        const _planStageId = row?.planStageId || ids.value[0]
+        const res = await getErpProjectPlanStage(_planStageId);
+        Object.assign(form.value, res.data);
+        dialog.visible = true;
+        dialog.title = "修改项目计划阶段";
+    }
+
+    /** 提交按钮 */
+    const submitForm = () => {
+            erpProjectPlanStageFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                buttonLoading.value = true;
+                if (form.value.planStageId) {
+                    await updateErpProjectPlanStage(form.value).finally(() =>  buttonLoading.value = false);
+                } else {
+                    await addErpProjectPlanStage(form.value).finally(() =>  buttonLoading.value = false);
+                }
+                proxy?.$modal.msgSuccess("操作成功");
+                dialog.visible = false;
+                await getList();
+            }
+        });
+    }
+
+    /** 根据回款时间与延期天数生成应收款日期 */
+    const recalcReceivableDate = (row: any) => {
+        if (!row) return;
+        const time = row.repaymentTime;
+        const delay = Number(row.delayDay || 0);
+        if (!time) {
+            row.receivableDate = undefined;
+            return;
+        }
+        const base = new Date(time as string);
+        if (isNaN(base.getTime())) {
+            row.receivableDate = undefined;
+            return;
+        }
+        const target = new Date(base.getTime());
+        target.setDate(target.getDate() + delay);
+        row.receivableDate = proxy?.parseTime ? proxy.parseTime(target, '{y}-{m}-{d} {h}:{i}:{s}') : target.toISOString().slice(0, 19).replace('T', ' ');
+    }
+
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: ErpProjectPlanStageVO) => {
+        const _planStageIds = row?.planStageId || ids.value;
+        await proxy?.$modal.confirm('是否确认删除项目计划阶段编号为"' + _planStageIds + '"的数据项？').finally(() => loading.value = false);
+        await delErpProjectPlanStage(_planStageIds);
+        proxy?.$modal.msgSuccess("删除成功");
+        await getList();
+    }
+
+    /** 导出按钮操作 */
+    const handleExport = () => {
+        proxy?.download('oa/erp/erpProjectPlanStage/export', {
+            ...queryParams.value
+        }, `erpProjectPlanStage_${new Date().getTime()}.xlsx`)
+    }
+
+    onMounted(() => {
+        getList();
+    });
+</script>