From c498327c2c60ffafa8e609da61471d2cbe0854f8 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 29 Oct 2025 14:08:45 +0800
Subject: [PATCH] =?UTF-8?q?1.0.22=20=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E3=80=81=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oa/erp/projectContracts/types.ts |  30 +
 src/api/oa/erp/projectInfo/index.ts      |  12 +
 src/api/oa/erp/projectInfo/types.ts      |  15 +
 src/views/oa/erp/projectInfo/edit.vue    | 679 +++++++++++++++++++++++
 src/views/oa/erp/projectInfo/index.vue   | 280 ++++------
 5 files changed, 837 insertions(+), 179 deletions(-)
 create mode 100644 src/views/oa/erp/projectInfo/edit.vue

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/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();
 });