diff --git a/src/api/oa/crm/crmQuoteInfo/index.ts b/src/api/oa/crm/crmQuoteInfo/index.ts
new file mode 100644
index 0000000..6a73639
--- /dev/null
+++ b/src/api/oa/crm/crmQuoteInfo/index.ts
@@ -0,0 +1,98 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CrmQuoteInfoVO, CrmQuoteInfoForm, CrmQuoteInfoQuery } from '@/api/oa/crm/crmQuoteInfo/types';
+
+/**
+ * 查询报价单信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCrmQuoteInfo = (query?: CrmQuoteInfoQuery): AxiosPromise<CrmQuoteInfoVO[]> => {
+  return request({
+    url: '/oa/crm/crmQuoteInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询报价单信息详细
+ * @param quoteId
+ */
+export const getCrmQuoteInfo = (quoteId: string | number): AxiosPromise<CrmQuoteInfoVO> => {
+  return request({
+    url: '/oa/crm/crmQuoteInfo/' + quoteId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增报价单信息
+ * @param data
+ */
+export const addCrmQuoteInfo = (data: CrmQuoteInfoForm) => {
+  return request({
+    url: '/oa/crm/crmQuoteInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改报价单信息
+ * @param data
+ */
+export const updateCrmQuoteInfo = (data: CrmQuoteInfoForm) => {
+  return request({
+    url: '/oa/crm/crmQuoteInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除报价单信息
+ * @param quoteId
+ */
+export const delCrmQuoteInfo = (quoteId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/crm/crmQuoteInfo/' + quoteId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询报价单信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getCrmQuoteInfoList (query) {
+    return request({
+        url: '/oa/crm/crmQuoteInfo/getCrmQuoteInfoList',
+        method: 'get',
+        params: query
+    });
+};
+
+/**
+ * 查看同一次的多轮报价集合
+ * @param quoteId
+ */
+export const listQuoteRounds = (quoteId: string | number): AxiosPromise<CrmQuoteInfoVO[]> => {
+  return request({
+    url: '/oa/crm/crmQuoteInfo/rounds/' + quoteId,
+    method: 'get'
+  });
+};
+
+/**
+ * 根据报价明细回写主表金额汇总
+ * @param quoteId
+ */
+export const recalcQuoteTotals = (quoteId: string | number): AxiosPromise<boolean> => {
+  return request({
+    url: '/oa/crm/crmQuoteInfo/recalc/' + quoteId,
+    method: 'post'
+  });
+};
diff --git a/src/api/oa/crm/crmQuoteInfo/types.ts b/src/api/oa/crm/crmQuoteInfo/types.ts
new file mode 100644
index 0000000..b85bf92
--- /dev/null
+++ b/src/api/oa/crm/crmQuoteInfo/types.ts
@@ -0,0 +1,560 @@
+export interface CrmQuoteInfoVO {
+  /**
+   * 报价ID
+   */
+  quoteId: string | number;
+
+  /**
+   * 报价单号
+   */
+  quoteCode: string;
+
+  /**
+   * 报价单名称
+   */
+  quoteName: string;
+
+  /**
+   * 报价轮次
+   */
+  quoteRound: number;
+
+  /**
+   * 报价大类(1橡机板块 2非橡机板块)
+   */
+  quoteCategory: string;
+
+  /**
+   * 报价类型(1对内 2对外)
+   */
+  quoteType: string;
+
+  /**
+   * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售）
+   */
+  businessDirection: string;
+
+  /**
+   * 部门
+   */
+  quoteDeptId: string | number;
+
+  /**
+   * 报价日期
+   */
+  quoteDate: string;
+
+  /**
+   * 报价有效期起
+   */
+  validFrom: string | number;
+
+  /**
+   * 报价有效期（天）
+   */
+  validDays: string | number;
+
+  /**
+   * 报价有效期止
+   */
+  validTo: string | number;
+
+  /**
+   * 交货期（天）
+   */
+  deliveryPeriod: number;
+
+  /**
+   * 交付/交货方式
+   */
+  deliveryMethod: string;
+
+  /**
+   * 付款方式(1电汇 2承兑)
+   */
+  paymentMethod: string;
+
+  /**
+   * 币种（字典类型）
+   */
+  currencyType: string;
+
+  /**
+   * 含税信息（如：含13%增值税）
+   */
+  taxIncludedInfo: string;
+
+  /**
+   * 税率(默认按明细可覆盖)
+   */
+  taxRate: number;
+
+  /**
+   * 总报价
+   */
+  totalPrice: number;
+
+  /**
+   * 未税总价
+   */
+  totalBeforeTax: number;
+
+  /**
+   * 税额
+   */
+  totalTax: number;
+
+  /**
+   * 含税总价
+   */
+  totalIncludingTax: number;
+
+  /**
+   * 客户方联系人ID
+   */
+  customerContactId: string | number;
+
+  /**
+   * 客户方联系人
+   */
+  customerContactName: string;
+
+  /**
+   * 客户方联系电话
+   */
+  customerContactPhone: string;
+
+  /**
+   * 客户方电子邮箱
+   */
+  customerContactEmail: string;
+
+  /**
+   * 供货方联系人ID
+   */
+  supplierContactId: string | number;
+
+  /**
+   * 供货方联系人
+   */
+  supplierContactName: string;
+
+  /**
+   * 供货方联系电话
+   */
+  supplierContactPhone: string;
+
+  /**
+   * 供货方电子邮箱
+   */
+  supplierContactEmail: string;
+
+  /**
+   * 项目ID(可选)
+   */
+  projectId: string | number;
+
+  /**
+   * 打印模板ID(可选)
+   */
+  templateId: string | number;
+
+  /**
+   * 附件ID
+   */
+  ossId: string | number;
+
+  /**
+   * 报价单状态(1暂存 2审批中 3可用)
+   */
+  quoteStatus: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 报价单子表-物料明细
+   */
+  itemsVo?: CrmQuoteMaterialVO[];
+
+}
+
+export interface CrmQuoteInfoForm extends BaseEntity {
+  /**
+   * 报价ID
+   */
+  quoteId?: string | number;
+
+  /**
+   * 报价单号
+   */
+  quoteCode?: string;
+
+  /**
+   * 报价单名称
+   */
+  quoteName?: string;
+
+  /**
+   * 报价轮次
+   */
+  quoteRound?: number;
+
+  /**
+   * 报价大类(1橡机板块 2非橡机板块)
+   */
+  quoteCategory?: string;
+
+  /**
+   * 报价类型(1对内 2对外)
+   */
+  quoteType?: string;
+
+  /**
+   * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售）
+   */
+  businessDirection?: string;
+
+  /**
+   * 部门
+   */
+  quoteDeptId?: string | number;
+
+  /**
+   * 报价日期
+   */
+  quoteDate?: string;
+
+  /**
+   * 报价有效期起
+   */
+  validFrom?: string | number;
+
+  /**
+   * 报价有效期（天）
+   */
+  validDays?: string | number;
+
+  /**
+   * 报价有效期止
+   */
+  validTo?: string | number;
+
+  /**
+   * 交货期（天）
+   */
+  deliveryPeriod?: number;
+
+  /**
+   * 交付/交货方式
+   */
+  deliveryMethod?: string;
+
+  /**
+   * 付款方式(1电汇 2承兑)
+   */
+  paymentMethod?: string;
+
+  /**
+   * 币种（字典类型）
+   */
+  currencyType?: string;
+
+  /**
+   * 含税信息（如：含13%增值税）
+   */
+  taxIncludedInfo?: string;
+
+  /**
+   * 税率(默认按明细可覆盖)
+   */
+  taxRate?: number;
+
+  /**
+   * 总报价
+   */
+  totalPrice?: number;
+
+  /**
+   * 未税总价
+   */
+  totalBeforeTax?: number;
+
+  /**
+   * 税额
+   */
+  totalTax?: number;
+
+  /**
+   * 含税总价
+   */
+  totalIncludingTax?: number;
+
+  /**
+   * 客户方联系人ID
+   */
+  customerContactId?: string | number;
+
+  /**
+   * 客户方联系人
+   */
+  customerContactName?: string;
+
+  /**
+   * 客户方联系电话
+   */
+  customerContactPhone?: string;
+
+  /**
+   * 客户方电子邮箱
+   */
+  customerContactEmail?: string;
+
+  /**
+   * 供货方联系人ID
+   */
+  supplierContactId?: string | number;
+
+  /**
+   * 供货方联系人
+   */
+  supplierContactName?: string;
+
+  /**
+   * 供货方联系电话
+   */
+  supplierContactPhone?: string;
+
+  /**
+   * 供货方电子邮箱
+   */
+  supplierContactEmail?: string;
+
+  /**
+   * 项目ID(可选)
+   */
+  projectId?: string | number;
+
+  /**
+   * 打印模板ID(可选)
+   */
+  templateId?: string | number;
+
+  /**
+   * 附件ID
+   */
+  ossId?: string | number;
+
+  /**
+   * 报价单状态(1暂存 2审批中 3可用)
+   */
+  quoteStatus?: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 报价单子表-物料明细
+   */
+  itemsBo?: CrmQuoteMaterialForm[];
+
+}
+
+export interface CrmQuoteInfoQuery extends PageQuery {
+
+  /**
+   * 报价单号
+   */
+  quoteCode?: string;
+
+  /**
+   * 报价单名称
+   */
+  quoteName?: string;
+
+  /**
+   * 报价轮次
+   */
+  quoteRound?: number;
+
+  /**
+   * 报价大类(1橡机板块 2非橡机板块)
+   */
+  quoteCategory?: string;
+
+  /**
+   * 报价类型(1对内 2对外)
+   */
+  quoteType?: string;
+
+  /**
+   * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售）
+   */
+  businessDirection?: string;
+
+  /**
+   * 部门
+   */
+  quoteDeptId?: string | number;
+
+  /**
+   * 报价日期
+   */
+  quoteDate?: string;
+
+  /**
+   * 报价有效期起
+   */
+  validFrom?: string | number;
+
+  /**
+   * 报价有效期（天）
+   */
+  validDays?: string | number;
+
+  /**
+   * 报价有效期止
+   */
+  validTo?: string | number;
+
+  /**
+   * 交货期（天）
+   */
+  deliveryPeriod?: number;
+
+  /**
+   * 交付/交货方式
+   */
+  deliveryMethod?: string;
+
+  /**
+   * 付款方式(1电汇 2承兑)
+   */
+  paymentMethod?: string;
+
+  /**
+   * 币种（字典类型）
+   */
+  currencyType?: string;
+
+  /**
+   * 含税信息（如：含13%增值税）
+   */
+  taxIncludedInfo?: string;
+
+  /**
+   * 税率(默认按明细可覆盖)
+   */
+  taxRate?: number;
+
+  /**
+   * 总报价
+   */
+  totalPrice?: number;
+
+  /**
+   * 未税总价
+   */
+  totalBeforeTax?: number;
+
+  /**
+   * 税额
+   */
+  totalTax?: number;
+
+  /**
+   * 含税总价
+   */
+  totalIncludingTax?: number;
+
+  /**
+   * 客户方联系人ID
+   */
+  customerContactId?: string | number;
+
+  /**
+   * 客户方联系人
+   */
+  customerContactName?: string;
+
+  /**
+   * 客户方联系电话
+   */
+  customerContactPhone?: string;
+
+  /**
+   * 客户方电子邮箱
+   */
+  customerContactEmail?: string;
+
+  /**
+   * 供货方联系人ID
+   */
+  supplierContactId?: string | number;
+
+  /**
+   * 供货方联系人
+   */
+  supplierContactName?: string;
+
+  /**
+   * 供货方联系电话
+   */
+  supplierContactPhone?: string;
+
+  /**
+   * 供货方电子邮箱
+   */
+  supplierContactEmail?: string;
+
+  /**
+   * 项目ID(可选)
+   */
+  projectId?: string | number;
+
+  /**
+   * 打印模板ID(可选)
+   */
+  templateId?: string | number;
+
+  /**
+   * 附件ID
+   */
+  ossId?: string | number;
+
+  /**
+   * 报价单状态(1暂存 2审批中 3可用)
+   */
+  quoteStatus?: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+
+import type { CrmQuoteMaterialVO, CrmQuoteMaterialForm } from '@/api/oa/crm/crmQuoteMaterial/types';
+
+
+
diff --git a/src/api/oa/crm/crmQuoteMaterial/index.ts b/src/api/oa/crm/crmQuoteMaterial/index.ts
new file mode 100644
index 0000000..d32e16e
--- /dev/null
+++ b/src/api/oa/crm/crmQuoteMaterial/index.ts
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CrmQuoteMaterialVO, CrmQuoteMaterialForm, CrmQuoteMaterialQuery } from '@/api/oa/crm/crmQuoteMaterial/types';
+
+/**
+ * 查询报价单物料明细列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCrmQuoteMaterial = (query?: CrmQuoteMaterialQuery): AxiosPromise<CrmQuoteMaterialVO[]> => {
+  return request({
+    url: '/oa/crm/crmQuoteMaterial/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询报价单物料明细详细
+ * @param quoteMaterialId
+ */
+export const getCrmQuoteMaterial = (quoteMaterialId: string | number): AxiosPromise<CrmQuoteMaterialVO> => {
+  return request({
+    url: '/oa/crm/crmQuoteMaterial/' + quoteMaterialId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增报价单物料明细
+ * @param data
+ */
+export const addCrmQuoteMaterial = (data: CrmQuoteMaterialForm) => {
+  return request({
+    url: '/oa/crm/crmQuoteMaterial',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改报价单物料明细
+ * @param data
+ */
+export const updateCrmQuoteMaterial = (data: CrmQuoteMaterialForm) => {
+  return request({
+    url: '/oa/crm/crmQuoteMaterial',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除报价单物料明细
+ * @param quoteMaterialId
+ */
+export const delCrmQuoteMaterial = (quoteMaterialId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/crm/crmQuoteMaterial/' + quoteMaterialId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询报价单物料明细列表
+ * @param query
+ * @returns {*}
+ */
+export function getCrmQuoteMaterialList (query) {
+    return request({
+        url: '/oa/crm/crmQuoteMaterial/getCrmQuoteMaterialList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/oa/crm/crmQuoteMaterial/types.ts b/src/api/oa/crm/crmQuoteMaterial/types.ts
new file mode 100644
index 0000000..4854824
--- /dev/null
+++ b/src/api/oa/crm/crmQuoteMaterial/types.ts
@@ -0,0 +1,246 @@
+export interface CrmQuoteMaterialVO {
+  /**
+   * 报价物料ID
+   */
+  quoteMaterialId: string | number;
+
+  /**
+   * 报价ID
+   */
+  quoteId: string | number;
+
+  /**
+   * 序号(ERP风格)
+   */
+  itemNo: number;
+
+  /**
+   * 产品/服务名称
+   */
+  productName: string;
+
+  /**
+   * 规格描述
+   */
+  specificationDescription: string;
+
+  /**
+   * 物料ID(SAP)
+   */
+  materialId: string | number;
+
+  /**
+   * 销售物料ID(关联名)
+   */
+  relationMaterialId: string | number;
+
+  /**
+   * 数量
+   */
+  amount: number;
+
+  /**
+   * 单位ID
+   */
+  unitId: string | number;
+
+  /**
+   * 单位名称
+   */
+  unitName: string;
+
+  /**
+   * 未税单价
+   */
+  beforePrice: number;
+
+  /**
+   * 税率
+   */
+  taxRate: number;
+
+  /**
+   * 含税单价
+   */
+  includingPrice: number;
+
+  /**
+   * 小计(含税)
+   */
+  subtotal: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+}
+
+export interface CrmQuoteMaterialForm extends BaseEntity {
+  /**
+   * 报价物料ID
+   */
+  quoteMaterialId?: string | number;
+
+  /**
+   * 报价ID
+   */
+  quoteId?: string | number;
+
+  /**
+   * 序号(ERP风格)
+   */
+  itemNo?: number;
+
+  /**
+   * 产品/服务名称
+   */
+  productName?: string;
+
+  /**
+   * 规格描述
+   */
+  specificationDescription?: string;
+
+  /**
+   * 物料ID(SAP)
+   */
+  materialId?: string | number;
+
+  /**
+   * 销售物料ID(关联名)
+   */
+  relationMaterialId?: string | number;
+
+  /**
+   * 数量
+   */
+  amount?: number;
+
+  /**
+   * 单位ID
+   */
+  unitId?: string | number;
+
+  /**
+   * 单位名称
+   */
+  unitName?: string;
+
+  /**
+   * 未税单价
+   */
+  beforePrice?: number;
+
+  /**
+   * 税率
+   */
+  taxRate?: number;
+
+  /**
+   * 含税单价
+   */
+  includingPrice?: number;
+
+  /**
+   * 小计(含税)
+   */
+  subtotal?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+}
+
+export interface CrmQuoteMaterialQuery extends PageQuery {
+
+  /**
+   * 报价ID
+   */
+  quoteId?: string | number;
+
+  /**
+   * 序号(ERP风格)
+   */
+  itemNo?: number;
+
+  /**
+   * 产品/服务名称
+   */
+  productName?: string;
+
+  /**
+   * 规格描述
+   */
+  specificationDescription?: string;
+
+  /**
+   * 物料ID(SAP)
+   */
+  materialId?: string | number;
+
+  /**
+   * 销售物料ID(关联名)
+   */
+  relationMaterialId?: string | number;
+
+  /**
+   * 数量
+   */
+  amount?: number;
+
+  /**
+   * 单位ID
+   */
+  unitId?: string | number;
+
+  /**
+   * 单位名称
+   */
+  unitName?: string;
+
+  /**
+   * 未税单价
+   */
+  beforePrice?: number;
+
+  /**
+   * 税率
+   */
+  taxRate?: number;
+
+  /**
+   * 含税单价
+   */
+  includingPrice?: number;
+
+  /**
+   * 小计(含税)
+   */
+  subtotal?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+
diff --git a/src/api/oa/erp/projectContracts/types.ts b/src/api/oa/erp/projectContracts/types.ts
index 664901b..e77ca36 100644
--- a/src/api/oa/erp/projectContracts/types.ts
+++ b/src/api/oa/erp/projectContracts/types.ts
@@ -29,6 +29,36 @@ export interface ProjectContractsVO {
    */
   activeFlag: string;
 
+  /**
+   * 项目名称
+   */
+  projectName?: string;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同名称
+   */
+  contractName?: string;
+
+  /**
+   * 合同总价
+   */
+  totalPrice?: number;
+
+  /**
+   * 业务方向
+   */
+  businessDirection?: string;
+
+  /**
+   * 合同状态
+   */
+  contractStatus?: string;
+
 }
 
 export interface ProjectContractsForm extends BaseEntity {
diff --git a/src/api/oa/erp/projectInfo/index.ts b/src/api/oa/erp/projectInfo/index.ts
index 7d7b57e..e0b453d 100644
--- a/src/api/oa/erp/projectInfo/index.ts
+++ b/src/api/oa/erp/projectInfo/index.ts
@@ -62,6 +62,18 @@ export const delProjectInfo = (projectId: string | number | Array<string | numbe
   });
 };
 
+/**
+ * 项目信息提交并发起流程
+ * @param data
+ */
+export const projectSubmitAndFlowStart = (data: ProjectInfoForm) => {
+  return request({
+    url: '/oa/erp/projectInfo/submitAndFlowStart',
+    method: 'post',
+    data: data
+  });
+};
+
 /**
  * 下拉框查询项目信息列表
  * @param query
diff --git a/src/api/oa/erp/projectInfo/types.ts b/src/api/oa/erp/projectInfo/types.ts
index b486ddf..d1b3094 100644
--- a/src/api/oa/erp/projectInfo/types.ts
+++ b/src/api/oa/erp/projectInfo/types.ts
@@ -212,6 +212,21 @@ export interface ProjectInfoForm extends BaseEntity {
    */
   activeFlag?: string;
 
+  /**
+   * 流程编码
+   */
+  flowCode?: string;
+
+  /**
+   * 流程变量
+   */
+  variables?: any;
+
+  /**
+   * 流程业务扩展字段
+   */
+  bizExt?: any;
+
 }
 
 export interface ProjectInfoQuery extends PageQuery {
diff --git a/src/enums/OAEnum.ts b/src/enums/OAEnum.ts
new file mode 100644
index 0000000..9973dc6
--- /dev/null
+++ b/src/enums/OAEnum.ts
@@ -0,0 +1,46 @@
+/**
+ * 编号规则代码枚举
+ */
+export enum CodeRuleEnum {
+  /**
+   * 合同编号规则
+   */
+  CONTRACT = '1001',
+
+  /**
+   * 项目编号规则（销售项目、预投项目）
+   */
+  PROJECT = '1002',
+
+  /**
+   * 研发项目编号规则
+   */
+  PROJECT_RD = '1003',
+}
+
+/**
+ * 项目类别枚举
+ */
+export enum ProjectCategoryEnum {
+  /**
+   * 销售项目（实施、物流）
+   */
+  SALE_IMPLEMENT = '1',
+
+  /**
+   * 销售项目（备件）
+   */
+  SALE_SPARE = '2',
+
+  /**
+   * 研发项目
+   */
+  RD = '3',
+
+  /**
+   * 预投项目
+   */
+  PRE_INVEST = '4',
+}
+
+
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index efb1ae3..dbea43e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -65,7 +65,7 @@
       <div class="avatar-container">
         <el-dropdown class="right-menu-item hover-effect" trigger="click" @command="handleCommand">
           <div class="avatar-wrapper">
-            <img :src="userStore.avatar" class="user-avatar" />
+            <span class="user-name">{{ userStore.nickname }}</span>
             <el-icon><caret-bottom /></el-icon>
           </div>
           <template #dropdown>
@@ -280,25 +280,25 @@ watch(
     }
 
     .avatar-container {
-      margin-right: 40px;
+      margin-right: 10px;
 
       .avatar-wrapper {
         margin-top: 5px;
         position: relative;
+        display: flex;
+        align-items: center;
+        gap: 5px;
 
-        .user-avatar {
+        .user-name {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
-          margin-top: 10px;
+          font-size: 14px;
+          color: #5a5e66;
+          font-weight: 500;
+          white-space: nowrap;
         }
 
         i {
           cursor: pointer;
-          position: absolute;
-          right: -20px;
-          top: 25px;
           font-size: 12px;
         }
       }
diff --git a/src/router/index.ts b/src/router/index.ts
index 4329014..e3983a2 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -106,6 +106,18 @@ export const constantRoutes: RouteRecordRaw[] = [
       }
     ]
   },
+  {
+    path: '/oa/crm',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'crmQuoteInfo/edit',
+        component: () => import('@/views/oa/crm/crmQuoteInfo/edit.vue'),
+        name: 'crmQuoteInfoEdit',
+      }
+    ]
+  },
 ];
 
 // 动态路由，基于用户权限动态去加载
diff --git a/src/views/oa/crm/crmQuoteInfo/edit.vue b/src/views/oa/crm/crmQuoteInfo/edit.vue
new file mode 100644
index 0000000..40183b9
--- /dev/null
+++ b/src/views/oa/crm/crmQuoteInfo/edit.vue
@@ -0,0 +1,610 @@
+<template>
+  <div class="p-2">
+    <!-- 统一表单包裹所有分区，便于整体验证 -->
+    <el-form ref="quoteFormRef" :model="form" :rules="rules" label-width="120px" :disabled="isView">
+    <el-card shadow="never">
+      <div style="margin-bottom: 12px; text-align: center; font-weight: bold; font-size: 18px">添加报价单基本信息</div>
+        <div class="basic-center">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="报价单编号" prop="quoteCode">
+              <el-input v-model="form.quoteCode" placeholder="自动生成">
+                <template #append>
+                  <el-button type="primary" @click="generateQuoteCode" :disabled="isView || isCodeGenerated">生成报价单编号</el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="报价单名称" prop="quoteName">
+              <el-input v-model="form.quoteName" placeholder="请输入报价单名称" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 与截图不符的字段按要求暂时注释，保留原位置方便后续恢复 -->
+          <!--
+          <el-col :span="12">
+            <el-form-item label="报价大类" prop="quoteCategory">
+              <el-select v-model="form.quoteCategory" placeholder="请选择报价大类">
+                <el-option v-for="dict in quote_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="报价类型" prop="quoteType">
+              <el-select v-model="form.quoteType" placeholder="请选择报价类型">
+                <el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务方向" prop="businessDirection">
+              <el-select v-model="form.businessDirection" placeholder="请选择业务方向">
+                <el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          -->
+          <el-col :span="24">
+            <el-form-item label="报价日期" prop="quoteDate">
+              <el-date-picker clearable v-model="form.quoteDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择报价日期" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="有效期起" prop="validFrom">
+              <el-date-picker clearable v-model="form.validFrom" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择有效期起" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="有效期止" prop="validTo">
+              <el-date-picker clearable v-model="form.validTo" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择有效期止" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="交货期(天)" prop="deliveryPeriod">
+              <!-- 使用数字输入框，禁用随表单统一控制 -->
+              <el-input-number v-model="form.deliveryPeriod" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="交货方式" prop="deliveryMethod">
+              <el-input v-model="form.deliveryMethod" placeholder="请输入交货方式" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="付款方式" prop="paymentMethod">
+              <el-input v-model="form.paymentMethod" placeholder="请输入付款方式" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="币种" prop="currencyType">
+              <el-select v-model="form.currencyType" placeholder="请选择币种">
+                <el-option v-for="dict in currency_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="含税信息" prop="taxIncludedInfo">
+              <el-input v-model="form.taxIncludedInfo" placeholder="如：含13%增值税" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="税率(%)" prop="taxRate">
+              <!-- 使用数字输入框（两位小数，步长0.01） -->
+              <el-input-number v-model="form.taxRate" :min="0" :precision="2" :step="0.01" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 原客户方信息块已迁移到“客户方信息”分区，保留以便后续恢复 -->
+          <el-col :span="12" v-if="false">
+            <el-form-item label="客户联系人" prop="customerContactId">
+              <el-select v-model="form.customerContactId" filterable placeholder="请选择客户联系人" @change="onCustomerContactChanged">
+                <el-option v-for="c in customerContactList" :key="c.contactId" :label="c.contactName + ' - ' + (c.phoneNumber||'')" :value="c.contactId" />
+              </el-select>
+            </el-form-item>
+            <!-- 客户方联系电话与邮箱（随选择带出，可编辑） -->
+            <el-form-item label="客户联系电话" prop="customerContactPhone">
+              <el-input v-model="form.customerContactPhone" placeholder="客户联系电话" />
+            </el-form-item>
+            <el-form-item label="客户邮箱" prop="customerContactEmail">
+              <el-input v-model="form.customerContactEmail" placeholder="客户邮箱" />
+            </el-form-item>
+          </el-col>
+          <!-- 原供货方信息块已迁移到“供货方信息”分区，保留以便后续恢复 -->
+          <el-col :span="12" v-if="false">
+            <el-form-item label="供货方联系人" prop="supplierContactId">
+              <el-select v-model="form.supplierContactId" filterable placeholder="请选择供货方联系人" @change="onSupplierContactChanged">
+                <el-option v-for="c in supplierContactList" :key="c.contactId" :label="c.contactName + ' - ' + (c.phoneNumber||'')" :value="c.contactId" />
+              </el-select>
+            </el-form-item>
+            <!-- 供货方联系电话与邮箱（随选择带出，可编辑） -->
+            <el-form-item label="供货方联系电话" prop="supplierContactPhone">
+              <el-input v-model="form.supplierContactPhone" placeholder="供货方联系电话" />
+            </el-form-item>
+            <el-form-item label="供货方邮箱" prop="supplierContactEmail">
+              <el-input v-model="form.supplierContactEmail" placeholder="供货方邮箱" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 原备注块已迁移到“备注”分区，保留以便后续恢复 -->
+          <el-col :span="12" v-if="false">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+          <!-- 原附件上传块已迁移到“附件”分区，保留以便后续恢复 -->
+          <el-col :span="12" v-if="false">
+            <el-form-item label="附件上传">
+              <el-button type="primary" plain icon="Upload" @click="handleFile">上传附件</el-button>
+              <div style="margin-top: 8px; color: #999">支持格式：.rar .zip .doc .docx .pdf，单个文件不超过20MB</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        </div>
+    </el-card>
+
+    <!-- 客户方/供货方信息（左右并列对称布局） -->
+    <el-row :gutter="20" style="margin-top: 20px">
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>
+            <div style="text-align: left; font-weight: bold; font-size: 18px">客户方信息</div>
+          </template>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="客户联系人" prop="customerContactId">
+                <el-select v-model="form.customerContactId" filterable placeholder="请选择客户联系人" @change="onCustomerContactChanged">
+                  <el-option v-for="c in customerContactList" :key="c.contactId" :label="c.contactName + ' - ' + (c.phoneNumber||'')" :value="c.contactId" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="客户联系电话" prop="customerContactPhone">
+                <el-input v-model="form.customerContactPhone" placeholder="客户联系电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="客户邮箱" prop="customerContactEmail">
+                <el-input v-model="form.customerContactEmail" placeholder="客户邮箱" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>
+            <div style="text-align: left; font-weight: bold; font-size: 18px">供货方信息</div>
+          </template>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="供货方联系人" prop="supplierContactId">
+                <el-select v-model="form.supplierContactId" filterable placeholder="请选择供货方联系人" @change="onSupplierContactChanged">
+                  <el-option v-for="c in supplierContactList" :key="c.contactId" :label="c.contactName + ' - ' + (c.phoneNumber||'')" :value="c.contactId" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="供货方联系电话" prop="supplierContactPhone">
+                <el-input v-model="form.supplierContactPhone" placeholder="供货方联系电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="供货方邮箱" prop="supplierContactEmail">
+                <el-input v-model="form.supplierContactEmail" placeholder="供货方邮箱" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 附件（独立分区，样式参考合同编辑页） -->
+    <el-card shadow="never" style="margin-top: 20px">
+      <template #header>
+        <div style="text-align: left; font-weight: bold; font-size: 18px">附件</div>
+      </template>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <!-- 与合同页对齐，采用“附件”表单项与上传按钮 -->
+          <el-form-item label="附件">
+            <el-button type="primary" plain icon="Upload" @click="handleFile" :disabled="isView">上传附件</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 备注（独立分区） -->
+    <el-card shadow="never" style="margin-top: 20px">
+      <template #header>
+        <div style="text-align: left; font-weight: bold; font-size: 18px">备注</div>
+      </template>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 统一表单结束 -->
+    </el-form>
+
+    <!-- 报价物料管理 -->
+    <el-card shadow="never" style="margin-top: 20px">
+      <template #header>
+        <div style="text-align: left; font-weight: bold; font-size: 18px">报价明细表格</div>
+      </template>
+      <div style="margin-bottom: 12px">
+        <el-button type="primary" icon="Plus" @click="addMaterialRow" :disabled="isView">新增物料</el-button>
+      </div>
+      <el-table :data="materialRows" border show-summary :summary-method="getSummary">
+        <el-table-column label="序号" width="80" align="center">
+          <template #default="scope">{{ scope.$index + 1 }}</template>
+        </el-table-column>
+        <el-table-column label="产品名称" min-width="160" align="center">
+          <template #default="scope">
+            <el-select v-model="scope.row.materialId" filterable placeholder="选择SAP物料" style="width: 100%" @change="onMaterialChange(scope.row)" :disabled="isView">
+              <el-option v-for="m in materialList" :key="m.materialId" :label="m.materialName" :value="m.materialId" />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位" width="120" align="center">
+          <template #default="scope">
+            <el-input v-model="scope.row.unitName" placeholder="单位" :disabled="isView" />
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" width="160" align="center">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.amount" :min="0" :precision="2" style="width: 100%" :disabled="isView"
+              @update:modelValue="(val:any)=>onAmountChange(scope.row,val)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="未税单价" width="180" align="center">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.beforePrice" :min="0" :precision="2" style="width: 100%" :disabled="isView"
+              @update:modelValue="(val:any)=>onBeforePriceChange(scope.row,val)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="税率(%)" width="160" align="center">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.taxRate" :min="0" :precision="2" style="width: 100%" :disabled="isView"
+              @update:modelValue="(val:any)=>onTaxRateChange(scope.row,val)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="含税单价" width="180" align="center">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.includingPrice" :min="0" :precision="2" style="width: 100%" :disabled="isView"
+              @update:modelValue="(val:any)=>onIncludingPriceChange(scope.row,val)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="小计" width="140" align="center">
+          <template #default="scope">
+            {{ (scope.row.subtotal ?? 0).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="160" align="center">
+          <template #default="scope">
+            <el-input v-model="scope.row.remark" :disabled="isView" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="120" align="center">
+          <template #default="scope">
+            <el-button v-if="!isView" link type="danger" icon="Delete" @click="removeRow(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div style="margin-top: 12px; text-align: right">
+        <span style="margin-right: 16px">含税总价：{{ totalIncludingTax.toFixed(2) }}</span>
+        <el-button v-if="!isView" type="primary" :loading="buttonLoading" @click="submitForm">保 存</el-button>
+        <el-button @click="goBack">返 回</el-button>
+      </div>
+    </el-card>
+    <!-- 附件上传对话框 -->
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
+      <el-form label-width="80px">
+        <el-form-item label="文件名">
+          <fileUpload v-if="type === 0" v-model="ossFileModel" />
+          <imageUpload v-if="type === 1" v-model="ossFileModel" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitOss">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useRoute, useRouter } from 'vue-router';
+import { getCrmQuoteInfo, addCrmQuoteInfo, updateCrmQuoteInfo, recalcQuoteTotals } from '@/api/oa/crm/crmQuoteInfo';
+import { CrmQuoteInfoForm } from '@/api/oa/crm/crmQuoteInfo/types';
+import type { CrmQuoteMaterialForm } from '@/api/oa/crm/crmQuoteMaterial/types';
+import { getBaseMaterialInfoList } from '@/api/oa/base/materialInfo';
+import { getCrmCustomerContactList } from '@/api/oa/crm/customerContact';
+import { getRuleGenerateCode } from '@/api/system/codeRule';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { business_direction, currency_type, quote_category, contract_type } = toRefs<any>(proxy?.useDict('business_direction', 'currency_type', 'quote_category', 'contract_type'));
+
+const router = useRouter();
+const route = useRoute();
+
+// 查看模式：根据路由type=view禁用输入与保存
+const isView = computed(() => route.query.type === 'view');
+
+const buttonLoading = ref(false);
+const quoteFormRef = ref<ElFormInstance>();
+// 编号生成状态（生成后禁用按钮）
+const isCodeGenerated = ref(false);
+
+const form = reactive<CrmQuoteInfoForm>({
+  quoteId: undefined,
+  quoteCode: undefined,
+  quoteName: undefined,
+  quoteCategory: undefined,
+  quoteType: undefined,
+  businessDirection: undefined,
+  quoteDate: undefined,
+  validFrom: undefined,
+  validTo: undefined,
+  deliveryPeriod: undefined,
+  deliveryMethod: undefined,
+  paymentMethod: undefined,
+  currencyType: undefined,
+  taxIncludedInfo: undefined,
+  taxRate: undefined,
+  customerContactId: undefined,
+  customerContactName: undefined,
+  customerContactPhone: undefined,
+  customerContactEmail: undefined,
+  supplierContactId: undefined,
+  supplierContactName: undefined,
+  supplierContactPhone: undefined,
+  supplierContactEmail: undefined,
+  remark: undefined
+});
+
+const rules = {
+  quoteName: [{ required: true, message: '报价单名称不能为空', trigger: 'blur' }],
+  customerContactId: [{ required: true, message: '请选择客户联系人', trigger: 'change' }]
+};
+
+// 下拉数据
+const materialList = ref<any[]>([]);
+const customerContactList = ref<any[]>([]);
+const supplierContactList = ref<any[]>([]);
+
+// 物料行
+const materialRows = ref<CrmQuoteMaterialForm[]>([]);
+const totalIncludingTax = computed(() => {
+  return materialRows.value.reduce((sum, r) => sum + (Number(r.subtotal || 0)), 0);
+});
+// 表格合计行：仅统计小计列
+const getSummary = (param: any) => {
+  const { columns, data } = param;
+  const sums: string[] = [];
+  columns.forEach((column: any, index: number) => {
+    if (index === 0) {
+      sums[index] = '合计';
+      return;
+    }
+    if (column.property === 'subtotal') {
+      const total = data.reduce((sum: number, row: any) => sum + Number(row.subtotal || 0), 0);
+      sums[index] = total.toFixed(2);
+    } else {
+      sums[index] = '';
+    }
+  });
+  return sums;
+};
+
+const addMaterialRow = () => {
+  materialRows.value.push({ amount: 0, beforePrice: 0, taxRate: Number(form.taxRate || 0), includingPrice: 0, subtotal: 0 } as CrmQuoteMaterialForm);
+};
+const removeRow = (idx: number) => materialRows.value.splice(idx, 1);
+// 工具：数值化与保留两位小数
+const toNum = (v: any) => (v === '' || v === null || v === undefined) ? undefined : (Number.isFinite(Number(v)) ? Number(v) : undefined);
+const round2 = (n: number) => Math.round(n * 100) / 100;
+// 计算器
+const calcIncluding = (before: number, rate: number) => round2(before * (1 + rate / 100));
+const calcBefore = (including: number, rate: number) => round2(including / (1 + rate / 100));
+const calcRate = (including: number, before: number) => round2(((including / before) - 1) * 100);
+// 统一小计：始终以含税单价×数量；含税缺失则以未税+税率推导
+const updateSubtotal = (row: any) => {
+  const amount = toNum(row.amount) ?? 0;
+  const before = toNum(row.beforePrice);
+  const including = toNum(row.includingPrice);
+  const rate = toNum(row.taxRate) ?? toNum(form.taxRate);
+  let inc = including;
+  if (inc === undefined && before !== undefined && rate !== undefined) {
+    inc = calcIncluding(before, rate);
+    row.includingPrice = inc; // 推导同时回填，保持一致
+  }
+  row.subtotal = (inc !== undefined) ? round2((inc as number) * amount) : 0;
+};
+// 基于“最近编辑字段”的确定性互算：任意两项给出，自动算第三项
+const onAmountChange = (row: any, val: number) => {
+  row.amount = val;
+  updateSubtotal(row);
+};
+const onBeforePriceChange = (row: any, val: number) => {
+  row.beforePrice = val;
+  const rate = toNum(row.taxRate) ?? toNum(form.taxRate);
+  const including = toNum(row.includingPrice);
+  if (rate !== undefined) {
+    row.includingPrice = calcIncluding(val, rate as number);
+  } else if (including !== undefined) {
+    row.taxRate = calcRate(including as number, val);
+  }
+  updateSubtotal(row);
+};
+const onTaxRateChange = (row: any, val: number) => {
+  row.taxRate = val;
+  const before = toNum(row.beforePrice);
+  const including = toNum(row.includingPrice);
+  if (before !== undefined) {
+    row.includingPrice = calcIncluding(before as number, val);
+  } else if (including !== undefined) {
+    row.beforePrice = calcBefore(including as number, val);
+  }
+  updateSubtotal(row);
+};
+const onIncludingPriceChange = (row: any, val: number) => {
+  row.includingPrice = val;
+  const rate = toNum(row.taxRate) ?? toNum(form.taxRate);
+  const before = toNum(row.beforePrice);
+  if (rate !== undefined) {
+    row.beforePrice = calcBefore(val, rate as number);
+  } else if (before !== undefined) {
+    row.taxRate = calcRate(val, before as number);
+  }
+  updateSubtotal(row);
+};
+// 选中联系人后，自动带出姓名、电话、邮箱（可编辑，不影响再次选择）
+const onCustomerContactChanged = (id: any) => {
+  const c = customerContactList.value.find((x: any) => x.contactId === id);
+  form.customerContactName = c?.contactName || '';
+  form.customerContactPhone = c?.phoneNumber || '';
+  form.customerContactEmail = c?.email || '';
+};
+const onSupplierContactChanged = (id: any) => {
+  const c = supplierContactList.value.find((x: any) => x.contactId === id);
+  form.supplierContactName = c?.contactName || '';
+  form.supplierContactPhone = c?.phoneNumber || '';
+  form.supplierContactEmail = c?.email || '';
+};
+const onMaterialChange = (row: any) => {
+  // 可扩展：根据选中物料带出单位等
+};
+
+// 生成报价单编号（codeRuleCode=1004）
+const generateQuoteCode = async () => {
+  if (isCodeGenerated.value) return;
+  try {
+    const params = { codeRuleCode: '1004' } as any;
+    const res = await getRuleGenerateCode(params);
+    form.quoteCode = res.msg;
+    isCodeGenerated.value = true;
+    proxy?.$modal.msgSuccess('报价单编号生成成功');
+  } catch (error) {
+    proxy?.$modal.msgError('报价单编号生成失败');
+  }
+};
+
+// 附件上传对话框（UI占位，复用通用上传组件）
+const type = ref(0);
+const dialog = reactive({ visible: false, title: '' });
+const ossFileModel = ref<string | string[] | undefined>(undefined);
+const handleFile = () => {
+  type.value = 0;
+  dialog.visible = true;
+  dialog.title = '上传报价附件';
+};
+const submitOss = () => {
+  dialog.visible = false;
+  proxy?.$modal.msgSuccess('附件已更新');
+};
+const cancel = () => {
+  dialog.visible = false;
+};
+
+const submitForm = () => {
+  quoteFormRef.value?.validate(async (valid: boolean) => {
+    if (!valid) return;
+    buttonLoading.value = true;
+    try {
+      // 携带itemsBo一次性保存（由后端主子表事务处理）
+      const payload: any = {
+        ...form,
+        itemsBo: materialRows.value.map((r, idx) => ({
+          ...r,
+          itemNo: idx + 1,
+          subtotal: Number(r.subtotal || 0)
+        }))
+      };
+      if (!form.quoteId) {
+        await addCrmQuoteInfo(payload);
+      } else {
+        await updateCrmQuoteInfo(payload);
+      }
+      proxy?.$modal.msgSuccess('保存成功');
+      router.back();
+    } finally {
+      buttonLoading.value = false;
+    }
+  });
+};
+
+const goBack = () => router.back();
+
+onMounted(async () => {
+  // 下拉数据初始化
+  const materialRes = await getBaseMaterialInfoList({});
+  materialList.value = materialRes.data || [];
+  const contactRes = await getCrmCustomerContactList({});
+  customerContactList.value = contactRes.data || [];
+  supplierContactList.value = contactRes.data || [];
+
+  // 编辑场景
+  const id = route.query.id || route.params.id;
+  if (id) {
+    // 先回填主键，防止数据尚未加载完用户就点击保存而误走新增
+    // 前端保持 quoteId 为字符串，避免长整型精度丢失
+    form.quoteId = id as any;
+    const res = await getCrmQuoteInfo(id as any);
+    Object.assign(form, res.data);
+    // 编辑模式：已存在编号则禁用生成
+    isCodeGenerated.value = !!form.quoteCode;
+    // 根据已有联系人ID回填姓名、电话、邮箱（若后端已返回则保持）
+    if (!form.customerContactPhone || !form.customerContactEmail || !form.customerContactName) {
+      onCustomerContactChanged(form.customerContactId);
+    }
+    if (!form.supplierContactPhone || !form.supplierContactEmail || !form.supplierContactName) {
+      onSupplierContactChanged(form.supplierContactId);
+    }
+    // 仅使用后端VO内联返回的 itemsVo，前端不再单独请求子表接口
+    const inlineItems = (res.data as any)?.itemsVo;
+    if (inlineItems && inlineItems.length) {
+      // 后端 BigDecimal/字符串数值需在前端转为 number，确保 el-input-number 与 toFixed 正常工作
+      materialRows.value = inlineItems.map((r: any) => ({
+        quoteMaterialId: r.quoteMaterialId,
+        quoteId: r.quoteId,
+        itemNo: r.itemNo,
+        materialId: r.materialId,
+        unitId: r.unitId,
+        unitName: r.unitName,
+        amount: Number(r.amount ?? 0),
+        beforePrice: Number(r.beforePrice ?? 0),
+        taxRate: Number(r.taxRate ?? (form.taxRate ?? 0)),
+        includingPrice: Number(r.includingPrice ?? 0),
+        subtotal: Number(r.subtotal ?? 0),
+        remark: r.remark
+      }));
+    } else {
+      materialRows.value = [];
+    }
+  }
+  // 新增模式：如已有编号则禁用生成按钮
+  if (!id) {
+    isCodeGenerated.value = !!form.quoteCode;
+  }
+});
+</script>
+
+<style scoped>
+/* 基础信息分区整体居中显示 */
+.basic-center {
+  max-width: 860px;
+  margin: 0 auto;
+}
+</style>
diff --git a/src/views/oa/crm/crmQuoteInfo/index.vue b/src/views/oa/crm/crmQuoteInfo/index.vue
new file mode 100644
index 0000000..de0bea8
--- /dev/null
+++ b/src/views/oa/crm/crmQuoteInfo/index.vue
@@ -0,0 +1,720 @@
+<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="quoteCode">
+              <el-input v-model="queryParams.quoteCode" placeholder="请输入报价单号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="报价单名称" prop="quoteName">
+              <el-input v-model="queryParams.quoteName" placeholder="请输入报价单名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="报价轮次" prop="quoteRound">
+              <el-input v-model="queryParams.quoteRound" placeholder="请输入报价轮次" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="报价大类" prop="quoteCategory">
+              <el-select v-model="queryParams.quoteCategory" placeholder="请选择报价大类" clearable >
+                <el-option v-for="dict in quote_category" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="报价类型" prop="quoteType">
+              <el-select v-model="queryParams.quoteType" placeholder="请选择报价类型" clearable >
+                <el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="业务方向" prop="businessDirection">
+              <el-select v-model="queryParams.businessDirection" placeholder="请选择业务方向" clearable >
+                <el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>-->
+<!--            <el-form-item label="部门" prop="quoteDeptId">
+              <el-input v-model="queryParams.quoteDeptId" placeholder="请输入部门" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="报价日期" prop="quoteDate">
+              <el-date-picker clearable
+                              v-model="queryParams.quoteDate"
+                              type="date"
+                              value-format="YYYY-MM-DD"
+                              placeholder="请选择报价日期"
+              />
+            </el-form-item>
+            <el-form-item label="报价有效期起" prop="validFrom">
+              <el-date-picker clearable
+                              v-model="queryParams.validFrom"
+                              type="date"
+                              value-format="YYYY-MM-DD"
+                              placeholder="请选择报价有效期起"
+              />
+            </el-form-item>
+            <el-form-item label="报价有效期" prop="validDays">
+              <el-input v-model="queryParams.validDays" placeholder="请输入报价有效期" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="报价有效期止" prop="validTo">
+              <el-date-picker clearable
+                              v-model="queryParams.validTo"
+                              type="date"
+                              value-format="YYYY-MM-DD"
+                              placeholder="请选择报价有效期止"
+              />
+            </el-form-item>
+            <el-form-item label="交货期" prop="deliveryPeriod">
+              <el-input v-model="queryParams.deliveryPeriod" placeholder="请输入交货期" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="交付/交货方式" prop="deliveryMethod">
+              <el-input v-model="queryParams.deliveryMethod" placeholder="请输入交付/交货方式" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="付款方式" prop="paymentMethod">
+              <el-select v-model="queryParams.paymentMethod" placeholder="请选择付款方式" clearable >
+                <el-option v-for="dict in payment_method" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>-->
+<!--            <el-form-item label="币种" prop="currencyType">
+              <el-select v-model="queryParams.currencyType" placeholder="请选择币种" clearable >
+                <el-option v-for="dict in currency_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="含税信息" prop="taxIncludedInfo">
+              <el-input v-model="queryParams.taxIncludedInfo" placeholder="请输入含税信息" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="税率(默认按明细可覆盖)" prop="taxRate">
+              <el-input v-model="queryParams.taxRate" placeholder="请输入税率(默认按明细可覆盖)" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="总报价" prop="totalPrice">
+              <el-input v-model="queryParams.totalPrice" placeholder="请输入总报价" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="未税总价" prop="totalBeforeTax">
+              <el-input v-model="queryParams.totalBeforeTax" placeholder="请输入未税总价" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="税额" prop="totalTax">
+              <el-input v-model="queryParams.totalTax" placeholder="请输入税额" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="含税总价" prop="totalIncludingTax">
+              <el-input v-model="queryParams.totalIncludingTax" placeholder="请输入含税总价" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="客户方联系人ID" prop="customerContactId">
+              <el-input v-model="queryParams.customerContactId" placeholder="请输入客户方联系人ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="客户方联系人" prop="customerContactName">
+              <el-input v-model="queryParams.customerContactName" placeholder="请输入客户方联系人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="客户方联系电话" prop="customerContactPhone">
+              <el-input v-model="queryParams.customerContactPhone" placeholder="请输入客户方联系电话" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="客户方电子邮箱" prop="customerContactEmail">
+              <el-input v-model="queryParams.customerContactEmail" placeholder="请输入客户方电子邮箱" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供货方联系人ID" prop="supplierContactId">
+              <el-input v-model="queryParams.supplierContactId" placeholder="请输入供货方联系人ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供货方联系人" prop="supplierContactName">
+              <el-input v-model="queryParams.supplierContactName" placeholder="请输入供货方联系人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供货方联系电话" prop="supplierContactPhone">
+              <el-input v-model="queryParams.supplierContactPhone" placeholder="请输入供货方联系电话" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供货方电子邮箱" prop="supplierContactEmail">
+              <el-input v-model="queryParams.supplierContactEmail" placeholder="请输入供货方电子邮箱" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <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="templateId">
+              <el-input v-model="queryParams.templateId" placeholder="请输入打印模板ID(可选)" 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="quoteStatus">
+              <el-select v-model="queryParams.quoteStatus" placeholder="请选择报价单状态" clearable >
+                <el-option v-for="dict in quote_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="流程状态" prop="flowStatus">
+              <el-select v-model="queryParams.flowStatus" placeholder="请选择流程状态" clearable >
+                <el-option v-for="dict in flow_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/crm:crmQuoteInfo: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:crmQuoteInfo: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:crmQuoteInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:crmQuoteInfo: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="crmQuoteInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" width="50" v-if="columns[0].visible"/>
+        <el-table-column label="报价单号" align="center" prop="quoteCode" v-if="columns[1].visible"/>
+        <el-table-column label="报价单名称" align="center" prop="quoteName" v-if="columns[2].visible"/>
+        <el-table-column label="报价轮次" align="center" prop="quoteRound" v-if="columns[3].visible"/>
+        <el-table-column label="报价大类" align="center" prop="quoteCategory" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="quote_category" :value="scope.row.quoteCategory"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="报价类型" align="center" prop="quoteType" v-if="columns[5].visible">
+          <template #default="scope">
+            <dict-tag :options="contract_type" :value="scope.row.quoteType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务方向" align="center" prop="businessDirection" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="business_direction" :value="scope.row.businessDirection"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="部门" align="center" prop="quoteDeptId" v-if="columns[7].visible"/>
+        <el-table-column label="报价日期" align="center" prop="quoteDate" width="180" v-if="columns[8].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.quoteDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="报价有效期起" align="center" prop="validFrom" width="180" v-if="columns[9].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.validFrom, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="报价有效期" align="center" prop="validDays" v-if="columns[10].visible"/>
+        <el-table-column label="报价有效期止" align="center" prop="validTo" width="180" v-if="columns[11].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.validTo, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="交货期" align="center" prop="deliveryPeriod" v-if="columns[12].visible"/>
+        <el-table-column label="交付/交货方式" align="center" prop="deliveryMethod" v-if="columns[13].visible"/>
+        <el-table-column label="付款方式" align="center" prop="paymentMethod" v-if="columns[14].visible">
+          <template #default="scope">
+            <dict-tag :options="payment_method" :value="scope.row.paymentMethod"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="币种" align="center" prop="currencyType" v-if="columns[15].visible">
+          <template #default="scope">
+            <dict-tag :options="currency_type" :value="scope.row.currencyType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="含税信息" align="center" prop="taxIncludedInfo" v-if="columns[16].visible"/>
+        <el-table-column label="税率(默认按明细可覆盖)" align="center" prop="taxRate" v-if="columns[17].visible"/>
+        <el-table-column label="总报价" align="center" prop="totalPrice" v-if="columns[18].visible"/>
+        <el-table-column label="未税总价" align="center" prop="totalBeforeTax" v-if="columns[19].visible"/>
+        <el-table-column label="税额" align="center" prop="totalTax" v-if="columns[20].visible"/>
+        <el-table-column label="含税总价" align="center" prop="totalIncludingTax" v-if="columns[21].visible"/>
+        <el-table-column label="客户方联系人ID" align="center" prop="customerContactId" v-if="columns[22].visible"/>
+        <el-table-column label="客户方联系人" align="center" prop="customerContactName" v-if="columns[23].visible"/>
+        <el-table-column label="客户方联系电话" align="center" prop="customerContactPhone" v-if="columns[24].visible"/>
+        <el-table-column label="客户方电子邮箱" align="center" prop="customerContactEmail" v-if="columns[25].visible"/>
+        <el-table-column label="供货方联系人ID" align="center" prop="supplierContactId" v-if="columns[26].visible"/>
+        <el-table-column label="供货方联系人" align="center" prop="supplierContactName" v-if="columns[27].visible"/>
+        <el-table-column label="供货方联系电话" align="center" prop="supplierContactPhone" v-if="columns[28].visible"/>
+        <el-table-column label="供货方电子邮箱" align="center" prop="supplierContactEmail" v-if="columns[29].visible"/>
+        <el-table-column label="项目ID(可选)" align="center" prop="projectId" v-if="columns[30].visible"/>
+        <el-table-column label="打印模板ID(可选)" align="center" prop="templateId" v-if="columns[31].visible"/>
+        <el-table-column label="附件ID" align="center" prop="ossId" v-if="columns[32].visible"/>
+        <el-table-column label="报价单状态" align="center" prop="quoteStatus" v-if="columns[33].visible">
+          <template #default="scope">
+            <dict-tag :options="quote_status" :value="scope.row.quoteStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[34].visible">
+          <template #default="scope">
+            <dict-tag :options="flow_status" :value="scope.row.flowStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[35].visible"/>
+<el-table-column label="操作" align="center" fixed="right" width="150" class-name="small-padding fixed-width">
+  <template #default="scope">
+    <el-tooltip content="查看" placement="top">
+      <el-button link type="info" icon="DocumentChecked" @click="handleView(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:crmQuoteInfo:edit']"></el-button>
+    </el-tooltip>
+    <el-tooltip content="审批记录（预留）" placement="top">
+      <el-button link type="info" icon="View"></el-button>
+    </el-tooltip>
+    <el-tooltip content="删除" placement="top">
+      <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/crm:crmQuoteInfo: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="crmQuoteInfoFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="报价单号" prop="quoteCode">
+          <el-input v-model="form.quoteCode" placeholder="请输入报价单号" />
+        </el-form-item>
+        <el-form-item label="报价单名称" prop="quoteName">
+          <el-input v-model="form.quoteName" placeholder="请输入报价单名称" />
+        </el-form-item>
+        <el-form-item label="报价轮次" prop="quoteRound">
+          <el-input v-model="form.quoteRound" placeholder="请输入报价轮次" />
+        </el-form-item>
+        <el-form-item label="报价大类" prop="quoteCategory">
+          <el-radio-group v-model="form.quoteCategory">
+            <el-radio
+              v-for="dict in quote_category"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="报价类型" prop="quoteType">
+          <el-select v-model="form.quoteType" placeholder="请选择报价类型">
+            <el-option
+              v-for="dict in contract_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="业务方向" prop="businessDirection">
+          <el-select v-model="form.businessDirection" placeholder="请选择业务方向">
+            <el-option
+              v-for="dict in business_direction"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="部门" prop="quoteDeptId">
+          <el-input v-model="form.quoteDeptId" placeholder="请输入部门" />
+        </el-form-item>
+        <el-form-item label="报价日期" prop="quoteDate">
+          <el-date-picker clearable
+                          v-model="form.quoteDate"
+                          type="datetime"
+                          value-format="YYYY-MM-DD HH:mm:ss"
+                          placeholder="请选择报价日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="报价有效期起" prop="validFrom">
+          <el-date-picker clearable
+                          v-model="form.validFrom"
+                          type="datetime"
+                          value-format="YYYY-MM-DD HH:mm:ss"
+                          placeholder="请选择报价有效期起">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="报价有效期" prop="validDays">
+          <el-input v-model="form.validDays" placeholder="请输入报价有效期" />
+        </el-form-item>
+        <el-form-item label="报价有效期止" prop="validTo">
+          <el-date-picker clearable
+                          v-model="form.validTo"
+                          type="datetime"
+                          value-format="YYYY-MM-DD HH:mm:ss"
+                          placeholder="请选择报价有效期止">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="交货期" prop="deliveryPeriod">
+          <el-input v-model="form.deliveryPeriod" placeholder="请输入交货期" />
+        </el-form-item>
+        <el-form-item label="交付/交货方式" prop="deliveryMethod">
+          <el-input v-model="form.deliveryMethod" placeholder="请输入交付/交货方式" />
+        </el-form-item>
+        <el-form-item label="付款方式" prop="paymentMethod">
+          <el-select v-model="form.paymentMethod" placeholder="请选择付款方式">
+            <el-option
+              v-for="dict in payment_method"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="币种" prop="currencyType">
+          <el-select v-model="form.currencyType" placeholder="请选择币种">
+            <el-option
+              v-for="dict in currency_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="含税信息" prop="taxIncludedInfo">
+          <el-input v-model="form.taxIncludedInfo" placeholder="请输入含税信息" />
+        </el-form-item>
+        <el-form-item label="税率(默认按明细可覆盖)" prop="taxRate">
+          <el-input v-model="form.taxRate" placeholder="请输入税率(默认按明细可覆盖)" />
+        </el-form-item>
+        <el-form-item label="总报价" prop="totalPrice">
+          <el-input v-model="form.totalPrice" placeholder="请输入总报价" />
+        </el-form-item>
+        <el-form-item label="未税总价" prop="totalBeforeTax">
+          <el-input v-model="form.totalBeforeTax" placeholder="请输入未税总价" />
+        </el-form-item>
+        <el-form-item label="税额" prop="totalTax">
+          <el-input v-model="form.totalTax" placeholder="请输入税额" />
+        </el-form-item>
+        <el-form-item label="含税总价" prop="totalIncludingTax">
+          <el-input v-model="form.totalIncludingTax" placeholder="请输入含税总价" />
+        </el-form-item>
+        <el-form-item label="客户方联系人ID" prop="customerContactId">
+          <el-input v-model="form.customerContactId" placeholder="请输入客户方联系人ID" />
+        </el-form-item>
+        <el-form-item label="客户方联系人" prop="customerContactName">
+          <el-input v-model="form.customerContactName" placeholder="请输入客户方联系人" />
+        </el-form-item>
+        <el-form-item label="客户方联系电话" prop="customerContactPhone">
+          <el-input v-model="form.customerContactPhone" placeholder="请输入客户方联系电话" />
+        </el-form-item>
+        <el-form-item label="客户方电子邮箱" prop="customerContactEmail">
+          <el-input v-model="form.customerContactEmail" placeholder="请输入客户方电子邮箱" />
+        </el-form-item>
+        <el-form-item label="供货方联系人ID" prop="supplierContactId">
+          <el-input v-model="form.supplierContactId" placeholder="请输入供货方联系人ID" />
+        </el-form-item>
+        <el-form-item label="供货方联系人" prop="supplierContactName">
+          <el-input v-model="form.supplierContactName" placeholder="请输入供货方联系人" />
+        </el-form-item>
+        <el-form-item label="供货方联系电话" prop="supplierContactPhone">
+          <el-input v-model="form.supplierContactPhone" placeholder="请输入供货方联系电话" />
+        </el-form-item>
+        <el-form-item label="供货方电子邮箱" prop="supplierContactEmail">
+          <el-input v-model="form.supplierContactEmail" placeholder="请输入供货方电子邮箱" />
+        </el-form-item>
+        <el-form-item label="项目ID(可选)" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目ID(可选)" />
+        </el-form-item>
+        <el-form-item label="打印模板ID(可选)" prop="templateId">
+          <el-input v-model="form.templateId" placeholder="请输入打印模板ID(可选)" />
+        </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="quoteStatus">
+          <el-select v-model="form.quoteStatus" placeholder="请选择报价单状态">
+            <el-option
+              v-for="dict in quote_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="流程状态" prop="flowStatus">
+          <el-select v-model="form.flowStatus" placeholder="请选择流程状态">
+            <el-option
+              v-for="dict in flow_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </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="CrmQuoteInfo" lang="ts">
+import { useRoute, useRouter } from 'vue-router';
+import { listCrmQuoteInfo, getCrmQuoteInfo, delCrmQuoteInfo, addCrmQuoteInfo, updateCrmQuoteInfo } from '@/api/oa/crm/crmQuoteInfo';
+import { CrmQuoteInfoVO, CrmQuoteInfoQuery, CrmQuoteInfoForm } from '@/api/oa/crm/crmQuoteInfo/types';
+import { getCrmCustomerContactList } from '@/api/oa/crm/customerContact';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const router = useRouter();
+const route = useRoute();
+const { business_direction, currency_type, quote_category, payment_method, quote_status, flow_status, contract_type } = toRefs<any>(proxy?.useDict('business_direction', 'currency_type', 'quote_category', 'payment_method', 'quote_status', 'flow_status', 'contract_type'));
+
+const crmQuoteInfoList = ref<CrmQuoteInfoVO[]>([]);
+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 crmQuoteInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+    { key: 1, label: `序号`, visible: true },
+  { key: 1, label: `报价单号`, visible: true },
+  { key: 2, label: `报价单名称`, visible: true },
+  { key: 3, label: `报价轮次`, visible: false },
+  { key: 4, label: `报价大类`, visible: false },
+  { key: 5, label: `报价类型`, visible: false },
+  { key: 6, label: `业务方向`, visible: false },
+  { key: 7, label: `部门`, visible: false },
+  { key: 8, label: `报价日期`, visible: true },
+  { key: 9, label: `报价有效期起`, visible: true },
+  { key: 10, label: `报价有效期`, visible: false },
+  { key: 11, label: `报价有效期止`, visible: true },
+  { 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: true },
+  { key: 22, label: `客户方联系人ID`, visible: false },
+  { key: 23, label: `客户方联系人`, visible: false },
+  { key: 24, label: `客户方联系电话`, visible: false },
+  { key: 25, label: `客户方电子邮箱`, visible: false },
+  { key: 26, label: `供货方联系人ID`, visible: false },
+  { key: 27, label: `供货方联系人`, visible: false },
+  { key: 28, label: `供货方联系电话`, visible: false },
+  { key: 29, label: `供货方电子邮箱`, visible: false },
+  { key: 30, label: `项目ID(可选)`, visible: false },
+  { key: 31, label: `打印模板ID(可选)`, visible: false },
+  { key: 32, label: `附件ID`, visible: false },
+  { key: 33, label: `报价单状态`, visible: false },
+  { key: 34, label: `流程状态`, visible: false },
+  { key: 35, label: `备注`, visible: true },
+  // { key: 36, label: `删除标志`, visible: true },
+  // { key: 37, label: `创建部门`, visible: true },
+  // { key: 38, label: `创建人`, visible: true },
+  // { key: 40, label: `创建时间`, visible: true },
+  // { key: 41, label: `更新人`, visible: true },
+  // { key: 42, label: `更新时间`, visible: true },
+]);
+
+const initFormData: CrmQuoteInfoForm = {
+  quoteId: undefined,
+  quoteCode: undefined,
+  quoteName: undefined,
+  quoteRound: undefined,
+  quoteCategory: undefined,
+  quoteType: undefined,
+  businessDirection: undefined,
+  quoteDeptId: undefined,
+  quoteDate: undefined,
+  validFrom: undefined,
+  validDays: undefined,
+  validTo: undefined,
+  deliveryPeriod: undefined,
+  deliveryMethod: undefined,
+  paymentMethod: undefined,
+  currencyType: undefined,
+  taxIncludedInfo: undefined,
+  taxRate: undefined,
+  totalPrice: undefined,
+  totalBeforeTax: undefined,
+  totalTax: undefined,
+  totalIncludingTax: undefined,
+  customerContactId: undefined,
+  customerContactName: undefined,
+  customerContactPhone: undefined,
+  customerContactEmail: undefined,
+  supplierContactId: undefined,
+  supplierContactName: undefined,
+  supplierContactPhone: undefined,
+  supplierContactEmail: undefined,
+  projectId: undefined,
+  templateId: undefined,
+  ossId: undefined,
+  quoteStatus: undefined,
+  flowStatus: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<CrmQuoteInfoForm, CrmQuoteInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    quoteCode: undefined,
+    quoteName: undefined,
+    quoteRound: undefined,
+    quoteCategory: undefined,
+    quoteType: undefined,
+    businessDirection: undefined,
+    quoteDeptId: undefined,
+    quoteDate: undefined,
+    validFrom: undefined,
+    validDays: undefined,
+    validTo: undefined,
+    deliveryPeriod: undefined,
+    deliveryMethod: undefined,
+    paymentMethod: undefined,
+    currencyType: undefined,
+    taxIncludedInfo: undefined,
+    taxRate: undefined,
+    totalPrice: undefined,
+    totalBeforeTax: undefined,
+    totalTax: undefined,
+    totalIncludingTax: undefined,
+    customerContactId: undefined,
+    customerContactName: undefined,
+    customerContactPhone: undefined,
+    customerContactEmail: undefined,
+    supplierContactId: undefined,
+    supplierContactName: undefined,
+    supplierContactPhone: undefined,
+    supplierContactEmail: undefined,
+    projectId: undefined,
+    templateId: undefined,
+    ossId: undefined,
+    quoteStatus: undefined,
+    flowStatus: undefined,
+    params: {
+    }
+  },
+  rules: {
+    quoteId: [
+      { required: true, message: "报价ID不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询报价单信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listCrmQuoteInfo(queryParams.value);
+  crmQuoteInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  crmQuoteInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CrmQuoteInfoVO[]) => {
+  ids.value = selection.map(item => item.quoteId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作（改为路由跳转到编辑页） */
+const handleAdd = () => {
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/oa/crm/crmQuoteInfo/edit',
+    query: { type: 'add' }
+  });
+}
+
+/** 修改按钮操作（改为路由跳转到编辑页） */
+const handleUpdate = (row?: CrmQuoteInfoVO) => {
+  const _quoteId = row?.quoteId || ids.value[0];
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/oa/crm/crmQuoteInfo/edit',
+    query: { id: _quoteId, type: 'update' }
+  });
+}
+
+/** 查看按钮操作（查看模式只读） */
+const handleView = (row?: CrmQuoteInfoVO) => {
+  const _quoteId = row?.quoteId;
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/oa/crm/crmQuoteInfo/edit',
+    query: { id: _quoteId, type: 'view' }
+  });
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  crmQuoteInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.quoteId) {
+        await updateCrmQuoteInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addCrmQuoteInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CrmQuoteInfoVO) => {
+  const _quoteIds = row?.quoteId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除报价单信息编号为"' + _quoteIds + '"的数据项？').finally(() => loading.value = false);
+  await delCrmQuoteInfo(_quoteIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('oa/crm/crmQuoteInfo/export', {
+    ...queryParams.value
+  }, `crmQuoteInfo_${new Date().getTime()}.xlsx`)
+}
+
+let crmCustomerContactList = ref([]);
+const getCustomerContactList = async () => {
+  const res = await getCrmCustomerContactList(null);
+  crmCustomerContactList.value = res.data;
+}
+onMounted(() => {
+  getCustomerContactList();
+  getList();
+});
+</script>
diff --git a/src/views/oa/crm/crmQuoteMaterial/index.vue b/src/views/oa/crm/crmQuoteMaterial/index.vue
new file mode 100644
index 0000000..f0e4013
--- /dev/null
+++ b/src/views/oa/crm/crmQuoteMaterial/index.vue
@@ -0,0 +1,373 @@
+<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="quoteId">
+                                        <el-input v-model="queryParams.quoteId" placeholder="请输入报价ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="序号(ERP风格)" prop="itemNo">
+                                        <el-input v-model="queryParams.itemNo" placeholder="请输入序号(ERP风格)" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="产品/服务名称" prop="productName">
+                                        <el-input v-model="queryParams.productName" placeholder="请输入产品/服务名称" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="规格描述" prop="specificationDescription">
+                                        <el-input v-model="queryParams.specificationDescription" placeholder="请输入规格描述" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="物料ID(SAP)" prop="materialId">
+                                        <el-input v-model="queryParams.materialId" placeholder="请输入物料ID(SAP)" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="销售物料ID(关联名)" prop="relationMaterialId">
+                                        <el-input v-model="queryParams.relationMaterialId" placeholder="请输入销售物料ID(关联名)" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="数量" prop="amount">
+                                        <el-input v-model="queryParams.amount" placeholder="请输入数量" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="单位ID" prop="unitId">
+                                        <el-input v-model="queryParams.unitId" placeholder="请输入单位ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="单位名称" prop="unitName">
+                                        <el-input v-model="queryParams.unitName" placeholder="请输入单位名称" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="未税单价" prop="beforePrice">
+                                        <el-input v-model="queryParams.beforePrice" placeholder="请输入未税单价" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="税率" prop="taxRate">
+                                        <el-input v-model="queryParams.taxRate" placeholder="请输入税率" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="含税单价" prop="includingPrice">
+                                        <el-input v-model="queryParams.includingPrice" placeholder="请输入含税单价" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="小计(含税)" prop="subtotal">
+                                        <el-input v-model="queryParams.subtotal" 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/crm:crmQuoteMaterial: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:crmQuoteMaterial: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:crmQuoteMaterial:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:crmQuoteMaterial: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="crmQuoteMaterialList" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column label="报价物料ID" align="center" prop="quoteMaterialId" v-if="columns[0].visible"/>
+                        <el-table-column label="报价ID" align="center" prop="quoteId" v-if="columns[2].visible"/>
+                        <el-table-column label="序号(ERP风格)" align="center" prop="itemNo" v-if="columns[3].visible"/>
+                        <el-table-column label="产品/服务名称" align="center" prop="productName" v-if="columns[4].visible"/>
+                        <el-table-column label="规格描述" align="center" prop="specificationDescription" v-if="columns[5].visible"/>
+                        <el-table-column label="物料ID(SAP)" align="center" prop="materialId" v-if="columns[6].visible"/>
+                        <el-table-column label="销售物料ID(关联名)" align="center" prop="relationMaterialId" v-if="columns[7].visible"/>
+                        <el-table-column label="数量" align="center" prop="amount" v-if="columns[8].visible"/>
+                        <el-table-column label="单位ID" align="center" prop="unitId" v-if="columns[9].visible"/>
+                        <el-table-column label="单位名称" align="center" prop="unitName" v-if="columns[10].visible"/>
+                        <el-table-column label="未税单价" align="center" prop="beforePrice" v-if="columns[11].visible"/>
+                        <el-table-column label="税率" align="center" prop="taxRate" v-if="columns[12].visible"/>
+                        <el-table-column label="含税单价" align="center" prop="includingPrice" v-if="columns[13].visible"/>
+                        <el-table-column label="小计(含税)" align="center" prop="subtotal" v-if="columns[14].visible"/>
+                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[15].visible"/>
+                        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[16].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:crmQuoteMaterial: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:crmQuoteMaterial: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="crmQuoteMaterialFormRef" :model="form" :rules="rules" label-width="120px">
+                            <el-form-item label="报价ID" prop="quoteId">
+                                <el-input v-model="form.quoteId" placeholder="请输入报价ID" />
+                            </el-form-item>
+                            <el-form-item label="序号(ERP风格)" prop="itemNo">
+                                <el-input v-model="form.itemNo" placeholder="请输入序号(ERP风格)" />
+                            </el-form-item>
+                            <el-form-item label="产品/服务名称" prop="productName">
+                                <el-input v-model="form.productName" placeholder="请输入产品/服务名称" />
+                            </el-form-item>
+                            <el-form-item label="规格描述" prop="specificationDescription">
+                                <el-input v-model="form.specificationDescription" placeholder="请输入规格描述" />
+                            </el-form-item>
+                            <el-form-item label="物料ID(SAP)" prop="materialId">
+                                <el-input v-model="form.materialId" placeholder="请输入物料ID(SAP)" />
+                            </el-form-item>
+                            <el-form-item label="销售物料ID(关联名)" prop="relationMaterialId">
+                                <el-input v-model="form.relationMaterialId" placeholder="请输入销售物料ID(关联名)" />
+                            </el-form-item>
+                            <el-form-item label="数量" prop="amount">
+                                <el-input v-model="form.amount" placeholder="请输入数量" />
+                            </el-form-item>
+                            <el-form-item label="单位ID" prop="unitId">
+                                <el-input v-model="form.unitId" placeholder="请输入单位ID" />
+                            </el-form-item>
+                            <el-form-item label="单位名称" prop="unitName">
+                                <el-input v-model="form.unitName" placeholder="请输入单位名称" />
+                            </el-form-item>
+                            <el-form-item label="未税单价" prop="beforePrice">
+                                <el-input v-model="form.beforePrice" placeholder="请输入未税单价" />
+                            </el-form-item>
+                            <el-form-item label="税率" prop="taxRate">
+                                <el-input v-model="form.taxRate" placeholder="请输入税率" />
+                            </el-form-item>
+                            <el-form-item label="含税单价" prop="includingPrice">
+                                <el-input v-model="form.includingPrice" placeholder="请输入含税单价" />
+                            </el-form-item>
+                            <el-form-item label="小计(含税)" prop="subtotal">
+                                <el-input v-model="form.subtotal" 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="CrmQuoteMaterial" lang="ts">
+    import { listCrmQuoteMaterial, getCrmQuoteMaterial, delCrmQuoteMaterial, addCrmQuoteMaterial, updateCrmQuoteMaterial } from '@/api/oa/crm/crmQuoteMaterial';
+    import { CrmQuoteMaterialVO, CrmQuoteMaterialQuery, CrmQuoteMaterialForm } from '@/api/oa/crm/crmQuoteMaterial/types';
+
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+        const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+    const crmQuoteMaterialList = ref<CrmQuoteMaterialVO[]>([]);
+    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 crmQuoteMaterialFormRef = 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: `序号(ERP风格)`, visible: true },
+            { key: 4, label: `产品/服务名称`, visible: true },
+            { key: 5, label: `规格描述`, visible: true },
+            { key: 6, label: `物料ID(SAP)`, visible: true },
+            { key: 7, label: `销售物料ID(关联名)`, visible: true },
+            { key: 8, label: `数量`, visible: true },
+            { key: 9, label: `单位ID`, 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 },
+    ]);
+
+    const initFormData: CrmQuoteMaterialForm = {
+                        quoteMaterialId: undefined,
+                        quoteId: undefined,
+                        itemNo: undefined,
+                        productName: undefined,
+                        specificationDescription: undefined,
+                        materialId: undefined,
+                        relationMaterialId: undefined,
+                        amount: undefined,
+                        unitId: undefined,
+                        unitName: undefined,
+                        beforePrice: undefined,
+                        taxRate: undefined,
+                        includingPrice: undefined,
+                        subtotal: undefined,
+                        remark: undefined,
+                        activeFlag: undefined,
+    }
+    const data = reactive<PageData<CrmQuoteMaterialForm, CrmQuoteMaterialQuery>>({
+        form: {...initFormData},
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+                            quoteId: undefined,
+                            itemNo: undefined,
+                            productName: undefined,
+                            specificationDescription: undefined,
+                            materialId: undefined,
+                            relationMaterialId: undefined,
+                            amount: undefined,
+                            unitId: undefined,
+                            unitName: undefined,
+                            beforePrice: undefined,
+                            taxRate: undefined,
+                            includingPrice: undefined,
+                            subtotal: undefined,
+                            activeFlag: undefined,
+            params: {
+            }
+        },
+        rules: {
+                            quoteMaterialId: [
+                            { required: true, message: "报价物料ID不能为空", trigger: "blur" }
+                        ],
+        }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询报价单物料明细列表 */
+    const getList = async () => {
+        loading.value = true;
+        const res = await listCrmQuoteMaterial(queryParams.value);
+            crmQuoteMaterialList.value = res.rows;
+        total.value = res.total;
+        loading.value = false;
+    }
+
+    /** 取消按钮 */
+    const cancel = () => {
+        reset();
+        dialog.visible = false;
+    }
+
+    /** 表单重置 */
+    const reset = () => {
+        form.value = {...initFormData};
+            crmQuoteMaterialFormRef.value?.resetFields();
+    }
+
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        queryFormRef.value?.resetFields();
+        handleQuery();
+    }
+
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: CrmQuoteMaterialVO[]) => {
+        ids.value = selection.map(item => item.quoteMaterialId);
+        single.value = selection.length != 1;
+        multiple.value = !selection.length;
+    }
+
+    /** 新增按钮操作 */
+    const handleAdd = () => {
+        reset();
+        dialog.visible = true;
+        dialog.title = "添加报价单物料明细";
+    }
+
+    /** 修改按钮操作 */
+    const handleUpdate = async (row?: CrmQuoteMaterialVO) => {
+        reset();
+        const _quoteMaterialId = row?.quoteMaterialId || ids.value[0]
+        const res = await getCrmQuoteMaterial(_quoteMaterialId);
+        Object.assign(form.value, res.data);
+        dialog.visible = true;
+        dialog.title = "修改报价单物料明细";
+    }
+
+    /** 提交按钮 */
+    const submitForm = () => {
+            crmQuoteMaterialFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                buttonLoading.value = true;
+                if (form.value.quoteMaterialId) {
+                    await updateCrmQuoteMaterial(form.value).finally(() =>  buttonLoading.value = false);
+                } else {
+                    await addCrmQuoteMaterial(form.value).finally(() =>  buttonLoading.value = false);
+                }
+                proxy?.$modal.msgSuccess("操作成功");
+                dialog.visible = false;
+                await getList();
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: CrmQuoteMaterialVO) => {
+        const _quoteMaterialIds = row?.quoteMaterialId || ids.value;
+        await proxy?.$modal.confirm('是否确认删除报价单物料明细编号为"' + _quoteMaterialIds + '"的数据项？').finally(() => loading.value = false);
+        await delCrmQuoteMaterial(_quoteMaterialIds);
+        proxy?.$modal.msgSuccess("删除成功");
+        await getList();
+    }
+
+    /** 导出按钮操作 */
+    const handleExport = () => {
+        proxy?.download('oa/crm/crmQuoteMaterial/export', {
+            ...queryParams.value
+        }, `crmQuoteMaterial_${new Date().getTime()}.xlsx`)
+    }
+
+    onMounted(() => {
+        getList();
+    });
+</script>
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index 48cfff1..c87db1a 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -173,30 +173,31 @@
       <el-table :data="contractMaterialList" border v-loading="materialLoading">
         <el-table-column label="产品名称" align="center" prop="productName" min-width="120" />
         <el-table-column label="规格描述" align="center" prop="specificationDescription" min-width="120" />
-        <el-table-column label="物料ID" align="center" prop="materialId" width="100" />
-        <el-table-column label="销售物料ID" align="center" prop="relationMaterialId" width="120" />
-        <el-table-column label="数量" align="center" prop="amount" width="100">
+        <el-table-column label="物料编号" align="center" prop="materialCode" width="120" />
+        <el-table-column label="物料名称" align="center" prop="materialName" width="120" />
+        <el-table-column label="销售物料名称" align="center" prop="saleMaterialName" width="120" />
+        <el-table-column label="数量" align="center" prop="amount" width="80">
           <template #default="scope">
             {{ scope.row.amount ? Number(scope.row.amount).toFixed(2) : '0.00' }}
           </template>
         </el-table-column>
-        <el-table-column label="单位ID" align="center" prop="unitId" width="100" />
-        <el-table-column label="未税单价" align="center" prop="beforePrice" width="120">
+        <el-table-column label="单位" align="center" prop="unitName" width="60" />
+        <el-table-column label="未税单价" align="center" prop="beforePrice" width="100">
           <template #default="scope">
             {{ scope.row.beforePrice ? Number(scope.row.beforePrice).toFixed(2) : '0.00' }}
           </template>
         </el-table-column>
-        <el-table-column label="税率(%)" align="center" prop="taxRate" width="100">
+        <el-table-column label="税率(%)" align="center" prop="taxRate" width="80">
           <template #default="scope">
             {{ scope.row.taxRate ? Number(scope.row.taxRate).toFixed(2) : '0.00' }}
           </template>
         </el-table-column>
-        <el-table-column label="含税单价" align="center" prop="includingPrice" width="120">
+        <el-table-column label="含税单价" align="center" prop="includingPrice" width="100">
           <template #default="scope">
             {{ scope.row.includingPrice ? Number(scope.row.includingPrice).toFixed(2) : '0.00' }}
           </template>
         </el-table-column>
-        <el-table-column label="小计" align="center" prop="subtotal" width="120">
+        <el-table-column label="小计" align="center" prop="subtotal" width="80">
           <template #default="scope">
             {{ scope.row.subtotal ? Number(scope.row.subtotal).toFixed(2) : '0.00' }}
           </template>
@@ -273,15 +274,18 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="税率(%)" prop="taxRate">
-              <el-input-number
+              <el-select
                 v-model="materialForm.taxRate"
-                placeholder="请输入税率"
+                placeholder="请选择或输入税率"
                 style="width: 100%"
                 @change="calculateBeforePrice"
-                :precision="2"
-                :min="0"
-                :max="100"
-              />
+                filterable
+                allow-create
+                default-first-option
+              >
+                <el-option label="6" :value="6"></el-option>
+                <el-option label="13" :value="13"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -376,6 +380,7 @@ import { ref } from 'vue';
 import { allListDept, listDept } from '@/api/system/dept';
 import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
 import { getBasePrintTemplateList } from '@/api/oa/base/printTemplate';
+import { CodeRuleEnum } from '@/enums/OAEnum';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
@@ -550,7 +555,7 @@ watch(
 const generateContractCode = async () => {
   if (isCodeGenerated.value) return; // 如果已经生成过，直接返回
   try {
-    const params = { codeRuleCode: '1001' } as any;
+    const params = { codeRuleCode: CodeRuleEnum.CONTRACT } as any;
     const res = await getRuleGenerateCode(params);
     form.value.contractCode = res.msg;
     isCodeGenerated.value = true; // 标记为已生成
@@ -858,7 +863,7 @@ const handleApprovalRecord = () => {
 
 // 提交回调
 const submitCallback = async () => {
-  await proxy?.$tab.closePage();
+  await proxy.$tab.closePage(proxy.$route);
   router.go(-1);
 };
 
diff --git a/src/views/oa/erp/projectInfo/edit.vue b/src/views/oa/erp/projectInfo/edit.vue
new file mode 100644
index 0000000..7662095
--- /dev/null
+++ b/src/views/oa/erp/projectInfo/edit.vue
@@ -0,0 +1,679 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <!-- 审批按钮组件 -->
+      <approvalButton
+        @submitForm="submitForm"
+        @approvalVerifyOpen="approvalVerifyOpen"
+        @handleApprovalRecord="handleApprovalRecord"
+        :buttonLoading="buttonLoading"
+        :id="form.projectId"
+        :status="form.flowStatus"
+        :pageType="routeParams.type"
+        :mode="false"
+      />
+    </el-card>
+
+    <el-card shadow="never" style="margin-top: 20px">
+      <el-form ref="projectInfoFormRef" :model="form" :disabled="routeParams.type === 'view'" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="有无合同" prop="contractFlag">
+              <el-radio-group v-model="form.contractFlag">
+                <el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目编号" prop="projectCode">
+              <el-input v-model="form.projectCode" placeholder="请输入项目编号">
+                <template #append>
+                  <el-button type="primary" @click="generateProjectCode" :disabled="isCodeGenerated">生成项目编号 </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务方向" prop="businessDirection">
+              <el-select v-model="form.businessDirection" placeholder="请选择业务方向">
+                <el-option v-for="dict in business_direction" :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="projectCategory">
+              <el-select v-model="form.projectCategory" placeholder="请选择项目类别" disabled>
+                <el-option v-for="dict in project_category" :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="spareFlag">
+              <el-radio-group v-model="form.spareFlag" disabled>
+                <el-radio v-for="dict in spare_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目类型" prop="projectTypeId">
+              <el-cascader
+                v-model="form.projectTypeId"
+                :options="projectTypeOptions"
+                :props="{ value: 'projectTypeId', label: 'typeName', children: 'children', emitPath: false }"
+                placeholder="请选择项目类型"
+                clearable
+                filterable
+                style="width: 100%"
+              />
+            </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="deptId">
+              <el-select v-model="form.deptId" placeholder="请选择部门">
+                <el-option v-for="item in deptInfoList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目经理" prop="managerId">
+              <el-select v-model="form.managerId" 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-col :span="12">
+            <el-form-item label="部门负责人" prop="chargeId">
+              <el-select v-model="form.chargeId" 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-col :span="12">
+            <el-form-item label="分管副总" prop="deputyId">
+              <el-select v-model="form.deputyId" 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-col :span="12">
+            <el-form-item label="抄送人员" prop="peopleId">
+              <el-select v-model="form.peopleId" placeholder="请选择抄送人员" clearable filterable multiple>
+                <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="金额" prop="amount">
+              <el-input v-model="form.amount" placeholder="请输入金额">
+                <template #append>元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目状态" prop="projectStatus">
+              <el-radio-group v-model="form.projectStatus" disabled>
+                <el-radio v-for="dict in project_status" :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" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <!-- 项目关联合同 -->
+    <el-card shadow="never" style="margin-top: 20px" v-if="form.projectId && routeParams.type !== 'add'">
+      <template #header>
+        <el-row :gutter="10">
+          <el-col :span="1.5">
+            <span class="card-title">项目关联合同</span>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAddContract" size="small" :disabled="routeParams.type === 'view'"
+              >新增关联
+            </el-button>
+          </el-col>
+        </el-row>
+      </template>
+
+      <el-table v-loading="contractLoading" border :data="projectContractsList">
+        <el-table-column type="index" label="序号" width="60" align="center" />
+        <el-table-column label="合同编号" align="center" prop="contractCode" min-width="120" />
+        <el-table-column label="合同名称" align="center" prop="contractName" min-width="180" />
+        <el-table-column label="合同总价" align="center" prop="totalPrice" min-width="120">
+          <template #default="scope">
+            {{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="业务方向" align="center" prop="businessDirection" min-width="120">
+          <template #default="scope">
+            <dict-tag :options="business_direction" :value="scope.row.businessDirection" />
+          </template>
+        </el-table-column>
+        <el-table-column label="合同状态" align="center" prop="contractStatus" min-width="100">
+          <template #default="scope">
+            <dict-tag :options="contract_status" :value="scope.row.contractStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" min-width="150" show-overflow-tooltip />
+        <el-table-column label="操作" align="center" width="120" fixed="right" v-if="routeParams.type !== 'view'">
+          <template #default="scope">
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="danger" icon="Delete" @click="handleDeleteContract(scope.row)"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <!-- 添加合同关联对话框 -->
+    <el-dialog title="选择关联合同" v-model="contractDialog.visible" width="900px" append-to-body>
+      <el-form :model="contractQueryParams" :inline="true" label-width="100px">
+        <el-form-item label="合同编号">
+          <el-input
+            v-model="contractQueryParams.contractCode"
+            placeholder="请输入合同编号"
+            clearable
+            @keyup.enter="getContractList"
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="合同名称">
+          <el-input
+            v-model="contractQueryParams.contractName"
+            placeholder="请输入合同名称"
+            clearable
+            @keyup.enter="getContractList"
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="getContractList">搜索</el-button>
+          <el-button icon="Refresh" @click="resetContractQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        ref="contractTableRef"
+        v-loading="contractSelectLoading"
+        border
+        :data="contractList"
+        @selection-change="handleContractSelectionChange"
+        max-height="400"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="合同编号" align="center" prop="contractCode" min-width="120" />
+        <el-table-column label="合同名称" align="center" prop="contractName" min-width="180" show-overflow-tooltip />
+        <el-table-column label="合同总价" align="center" prop="totalPrice" min-width="120">
+          <template #default="scope">
+            {{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="业务方向" align="center" prop="businessDirection" min-width="120">
+          <template #default="scope">
+            <dict-tag :options="business_direction" :value="scope.row.businessDirection" />
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="contractTotal > 0"
+        :total="contractTotal"
+        v-model:page="contractQueryParams.pageNum"
+        v-model:limit="contractQueryParams.pageSize"
+        @pagination="getContractList"
+      />
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitContractRelation" :loading="contractButtonLoading">确 定</el-button>
+          <el-button @click="contractDialog.visible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 提交审批组件 -->
+    <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+    <!-- 审批记录 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script setup name="ProjectInfoEdit" lang="ts">
+import { getProjectInfo, addProjectInfo, updateProjectInfo } from '@/api/oa/erp/projectInfo';
+import { projectSubmitAndFlowStart } from '@/api/oa/erp/projectInfo';
+import { ProjectInfoForm } from '@/api/oa/erp/projectInfo/types';
+import { getRuleGenerateCode } from '@/api/system/codeRule';
+import { startWorkFlow } from '@/api/workflow/task';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { allListDept } from '@/api/system/dept';
+import { listProjectType } from '@/api/oa/erp/projectType';
+import { ProjectTypeVO } from '@/api/oa/erp/projectType/types';
+import { listUser } from '@/api/system/user';
+import { UserQuery } from '@/api/system/user/types';
+import { CodeRuleEnum, ProjectCategoryEnum } from '@/enums/OAEnum';
+import { listProjectContracts, addProjectContracts, delProjectContracts, getErpProjectContractsList } from '@/api/oa/erp/projectContracts';
+import { ProjectContractsForm, ProjectContractsQuery } from '@/api/oa/erp/projectContracts/types';
+import { listContractInfo } from '@/api/oa/erp/contractInfo';
+import { ContractInfoVO, ContractInfoQuery } from '@/api/oa/erp/contractInfo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const route = useRoute();
+const router = useRouter();
+
+// 路由参数
+const routeParams = ref<Record<string, any>>({});
+const { business_direction, project_status, contract_flag, project_category, spare_flag, contract_status } = toRefs<any>(
+  proxy?.useDict('business_direction', 'project_status', 'contract_flag', 'project_category', 'spare_flag', 'contract_status')
+);
+
+const buttonLoading = ref(false);
+const projectInfoFormRef = ref<ElFormInstance>();
+
+// 审批相关组件引用
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+// 流程相关数据
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: 'OAP', // 项目流程编码
+  variables: {},
+  bizExt: {}
+});
+
+// 任务变量
+const taskVariables = ref<Record<string, any>>({});
+const flowInstanceBizExtBo = ref<Record<string, any>>({});
+
+// 项目编号生成状态
+const isCodeGenerated = ref(false);
+
+/** 查询部门信息下拉框结构 */
+const deptInfoList = ref([]);
+const getDeptInfoListSelect = async () => {
+  const params = { deptCategory: '03' } as any;
+  let res = await allListDept(params);
+  deptInfoList.value = res.data;
+};
+
+/** 查询用户列表 */
+const userList = ref([]);
+const getUserList = async () => {
+  const params: UserQuery = { pageNum: 1, pageSize: 9999 };
+  const res = await listUser(params);
+  userList.value = res.rows;
+};
+
+const projectTypeOptions = ref<ProjectTypeVO[]>([]);
+/** 查询项目类型列表 */
+const getProjectTypeList = async () => {
+  const params = { spareFlag: form.value.spareFlag } as any;
+  console.log(params);
+  const res = await listProjectType(params);
+  projectTypeOptions.value = proxy?.handleTree<ProjectTypeVO>(res.data, 'projectTypeId', 'parentId') || [];
+};
+
+type ProjectInfoFormEx = ProjectInfoForm & {
+  flowCode?: string;
+  variables?: any;
+  bizExt?: any;
+};
+
+const initFormData: ProjectInfoFormEx = {
+  projectId: undefined,
+  contractFlag: '1',
+  projectCode: undefined,
+  projectName: undefined,
+  businessDirection: undefined,
+  projectCategory: undefined,
+  spareFlag: undefined,
+  projectTypeId: undefined,
+  paymentMethod: undefined,
+  deptId: undefined,
+  managerId: undefined,
+  chargeId: undefined,
+  deputyId: undefined,
+  peopleId: undefined,
+  amount: undefined,
+  projectStatus: '1',
+  flowStatus: undefined,
+  sortOrder: 0,
+  contractId: undefined,
+  remark: undefined,
+  activeFlag: '1',
+  flowCode: undefined,
+  variables: undefined,
+  bizExt: undefined
+};
+
+const data = reactive<{ form: ProjectInfoFormEx; rules: any }>({
+  form: { ...initFormData },
+  rules: {
+    contractFlag: [{ required: true, message: '有无合同不能为空', trigger: 'change' }],
+    projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+    projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
+    businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'change' }],
+    projectCategory: [{ required: true, message: '项目类别不能为空', trigger: 'change' }]
+  }
+});
+
+const { form, rules } = toRefs(data);
+
+// 生成项目编号
+const generateProjectCode = async () => {
+  if (isCodeGenerated.value) return;
+
+  try {
+    const codeRuleCode = form.value.projectCategory === ProjectCategoryEnum.RD ? CodeRuleEnum.PROJECT_RD : CodeRuleEnum.PROJECT;
+    const params = { codeRuleCode: codeRuleCode } as any;
+    const res = await getRuleGenerateCode(params);
+    form.value.projectCode = res.msg;
+    isCodeGenerated.value = true;
+    proxy?.$modal.msgSuccess('项目编号生成成功');
+  } catch (error) {
+    console.error('生成项目编号失败:', error);
+    proxy?.$modal.msgError('生成项目编号失败');
+  }
+};
+
+/** 提交按钮 */
+const submitForm = (status: string, mode: boolean) => {
+  try {
+    projectInfoFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        buttonLoading.value = true;
+
+        // 准备提交数据，将 peopleId 数组转换为字符串
+        const submitData = { ...form.value };
+        if (Array.isArray(submitData.peopleId)) {
+          submitData.peopleId = submitData.peopleId.join(',') as any;
+        }
+
+        // 设置后端发起和不等于草稿状态 直接走流程发起
+        if (status != 'draft') {
+          // 后端发起流程模式
+          submitData.flowCode = 'OAP';
+          // 流程变量
+          submitData.variables = {
+            projectName: submitData.projectName,
+            amount: submitData.amount,
+            projectCode: submitData.projectCode
+          };
+          // 流程实例业务扩展字段
+          submitData.bizExt = {
+            businessTitle: '项目审批',
+            businessCode: submitData.projectCode
+          };
+          submitData.projectStatus = '2';
+          submitData.flowStatus = 'waiting';
+          const res = await projectSubmitAndFlowStart(submitData).finally(() => (buttonLoading.value = false));
+          form.value = res.data;
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('操作成功');
+          proxy?.$tab.closePage();
+          router.go(-1);
+        } else {
+          if (status === 'draft') {
+            submitData.projectStatus = '1';
+            submitData.flowStatus = 'draft';
+          }
+          if (submitData.projectId) {
+            await updateProjectInfo(submitData).finally(() => (buttonLoading.value = false));
+          } else {
+            await addProjectInfo(submitData).finally(() => (buttonLoading.value = false));
+          }
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('暂存成功');
+          proxy?.$tab.closePage();
+          router.go(-1);
+        }
+      }
+    });
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+
+// 提交申请
+const handleStartWorkFlow = async (data: ProjectInfoForm) => {
+  try {
+    submitFormData.value.flowCode = 'OAP';
+    submitFormData.value.businessId = data.projectId;
+
+    // 流程变量
+    taskVariables.value = {
+      projectId: data.projectId,
+      projectName: data.projectName,
+      amount: data.amount,
+      projectCode: data.projectCode
+    };
+
+    // 流程实例业务扩展字段
+    flowInstanceBizExtBo.value = {
+      businessTitle: '项目审批',
+      businessCode: data.projectCode
+    };
+
+    submitFormData.value.variables = taskVariables.value;
+    submitFormData.value.bizExt = flowInstanceBizExtBo.value;
+
+    const resp = await startWorkFlow(submitFormData.value);
+
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      await submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+    router.go(-1);
+  }
+};
+
+//初始化调用
+const loadSelectOptions = () => {
+  getDeptInfoListSelect();
+  getUserList();
+};
+
+onMounted(async () => {
+  nextTick(async () => {
+    // 获取路由参数
+    routeParams.value = route.query;
+    loadSelectOptions();
+    const id = routeParams.value.id as string | number;
+    if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
+      proxy?.$modal.loading('正在加载数据，请稍后...');
+      const res = await getProjectInfo(id);
+      Object.assign(form.value, res.data);
+
+      // 将抄送人员字符串转换为数组，用于多选下拉框显示
+      if (form.value.peopleId && typeof form.value.peopleId === 'string') {
+        form.value.peopleId = (form.value.peopleId as string).split(',').map((id) => {
+          const numId = Number(id.trim());
+          return isNaN(numId) ? id.trim() : numId;
+        }) as any;
+      }
+
+      proxy?.$modal.closeLoading();
+      // 编辑模式：如果已有项目编号，禁用生成按钮
+      if (form.value.projectCode) {
+        isCodeGenerated.value = true;
+      }
+
+      // 加载项目关联的合同列表
+      await getProjectContractsList();
+    } else {
+      // 新增模式：如果已有项目编号，禁用生成按钮
+      if (form.value.projectCode) {
+        isCodeGenerated.value = true;
+      }
+      // 新增模式：设置项目类别
+      if (routeParams.value.projectCategory) {
+        form.value.projectCategory = routeParams.value.projectCategory as string;
+      }
+    }
+    form.value.spareFlag = form.value.projectCategory === ProjectCategoryEnum.SALE_SPARE ? '1' : '0';
+    await getProjectTypeList();
+  });
+});
+
+// 审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.projectId);
+};
+
+// 提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(route);
+  router.go(-1);
+};
+
+// 审批
+const approvalVerifyOpen = async () => {
+  await submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+
+// ================== 项目关联合同相关 ==================
+const contractLoading = ref(false);
+const projectContractsList = ref<any[]>([]);
+const contractDialog = reactive({ visible: false });
+const contractTableRef = ref();
+const contractSelectLoading = ref(false);
+const contractList = ref<ContractInfoVO[]>([]);
+const contractTotal = ref(0);
+const selectedContracts = ref<ContractInfoVO[]>([]);
+const contractButtonLoading = ref(false);
+
+// 合同查询参数
+const contractQueryParams = ref<ContractInfoQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  contractStatus: '3' // 只查询可用状态的合同
+});
+
+/** 查询项目关联的合同列表 */
+const getProjectContractsList = async () => {
+  if (!form.value.projectId) return;
+
+  try {
+    contractLoading.value = true;
+    const params = { projectId: form.value.projectId } as any;
+    const res = await getErpProjectContractsList(params);
+    // 后端已经通过left join返回了完整的合同信息
+    projectContractsList.value = res.rows || [];
+  } catch (error) {
+    console.error('查询项目关联合同失败:', error);
+  } finally {
+    contractLoading.value = false;
+  }
+};
+
+/** 打开添加合同关联对话框 */
+const handleAddContract = () => {
+  contractDialog.visible = true;
+  contractQueryParams.value.pageNum = 1;
+  getContractList();
+};
+
+/** 查询合同列表 */
+const getContractList = async () => {
+  try {
+    contractSelectLoading.value = true;
+    const res = await listContractInfo(contractQueryParams.value);
+    // 过滤掉已经关联的合同
+    const existingContractIds = projectContractsList.value.map((item) => item.contractId);
+    contractList.value = res.rows.filter((contract) => !existingContractIds.includes(contract.contractId));
+    contractTotal.value = contractList.value.length;
+  } catch (error) {
+    console.error('查询合同列表失败:', error);
+  } finally {
+    contractSelectLoading.value = false;
+  }
+};
+
+/** 重置合同查询 */
+const resetContractQuery = () => {
+  contractQueryParams.value.contractCode = undefined;
+  contractQueryParams.value.contractName = undefined;
+  contractQueryParams.value.pageNum = 1;
+  getContractList();
+};
+
+/** 合同多选框选中数据 */
+const handleContractSelectionChange = (selection: ContractInfoVO[]) => {
+  selectedContracts.value = selection;
+};
+
+/** 提交合同关联 */
+const submitContractRelation = async () => {
+  if (selectedContracts.value.length === 0) {
+    proxy?.$modal.msgWarning('请至少选择一个合同');
+    return;
+  }
+
+  try {
+    contractButtonLoading.value = true;
+    // 批量添加关联关系
+    const promises = selectedContracts.value.map((contract, index) => {
+      const data: ProjectContractsForm = {
+        projectId: form.value.projectId,
+        contractId: contract.contractId,
+        sortOrder: projectContractsList.value.length + index + 1,
+        activeFlag: '1'
+      };
+      return addProjectContracts(data);
+    });
+
+    await Promise.all(promises);
+    proxy?.$modal.msgSuccess('添加关联成功');
+    contractDialog.visible = false;
+    selectedContracts.value = [];
+    // 刷新列表
+    await getProjectContractsList();
+  } catch (error) {
+    console.error('添加合同关联失败:', error);
+    proxy?.$modal.msgError('添加关联失败');
+  } finally {
+    contractButtonLoading.value = false;
+  }
+};
+
+/** 删除合同关联 */
+const handleDeleteContract = async (row: any) => {
+  try {
+    await proxy?.$modal.confirm(`是否确认删除与合同"${row.contractName}"的关联关系？`);
+    await delProjectContracts(row.projectContractsId);
+    proxy?.$modal.msgSuccess('删除关联成功');
+    // 刷新列表
+    await getProjectContractsList();
+  } catch (error) {
+    console.error('删除合同关联失败:', error);
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.card-title {
+  font-weight: bold;
+  font-size: 16px;
+  color: #303133;
+}
+</style>
diff --git a/src/views/oa/erp/projectInfo/index.vue b/src/views/oa/erp/projectInfo/index.vue
index 8d588e8..430269e 100644
--- a/src/views/oa/erp/projectInfo/index.vue
+++ b/src/views/oa/erp/projectInfo/index.vue
@@ -53,7 +53,20 @@
       <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:projectInfo:add']"> 新增 </el-button>
+            <el-dropdown trigger="click" @command="handleAdd">
+              <el-button type="primary" plain icon="Plus" v-hasPermi="['oa/erp:projectInfo:add']">
+                新增
+                <el-icon class="el-icon--right"><arrow-down /></el-icon>
+              </el-button>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item command="1">销售项目（实施、物流）</el-dropdown-item>
+                  <el-dropdown-item command="2">销售项目（备件）</el-dropdown-item>
+                  <el-dropdown-item command="3">研发项目</el-dropdown-item>
+                  <el-dropdown-item command="4">预投项目</el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
           </el-col>
           <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:projectInfo:edit']"
@@ -80,14 +93,14 @@
             <dict-tag :options="contract_flag" :value="scope.row.contractFlag" />
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" prop="projectCode" v-if="columns[3].visible" />
-        <el-table-column label="项目名称" align="center" prop="projectName" v-if="columns[4].visible" />
-        <el-table-column label="业务方向" align="center" prop="businessDirection" v-if="columns[5].visible">
+        <el-table-column label="项目编号" align="center" prop="projectCode" width="120" v-if="columns[3].visible" />
+        <el-table-column label="项目名称" align="center" prop="projectName" width="140" v-if="columns[4].visible" />
+        <el-table-column label="业务方向" align="center" prop="businessDirection" width="100" v-if="columns[5].visible">
           <template #default="scope">
             <dict-tag :options="business_direction" :value="scope.row.businessDirection" />
           </template>
         </el-table-column>
-        <el-table-column label="项目类别" align="center" prop="projectCategory" v-if="columns[6].visible">
+        <el-table-column label="项目类别" align="center" prop="projectCategory" width="150" v-if="columns[6].visible">
           <template #default="scope">
             <dict-tag :options="project_category" :value="scope.row.projectCategory" />
           </template>
@@ -97,12 +110,12 @@
             <dict-tag :options="spare_flag" :value="scope.row.spareFlag" />
           </template>
         </el-table-column>
-        <el-table-column label="项目类型" align="center" prop="projectTypeId" v-if="columns[8].visible" />
+        <el-table-column label="项目类型" align="center" prop="typeName" width="130" v-if="columns[8].visible" />
         <el-table-column label="付款方式" align="center" prop="paymentMethod" v-if="columns[9].visible" />
-        <el-table-column label="部门ID" align="center" prop="deptId" v-if="columns[10].visible" />
-        <el-table-column label="项目经理" align="center" prop="managerId" v-if="columns[11].visible" />
-        <el-table-column label="部门负责人" align="center" prop="chargeId" v-if="columns[12].visible" />
-        <el-table-column label="分管副总" align="center" prop="deputyId" v-if="columns[13].visible" />
+        <el-table-column label="部门" align="center" prop="deptName" v-if="columns[10].visible" />
+        <el-table-column label="项目经理" align="center" prop="managerName" width="100" v-if="columns[11].visible" />
+        <el-table-column label="部门负责人" align="center" prop="chargeName" width="120" v-if="columns[12].visible" />
+        <el-table-column label="分管副总" align="center" prop="deputyName" width="100" v-if="columns[13].visible" />
         <el-table-column label="抄送人员" align="center" prop="peopleId" v-if="columns[14].visible" />
         <el-table-column label="金额" align="center" prop="amount" v-if="columns[15].visible" />
         <el-table-column label="项目状态" align="center" prop="projectStatus" v-if="columns[16].visible">
@@ -110,7 +123,11 @@
             <dict-tag :options="project_status" :value="scope.row.projectStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[17].visible" />
+        <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[17].visible">
+          <template #default="scope">
+            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus" />
+          </template>
+        </el-table-column>
         <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[18].visible" />
         <el-table-column label="合同ID(预留)" align="center" prop="contractId" v-if="columns[19].visible" />
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[20].visible" />
@@ -119,117 +136,49 @@
             <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" width="120" fixed="right">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+            <el-tooltip content="修改" placement="top" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'back'">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:projectInfo: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:projectInfo:remove']"></el-button>
+            <el-tooltip content="查看" placement="top"  v-if="scope.row.flowStatus !== 'draft'">
+              <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
             </el-tooltip>
+<!--            <el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'">-->
+<!--              <el-button-->
+<!--                size="small"-->
+<!--                type="warning"-->
+<!--                icon="Notification"-->
+<!--                @click="handleCancelProcessApply(scope.row.projectId)"-->
+<!--              >撤销</el-button-->
+<!--              >-->
+<!--            </el-col>-->
           </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="700px" append-to-body>
-      <el-form ref="projectInfoFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="有无合同" prop="contractFlag">
-          <el-radio-group v-model="form.contractFlag">
-            <el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="项目编号" prop="projectCode">
-          <el-input v-model="form.projectCode" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="form.projectName" placeholder="请输入项目名称" />
-        </el-form-item>
-        <el-form-item label="业务方向" prop="businessDirection">
-          <el-select v-model="form.businessDirection" placeholder="请选择业务方向">
-            <el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="项目类别" prop="projectCategory">
-          <el-select v-model="form.projectCategory" placeholder="请选择项目类别">
-            <el-option v-for="dict in project_category" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备件标识" prop="spareFlag">
-          <el-radio-group v-model="form.spareFlag">
-            <el-radio v-for="dict in spare_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="项目类型" prop="projectTypeId">
-          <el-input v-model="form.projectTypeId" placeholder="请输入项目类型" />
-        </el-form-item>
-        <el-form-item label="付款方式" prop="paymentMethod">
-          <el-input v-model="form.paymentMethod" placeholder="请输入付款方式" />
-        </el-form-item>
-        <el-form-item label="部门ID" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门ID" />
-        </el-form-item>
-        <el-form-item label="项目经理" prop="managerId">
-          <el-input v-model="form.managerId" placeholder="请输入项目经理" />
-        </el-form-item>
-        <el-form-item label="部门负责人" prop="chargeId">
-          <el-input v-model="form.chargeId" placeholder="请输入部门负责人" />
-        </el-form-item>
-        <el-form-item label="分管副总" prop="deputyId">
-          <el-input v-model="form.deputyId" placeholder="请输入分管副总" />
-        </el-form-item>
-        <el-form-item label="抄送人员" prop="peopleId">
-          <el-input v-model="form.peopleId" placeholder="请输入抄送人员" />
-        </el-form-item>
-        <el-form-item label="金额" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入金额" />
-        </el-form-item>
-        <el-form-item label="项目状态" prop="projectStatus">
-          <el-radio-group v-model="form.projectStatus">
-            <el-radio v-for="dict in project_status" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="流程状态" prop="flowStatus">
-          <el-input v-model="form.flowStatus" placeholder="请输入流程状态" />
-        </el-form-item>
-<!--        <el-form-item label="排序号" prop="sortOrder">-->
-<!--          <el-input v-model="form.sortOrder" placeholder="请输入排序号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="合同ID(预留)" prop="contractId">-->
-<!--          <el-input v-model="form.contractId" placeholder="请输入合同ID(预留)" />-->
-<!--        </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>
+    <!-- 审批记录 -->
+    <ApprovalRecord ref="approvalRecordRef" />
   </div>
 </template>
 
 <script setup name="ProjectInfo" lang="ts">
-import { listProjectInfo, getProjectInfo, delProjectInfo, addProjectInfo, updateProjectInfo } from '@/api/oa/erp/projectInfo';
-import { ProjectInfoVO, ProjectInfoQuery, ProjectInfoForm } from '@/api/oa/erp/projectInfo/types';
+import { listProjectInfo, delProjectInfo } from '@/api/oa/erp/projectInfo';
+import { ProjectInfoVO, ProjectInfoQuery } from '@/api/oa/erp/projectInfo/types';
+import { cancelProcessApply } from '@/api/workflow/instance';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { business_direction, project_status, active_flag, contract_flag, project_category, spare_flag } = toRefs<any>(
-  proxy?.useDict('business_direction', 'project_status', 'active_flag', 'contract_flag', 'project_category', 'spare_flag')
+const route = useRoute();
+const router = useRouter();
+const { business_direction, project_status, active_flag, contract_flag, project_category, spare_flag, wf_business_status } = toRefs<any>(
+  proxy?.useDict('business_direction', 'project_status', 'active_flag', 'contract_flag', 'project_category', 'spare_flag', 'wf_business_status')
 );
 
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const projectInfoList = ref<ProjectInfoVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
@@ -238,12 +187,6 @@ const multiple = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const projectInfoFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
@@ -257,11 +200,11 @@ const columns = ref<FieldOption[]>([
   { key: 7, label: `备件标识`, visible: true },
   { key: 8, label: `项目类型`, visible: true },
   { key: 9, label: `付款方式`, visible: true },
-  { key: 10, label: `部门ID`, 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: 14, label: `抄送人员`, visible: false },
   { key: 15, label: `金额`, visible: true },
   { key: 16, label: `项目状态`, visible: true },
   { key: 17, label: `流程状态`, visible: true },
@@ -277,31 +220,7 @@ const columns = ref<FieldOption[]>([
   { key: 27, label: `更新时间`, visible: false }
 ]);
 
-const initFormData: ProjectInfoForm = {
-  projectId: undefined,
-  contractFlag: undefined,
-  projectCode: undefined,
-  projectName: undefined,
-  businessDirection: undefined,
-  projectCategory: undefined,
-  spareFlag: undefined,
-  projectTypeId: undefined,
-  paymentMethod: undefined,
-  deptId: undefined,
-  managerId: undefined,
-  chargeId: undefined,
-  deputyId: undefined,
-  peopleId: undefined,
-  amount: undefined,
-  projectStatus: undefined,
-  flowStatus: undefined,
-  sortOrder: undefined,
-  contractId: undefined,
-  remark: undefined,
-  activeFlag: undefined
-};
-const data = reactive<PageData<ProjectInfoForm, ProjectInfoQuery>>({
-  form: { ...initFormData },
+const data = reactive<{ queryParams: ProjectInfoQuery }>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -325,17 +244,10 @@ const data = reactive<PageData<ProjectInfoForm, ProjectInfoQuery>>({
     contractId: undefined,
     activeFlag: undefined,
     params: {}
-  },
-  rules: {
-    contractFlag: [{ required: true, message: '有无合同不能为空', trigger: 'change' }],
-    projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-    projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
-    businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'change' }],
-    projectCategory: [{ required: true, message: '项目类别不能为空', trigger: 'change' }]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams } = toRefs(data);
 
 /** 查询项目信息列表 */
 const getList = async () => {
@@ -346,18 +258,6 @@ const getList = async () => {
   loading.value = false;
 };
 
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  projectInfoFormRef.value?.resetFields();
-};
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -378,35 +278,39 @@ const handleSelectionChange = (selection: ProjectInfoVO[]) => {
 };
 
 /** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加项目信息';
+const handleAdd = (projectCategory: string) => {
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/project/projectInfo/edit',
+    query: {
+      type: 'add',
+      projectCategory: projectCategory
+    }
+  });
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: ProjectInfoVO) => {
-  reset();
+const handleUpdate = (row?: ProjectInfoVO) => {
   const _projectId = row?.projectId || ids.value[0];
-  const res = await getProjectInfo(_projectId);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改项目信息';
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/project/projectInfo/edit',
+    query: {
+      id: _projectId,
+      type: 'update'
+    }
+  });
 };
 
-/** 提交按钮 */
-const submitForm = () => {
-  projectInfoFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.projectId) {
-        await updateProjectInfo(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addProjectInfo(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
+/** 查看按钮操作 */
+const handleView = (row?: ProjectInfoVO) => {
+  const _projectId = row?.projectId;
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/project/projectInfo/edit',
+    query: {
+      id: _projectId,
+      type: 'view'
     }
   });
 };
@@ -431,6 +335,24 @@ const handleExport = () => {
   );
 };
 
+/** 撤销按钮操作 */
+const handleCancelProcessApply = async (id: string | number) => {
+  await proxy?.$modal.confirm('是否确认撤销当前单据？');
+  loading.value = true;
+  const data = {
+    businessId: id,
+    message: '申请人撤销流程！'
+  };
+  await cancelProcessApply(data).finally(() => (loading.value = false));
+  await getList();
+  proxy?.$modal.msgSuccess('撤销成功');
+};
+
+// 查看审批记录
+const handleApprovalRecord = (row: ProjectInfoVO) => {
+  approvalRecordRef.value?.init(row.projectId);
+};
+
 onMounted(() => {
   getList();
 });