Merge remote-tracking branch 'origin/dev' into dev

src/api/oa/erp/contractInfo/index.ts

@@ -74,3 +74,15 @@ export function getErpContractInfoList(query) {
     params: query
   });
 }
+
+/**
+ * 提交合同并发起流程
+ * @param data
+ */
+export const contractSubmitAndFlowStart = (data: ContractInfoForm): AxiosPromise<ContractInfoVO> => {
+  return request({
+    url: '/oa/erp/contractInfo/contractSubmitAndFlowStart',
+    method: 'post',
+    data: data
+  });
+};

src/api/oa/erp/contractInfo/types.ts

@@ -306,7 +306,9 @@ export interface ContractInfoForm extends BaseEntity {
    * 合同物料列表
    */
   contractMaterialList?: any[];
-
+  flowCode?: any;
+  variables?: any;
+  bizExt?: any;
 }
 
 export interface ContractInfoQuery extends PageQuery {

src/api/oa/erp/projectContracts/index.ts

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProjectContractsVO, ProjectContractsForm, ProjectContractsQuery } from '@/api/oa/erp/projectContracts/types';
+
+/**
+ * 查询项目关联合同列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProjectContracts = (query?: ProjectContractsQuery): AxiosPromise<ProjectContractsVO[]> => {
+  return request({
+    url: '/oa/erp/projectContracts/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询项目关联合同详细
+ * @param projectContractsId
+ */
+export const getProjectContracts = (projectContractsId: string | number): AxiosPromise<ProjectContractsVO> => {
+  return request({
+    url: '/oa/erp/projectContracts/' + projectContractsId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增项目关联合同
+ * @param data
+ */
+export const addProjectContracts = (data: ProjectContractsForm) => {
+  return request({
+    url: '/oa/erp/projectContracts',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改项目关联合同
+ * @param data
+ */
+export const updateProjectContracts = (data: ProjectContractsForm) => {
+  return request({
+    url: '/oa/erp/projectContracts',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除项目关联合同
+ * @param projectContractsId
+ */
+export const delProjectContracts = (projectContractsId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/erp/projectContracts/' + projectContractsId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询项目关联合同列表
+ * @param query
+ * @returns {*}
+ */
+export function getErpProjectContractsList (query) {
+    return request({
+        url: '/oa/erp/projectContracts/getErpProjectContractsList',
+        method: 'get',
+        params: query
+    });
+};

src/api/oa/erp/projectContracts/types.ts

@@ -0,0 +1,96 @@
+export interface ProjectContractsVO {
+  /**
+   * 关联ID
+   */
+  projectContractsId: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 合同ID
+   */
+  contractId: string | number;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+}
+
+export interface ProjectContractsForm extends BaseEntity {
+  /**
+   * 关联ID
+   */
+  projectContractsId?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同ID
+   */
+  contractId?: string | number;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+}
+
+export interface ProjectContractsQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同ID
+   */
+  contractId?: string | number;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

src/api/oa/erp/projectInfo/index.ts

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProjectInfoVO, ProjectInfoForm, ProjectInfoQuery } from '@/api/oa/erp/projectInfo/types';
+
+/**
+ * 查询项目信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProjectInfo = (query?: ProjectInfoQuery): AxiosPromise<ProjectInfoVO[]> => {
+  return request({
+    url: '/oa/erp/projectInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询项目信息详细
+ * @param projectId
+ */
+export const getProjectInfo = (projectId: string | number): AxiosPromise<ProjectInfoVO> => {
+  return request({
+    url: '/oa/erp/projectInfo/' + projectId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增项目信息
+ * @param data
+ */
+export const addProjectInfo = (data: ProjectInfoForm) => {
+  return request({
+    url: '/oa/erp/projectInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改项目信息
+ * @param data
+ */
+export const updateProjectInfo = (data: ProjectInfoForm) => {
+  return request({
+    url: '/oa/erp/projectInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除项目信息
+ * @param projectId
+ */
+export const delProjectInfo = (projectId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/erp/projectInfo/' + projectId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询项目信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getErpProjectInfoList (query) {
+    return request({
+        url: '/oa/erp/projectInfo/getErpProjectInfoList',
+        method: 'get',
+        params: query
+    });
+};

src/api/oa/erp/projectInfo/types.ts

@@ -0,0 +1,321 @@
+export interface ProjectInfoVO {
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 有无合同（1有 2无）
+   */
+  contractFlag: string;
+
+  /**
+   * 项目编号
+   */
+  projectCode: string;
+
+  /**
+   * 项目名称
+   */
+  projectName: string;
+
+  /**
+   * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售）
+   */
+  businessDirection: string;
+
+  /**
+   * 项目类别（1销售（实施、物流） 2销售（备件） 3研发 4预投）
+   */
+  projectCategory: string;
+
+  /**
+   * 备件标识（1是 0否）
+   */
+  spareFlag: string;
+
+  /**
+   * 项目类型ID
+   */
+  projectTypeId: string | number;
+
+  /**
+   * 付款方式
+   */
+  paymentMethod: string;
+
+  /**
+   * 部门ID
+   */
+  deptId: string | number;
+
+  /**
+   * 项目经理
+   */
+  managerId: string | number;
+
+  /**
+   * 部门负责人
+   */
+  chargeId: string | number;
+
+  /**
+   * 分管副总
+   */
+  deputyId: string | number;
+
+  /**
+   * 抄送人员
+   */
+  peopleId: string | number;
+
+  /**
+   * 金额
+   */
+  amount: number;
+
+  /**
+   * 项目状态(1暂存 2审批中 3可用)
+   */
+  projectStatus: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 合同ID(预留)
+   */
+  contractId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+}
+
+export interface ProjectInfoForm extends BaseEntity {
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 有无合同（1有 2无）
+   */
+  contractFlag?: string;
+
+  /**
+   * 项目编号
+   */
+  projectCode?: string;
+
+  /**
+   * 项目名称
+   */
+  projectName?: string;
+
+  /**
+   * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售）
+   */
+  businessDirection?: string;
+
+  /**
+   * 项目类别（1销售（实施、物流） 2销售（备件） 3研发 4预投）
+   */
+  projectCategory?: string;
+
+  /**
+   * 备件标识（1是 0否）
+   */
+  spareFlag?: string;
+
+  /**
+   * 项目类型ID
+   */
+  projectTypeId?: string | number;
+
+  /**
+   * 付款方式
+   */
+  paymentMethod?: string;
+
+  /**
+   * 部门ID
+   */
+  deptId?: string | number;
+
+  /**
+   * 项目经理
+   */
+  managerId?: string | number;
+
+  /**
+   * 部门负责人
+   */
+  chargeId?: string | number;
+
+  /**
+   * 分管副总
+   */
+  deputyId?: string | number;
+
+  /**
+   * 抄送人员
+   */
+  peopleId?: string | number;
+
+  /**
+   * 金额
+   */
+  amount?: number;
+
+  /**
+   * 项目状态(1暂存 2审批中 3可用)
+   */
+  projectStatus?: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 合同ID(预留)
+   */
+  contractId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+}
+
+export interface ProjectInfoQuery extends PageQuery {
+
+  /**
+   * 有无合同（1有 2无）
+   */
+  contractFlag?: string;
+
+  /**
+   * 项目编号
+   */
+  projectCode?: string;
+
+  /**
+   * 项目名称
+   */
+  projectName?: string;
+
+  /**
+   * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售）
+   */
+  businessDirection?: string;
+
+  /**
+   * 项目类别（1销售（实施、物流） 2销售（备件） 3研发 4预投）
+   */
+  projectCategory?: string;
+
+  /**
+   * 备件标识（1是 0否）
+   */
+  spareFlag?: string;
+
+  /**
+   * 项目类型ID
+   */
+  projectTypeId?: string | number;
+
+  /**
+   * 付款方式
+   */
+  paymentMethod?: string;
+
+  /**
+   * 部门ID
+   */
+  deptId?: string | number;
+
+  /**
+   * 项目经理
+   */
+  managerId?: string | number;
+
+  /**
+   * 部门负责人
+   */
+  chargeId?: string | number;
+
+  /**
+   * 分管副总
+   */
+  deputyId?: string | number;
+
+  /**
+   * 抄送人员
+   */
+  peopleId?: string | number;
+
+  /**
+   * 金额
+   */
+  amount?: number;
+
+  /**
+   * 项目状态(1暂存 2审批中 3可用)
+   */
+  projectStatus?: string;
+
+  /**
+   * 流程状态
+   */
+  flowStatus?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 合同ID(预留)
+   */
+  contractId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

src/api/oa/erp/projectType/index.ts

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProjectTypeVO, ProjectTypeForm, ProjectTypeQuery } from '@/api/oa/erp/projectType/types';
+
+/**
+ * 查询项目类型信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProjectType = (query?: ProjectTypeQuery): AxiosPromise<ProjectTypeVO[]> => {
+  return request({
+    url: '/oa/erp/projectType/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询项目类型信息详细
+ * @param projectTypeId
+ */
+export const getProjectType = (projectTypeId: string | number): AxiosPromise<ProjectTypeVO> => {
+  return request({
+    url: '/oa/erp/projectType/' + projectTypeId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增项目类型信息
+ * @param data
+ */
+export const addProjectType = (data: ProjectTypeForm) => {
+  return request({
+    url: '/oa/erp/projectType',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改项目类型信息
+ * @param data
+ */
+export const updateProjectType = (data: ProjectTypeForm) => {
+  return request({
+    url: '/oa/erp/projectType',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除项目类型信息
+ * @param projectTypeId
+ */
+export const delProjectType = (projectTypeId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/erp/projectType/' + projectTypeId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询项目类型信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getErpProjectTypeList (query) {
+    return request({
+        url: '/oa/erp/projectType/getErpProjectTypeList',
+        method: 'get',
+        params: query
+    });
+};

src/api/oa/erp/projectType/types.ts

@@ -0,0 +1,115 @@
+export interface ProjectTypeVO {
+  /**
+   * 项目类型ID
+   */
+  projectTypeId: string | number;
+
+  /**
+   * 父级ID
+   */
+  parentId: string | number;
+
+  /**
+   * 项目类型名称
+   */
+  typeName: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 备件标识（1是 0否）
+   */
+  spareFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 顶级标识（1是 0否）
+   */
+  topFlag: string;
+
+    /**
+     * 子对象
+     */
+    children: ProjectTypeVO[];
+}
+
+export interface ProjectTypeForm extends BaseEntity {
+  /**
+   * 项目类型ID
+   */
+  projectTypeId?: string | number;
+
+  /**
+   * 父级ID
+   */
+  parentId?: string | number;
+
+  /**
+   * 项目类型名称
+   */
+  typeName?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 备件标识（1是 0否）
+   */
+  spareFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 顶级标识（1是 0否）
+   */
+  topFlag?: string;
+
+}
+
+export interface ProjectTypeQuery {
+
+  /**
+   * 父级ID
+   */
+  parentId?: string | number;
+
+  /**
+   * 项目类型名称
+   */
+  typeName?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 备件标识（1是 0否）
+   */
+  spareFlag?: string;
+
+  /**
+   * 顶级标识（1是 0否）
+   */
+  topFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

src/api/system/dept/index.ts

@@ -63,3 +63,12 @@ export const delDept = (deptId: number | string) => {
     method: 'delete'
   });
 };
+
+// 查询全部部门列表
+export const allListDept = (query?: DeptQuery) => {
+  return request({
+    url: '/system/dept/allListDept',
+    method: 'get',
+    params: query
+  });
+};

src/views/oa/erp/contractInfo/edit.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="p-2">
     <el-card shadow="never">
-      <template #header>
-        <div style="text-align: left; font-weight: bold; font-size: 24px">合同{{ form.contractId ? ' - 修改' : ' - 新增' }}</div>
-      </template>
+      <!--      <template #header>-->
+      <!--        <div style="text-align: left; font-weight: bold; font-size: 24px">合同{{ form.contractId ? ' - 修改' : ' - 新增' }}</div>-->
+      <!--      </template>-->
       <!-- 审批按钮组件 -->
       <approvalButton
         @submitForm="submitForm"
@@ -11,11 +11,11 @@
         @handleApprovalRecord="handleApprovalRecord"
         :buttonLoading="buttonLoading"
         :id="form.contractId"
-        :status="form.contractStatus"
+        :status="form.flowStatus"
         :pageType="routeParams.type"
         :mode="false"
       />
-      <el-form ref="contractInfoFormRef" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="contractInfoFormRef" :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">
@@ -146,7 +146,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="附件" prop="ossId">
-<!--              <el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" />-->
+              <!--              <el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" />-->
               <el-button type="primary" plain icon="Upload" @click="handleFile">上传合同附件</el-button>
             </el-form-item>
           </el-col>
@@ -167,7 +167,7 @@
 
       <!-- 合同物料表格 -->
       <div style="margin-bottom: 16px">
-        <el-button type="primary" icon="Plus" @click="handleAddMaterial">新增物料</el-button>
+        <el-button type="primary" icon="Plus" v-if="routeParams.type !== 'view'" @click="handleAddMaterial">新增物料 </el-button>
       </div>
 
       <el-table :data="contractMaterialList" border v-loading="materialLoading">
@@ -202,22 +202,13 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" min-width="100" />
-        <el-table-column label="操作" align="center" fixed="right" width="150">
+        <el-table-column label="操作" align="center" fixed="right" width="150" v-if="routeParams.type !== 'view'">
           <template #default="scope">
             <el-button link type="primary" icon="Edit" @click="handleEditMaterial(scope.row)">编辑</el-button>
             <el-button link type="danger" icon="Delete" @click="handleDeleteMaterial(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-
-      <el-card shadow="never" style="margin-top: 20px" v-if="routeParams.type !== 'approval'">
-        <el-col :span="24">
-          <el-form-item>
-            <el-button :loading="buttonLoading" type="primary" @click="() => submitForm('draft', false)">保 存</el-button>
-            <el-button @click="goBack">返 回</el-button>
-          </el-form-item>
-        </el-col>
-      </el-card>
     </el-card>
 
     <!-- 合同物料编辑对话框 -->
@@ -338,7 +329,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="materialButtonLoading" type="primary" @click="submitMaterialForm">确 定</el-button>
+          <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
           <el-button @click="cancelMaterial">取 消</el-button>
         </div>
       </template>
@@ -369,28 +360,31 @@
 </template>
 
 <script setup name="ContractInfoEdit" lang="ts">
-import { addContractInfo, getContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo';
+import { addContractInfo, contractSubmitAndFlowStart, getContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo';
 import { ContractInfoForm } from '@/api/oa/erp/contractInfo/types';
 import { getErpContractMaterialList } from '@/api/oa/erp/contractMaterial';
 import { ContractMaterialVO, ContractMaterialForm } from '@/api/oa/erp/contractMaterial/types';
 import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
 import { getRuleGenerateCode } from '@/api/system/codeRule';
+import { startWorkFlow } from '@/api/workflow/task';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 import SaleMaterialSelect from '@/components/SaleMaterialSelect/index.vue';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import ApprovalButton from '@/components/Process/approvalButton.vue';
 import { ref } from 'vue';
-import { listDept } from '@/api/system/dept';
+import { allListDept, listDept } from '@/api/system/dept';
 import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
 import { getBasePrintTemplateList } from '@/api/oa/base/printTemplate';
 
-const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const route = useRoute();
+const router = useRouter();
 
 // 路由参数
 const routeParams = ref<Record<string, any>>({});
-const { contract_category, business_direction, active_flag, contract_flag, contract_type, contract_status, plan_flag } = toRefs<any>(
-  proxy?.useDict('contract_category', 'business_direction', 'active_flag', 'contract_flag', 'contract_type', 'contract_status', 'plan_flag')
+const { contract_category, business_direction, contract_flag, contract_type, contract_status, plan_flag } = toRefs<any>(
+  proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'contract_status', 'plan_flag')
 );
 
 const buttonLoading = ref(false);
@@ -400,8 +394,17 @@ const contractInfoFormRef = ref<ElFormInstance>();
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 
+// 流程相关数据
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: 'OAC',
+  variables: {},
+  bizExt: {}
+});
+
 // 任务变量
 const taskVariables = ref<Record<string, any>>({});
+const flowInstanceBizExtBo = ref<Record<string, any>>({});
 
 const type = ref(0);
 const dialog = reactive<DialogOption>({
@@ -417,7 +420,6 @@ const isCodeGenerated = ref(false);
 
 // 合同物料相关
 const materialLoading = ref(false);
-const materialButtonLoading = ref(false);
 const materialFormRef = ref<ElFormInstance>();
 
 // 合同物料列表计算属性
@@ -443,7 +445,7 @@ const getUnitInfoListSelect = async () => {
 const deptInfoList = ref([]);
 const getDeptInfoListSelect = async () => {
   const params = { deptCategory: '03' } as any;
-  let res = await listDept(params);
+  let res = await allListDept(params);
   deptInfoList.value = res.data;
 };
 
@@ -515,6 +517,9 @@ const initFormData: ContractInfoFormEx = {
   signatureAppendix: undefined,
   taxRate: undefined,
   remark: undefined,
+  flowCode: undefined,
+  bizExt: undefined,
+  variables: undefined,
   activeFlag: '1',
   contractMaterialList: [],
   file: undefined
@@ -529,14 +534,10 @@ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
 
 const { form, rules } = toRefs(data);
 
-const goBack = () => {
-  proxy?.$tab.closePage();
-};
-
 // 监听contractFlag变化
 watch(
   () => form.value.contractFlag,
-  (newVal, oldVal) => {
+  (newVal) => {
     if (newVal === '2') {
       // 当选择"无合同"时，清空合同编号并重置生成状态
       form.value.contractCode = undefined;
@@ -568,7 +569,7 @@ const openSaleMaterialSelect = () => {
 };
 
 //确认选择申请人
-const saleMaterialSelectCallBack = (data) => {
+const saleMaterialSelectCallBack = (data: any) => {
   const materialList = data;
   if (materialList.length > 0) {
     materialForm.value.materialId = materialList[0].materialId;
@@ -594,30 +595,90 @@ const handleFile = () => {
   ossFileModel.value = form.value.ossId as any;
 };
 
+/** 提交按钮 */
 const submitForm = (status: string, mode: boolean) => {
-  contractInfoFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      try {
-        if (form.value.contractId) {
-          await updateContractInfo(form.value).finally(() => (buttonLoading.value = false));
+  try {
+    contractInfoFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        buttonLoading.value = true;
+        // 设置后端发起和不等于草稿状态 直接走流程发起
+        if (status != 'draft') {
+          // 后端发起流程模式
+          form.value.flowCode = 'OAC';
+          // 流程变量
+          form.value.variables = {
+            contractName: form.value.contractName,
+            totalPrice: form.value.totalPrice,
+            contractCode: form.value.contractCode
+          };
+          // 流程实例业务扩展字段
+          form.value.bizExt = {
+            businessTitle: '合同审批',
+            businessCode: form.value.contractCode
+          };
+          form.value.contractStatus = '2';
+          form.value.flowStatus = 'waiting';
+          const res = await contractSubmitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
+          form.value = res.data;
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('操作成功');
+          proxy?.$tab.closePage();
+          router.go(-1);
         } else {
-          await addContractInfo(form.value).finally(() => (buttonLoading.value = false));
-        }
-
-        if (status === 'draft') {
+          if (status === 'draft') {
+            form.value.contractStatus = '1';
+            form.value.flowStatus = 'draft';
+          }
+          if (form.value.contractId) {
+            await updateContractInfo(form.value).finally(() => (buttonLoading.value = false));
+          } else {
+            await addContractInfo(form.value).finally(() => (buttonLoading.value = false));
+          }
+          buttonLoading.value = false;
           proxy?.$modal.msgSuccess('暂存成功');
-          goBack();
-        } else {
-          // 提交审批流程
-          await handleStartWorkFlow();
+          proxy?.$tab.closePage();
+          router.go(-1);
         }
-      } catch (error) {
-        console.error('保存合同信息失败:', error);
-        buttonLoading.value = false;
       }
+    });
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+
+// 提交申请
+const handleStartWorkFlow = async (data: ContractInfoForm) => {
+  try {
+    submitFormData.value.flowCode = 'OAC';
+    submitFormData.value.businessId = data.contractId;
+
+    // 流程变量
+    taskVariables.value = {
+      contractId: data.contractId,
+      contractName: data.contractName,
+      totalPrice: data.totalPrice,
+      contractCode: data.contractCode
+    };
+
+    // 流程实例业务扩展字段
+    flowInstanceBizExtBo.value = {
+      businessTitle: '合同审批',
+      businessCode: data.contractCode
+    };
+
+    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);
+  }
 };
 
 // 确认上传，仅关闭弹窗并依赖 v-model 同步到 ossId
@@ -628,23 +689,6 @@ const submitOss = () => {
   proxy?.$modal.msgSuccess('附件已更新');
 };
 
-// 获取合同物料列表
-const getContractMaterialList = async () => {
-  if (!form.value.contractId) return;
-  materialLoading.value = true;
-  try {
-    const res = await getErpContractMaterialList({
-      contractId: form.value.contractId
-    });
-    // 将获取到的数据存储到form中
-    (form.value as any).contractMaterialList = res.data || [];
-  } catch (error) {
-    console.error('获取合同物料列表失败:', error);
-  } finally {
-    materialLoading.value = false;
-  }
-};
-
 // 新增物料（新增合同时也可添加，不依赖contractId）
 const handleAddMaterial = () => {
   resetMaterialForm();
@@ -732,44 +776,37 @@ const calculateTotalPrice = () => {
   form.value.totalPrice = Number(total.toFixed(2));
 };
 
-// 提交物料表单
+// 提交物料表单 - 直接保存到本地数组
 const submitMaterialForm = () => {
   materialFormRef.value?.validate((valid: boolean) => {
     if (valid) {
-      materialButtonLoading.value = true;
-      try {
-        // 确保contractMaterialList存在
-        if (!(form.value as any).contractMaterialList) {
-          (form.value as any).contractMaterialList = [];
-        }
-
-        if (materialForm.value.contractMaterialId) {
-          // 编辑模式：更新现有物料
-          const index = (form.value as any).contractMaterialList.findIndex(
-            (item: any) => item.contractMaterialId === materialForm.value.contractMaterialId
-          );
-          if (index !== -1) {
-            (form.value as any).contractMaterialList[index] = { ...materialForm.value };
-          }
-        } else {
-          // 新增模式：添加新物料
-          const newMaterial = {
-            ...materialForm.value,
-            contractMaterialId: Date.now() // 临时ID
-          };
-          (form.value as any).contractMaterialList.push(newMaterial);
-        }
-
-        // 更新合同总价
-        calculateTotalPrice();
-
-        proxy?.$modal.msgSuccess('操作成功');
-        materialDialog.visible = false;
-      } catch (error) {
-        console.error('保存合同物料失败:', error);
-      } finally {
-        materialButtonLoading.value = false;
+      // 确保contractMaterialList存在
+      if (!(form.value as any).contractMaterialList) {
+        (form.value as any).contractMaterialList = [];
       }
+
+      if (materialForm.value.contractMaterialId) {
+        // 编辑模式：更新现有物料
+        const index = (form.value as any).contractMaterialList.findIndex(
+          (item: any) => item.contractMaterialId === materialForm.value.contractMaterialId
+        );
+        if (index !== -1) {
+          (form.value as any).contractMaterialList[index] = { ...materialForm.value };
+        }
+      } else {
+        // 新增模式：添加新物料
+        const newMaterial = {
+          ...materialForm.value,
+          contractMaterialId: Date.now() // 临时ID
+        };
+        (form.value as any).contractMaterialList.push(newMaterial);
+      }
+
+      // 更新合同总价
+      calculateTotalPrice();
+
+      proxy?.$modal.msgSuccess('操作成功');
+      materialDialog.visible = false;
     }
   });
 };
@@ -783,78 +820,51 @@ const loadSelectOptions = () => {
 };
 
 onMounted(async () => {
-  // 获取路由参数
-  routeParams.value = route.query || {};
+  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 getContractInfo(id);
+      Object.assign(form.value, res.data);
 
-  const id = (route.query.id || route.params.id) as string | number;
-  loadSelectOptions();
+      proxy?.$modal.closeLoading();
 
-  if (id) {
-    proxy?.$modal.loading('正在加载数据，请稍后...');
-    const res = await getContractInfo(id);
-    Object.assign(form.value, res.data);
-    proxy?.$modal.closeLoading();
-
-    // 编辑模式：如果已有合同编号，禁用生成按钮
-    if (form.value.contractCode) {
-      isCodeGenerated.value = true;
-    } else if (form.value.contractFlag === '1') {
-      // 如果有合同但没有编号，允许生成
-      isCodeGenerated.value = false;
+      // 编辑模式：如果已有合同编号，禁用生成按钮
+      if (form.value.contractCode) {
+        isCodeGenerated.value = true;
+      } else if (form.value.contractFlag === '1') {
+        // 如果有合同但没有编号，允许生成
+        isCodeGenerated.value = false;
+      }
+    } else {
+      // 新增模式：如果已有合同编号，禁用生成按钮
+      if (form.value.contractCode) {
+        isCodeGenerated.value = true;
+      } else if (form.value.contractFlag === '1') {
+        // 如果有合同但没有编号，允许生成
+        isCodeGenerated.value = false;
+      }
     }
-
-    // 加载合同物料列表
-    await getContractMaterialList();
-  } else {
-    // 新增模式：如果已有合同编号，禁用生成按钮
-    if (form.value.contractCode) {
-      isCodeGenerated.value = true;
-    } else if (form.value.contractFlag === '1') {
-      // 如果有合同但没有编号，允许生成
-      isCodeGenerated.value = false;
-    }
-  }
+  });
 });
 
-// 启动审批流程
-const handleStartWorkFlow = async () => {
-  try {
-    // 设置流程变量
-    taskVariables.value = {
-      contractId: form.value.contractId,
-      contractName: form.value.contractName,
-      totalPrice: form.value.totalPrice,
-      contractCode: form.value.contractCode
-    };
-
-    // 这里可以根据需要调用启动流程的API
-    // 由于合同审批流程在index.vue中已经实现，这里主要是处理审批中的状态
-    proxy?.$modal.msgSuccess('提交审批成功');
-    goBack();
-  } catch (error) {
-    console.error('启动审批流程失败:', error);
-    proxy?.$modal.msgError('启动审批流程失败');
-  }
-};
-
-// 审批验证打开
-const approvalVerifyOpen = async () => {
-  if (submitVerifyRef.value && routeParams.value.taskId) {
-    submitVerifyRef.value.openDialog(routeParams.value.taskId);
-  }
-};
-
-// 查看审批记录
+// 审批记录
 const handleApprovalRecord = () => {
-  if (approvalRecordRef.value && form.value.contractId) {
-    approvalRecordRef.value.init(form.value.contractId);
-  }
+  approvalRecordRef.value.init(form.value.contractId);
 };
 
 // 提交回调
 const submitCallback = async () => {
-  await proxy?.$tab.closePage(route);
-  window.history.go(-1);
+  await proxy?.$tab.closePage();
+  router.go(-1);
+};
+
+// 审批
+const approvalVerifyOpen = async () => {
+  await submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
 
 // 监听上传组件返回的文件（ossId 串）并同步到表单字段

src/views/oa/erp/contractInfo/index.vue

@@ -132,8 +132,15 @@
         <el-table-column label="合同税率(预留)" align="center" prop="taxRate" v-if="columns[23].visible" />
         <el-table-column label="终版合同" align="center" width="100" v-if="columns[32].visible">
           <template #default="scope">
-            <el-button v-if="scope.row.signatureAppendix" link type="primary" icon="Download" @click="downloadFinalContract(scope.row.signatureAppendix)">下载</el-button>
-            <span v-else style="color: #999;">未上传</span>
+            <el-button
+              v-if="scope.row.signatureAppendix"
+              link
+              type="primary"
+              icon="Download"
+              @click="downloadFinalContract(scope.row.signatureAppendix)"
+              >下载
+            </el-button>
+            <span v-else style="color: #999">未上传</span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[24].visible" />
@@ -156,26 +163,31 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+            <el-tooltip content="查看" placement="top"  v-if="scope.row.contractStatus !== '1'">
+              <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
+            </el-tooltip>
+            <el-tooltip content="修改" placement="top" v-if="scope.row.contractStatus === '1'">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:contractInfo: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:contractInfo:remove']"></el-button>-->
-<!--            </el-tooltip>-->
-            <el-tooltip content="上传终版合同" placement="top" v-if="!scope.row.signatureAppendix">
-              <el-button link type="success" icon="Upload" @click="openUploadFinalDialog(scope.row)" v-hasPermi="['oa/erp:contractInfo:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="提交审批" placement="top" v-if="scope.row.contractStatus === '1'">
-              <el-button link type="warning" icon="Check" @click="handleSubmitApproval(scope.row)" v-hasPermi="['oa/erp:contractInfo: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:contractInfo:remove']"></el-button>-->
+            <!--            </el-tooltip>-->
             <el-tooltip content="审批记录" placement="top" v-if="scope.row.contractStatus === '2' || scope.row.contractStatus === '3'">
               <el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></el-button>
             </el-tooltip>
+            <el-tooltip content="上传终版合同" placement="top" v-if="!scope.row.signatureAppendix">
+              <el-button
+                link
+                type="success"
+                icon="Upload"
+                @click="openUploadFinalDialog(scope.row)"
+                v-hasPermi="['oa/erp:contractInfo:edit']"
+              ></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>
     <!-- 上传终版合同对话框 -->
@@ -192,11 +204,8 @@
         </div>
       </template>
     </el-dialog>
-
     <!-- 审批记录 -->
     <ApprovalRecord ref="approvalRecordRef" />
-    <!-- 提交审批组件 -->
-    <SubmitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
   </div>
 </template>
 
@@ -205,6 +214,7 @@ import { listContractInfo, delContractInfo } from '@/api/oa/erp/contractInfo';
 import { ContractInfoVO, ContractInfoQuery } from '@/api/oa/erp/contractInfo/types';
 import { updateContractInfo } from '@/api/oa/erp/contractInfo';
 import download from '@/plugins/download';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
@@ -213,6 +223,7 @@ const { contract_category, business_direction, active_flag, contract_flag, contr
   proxy?.useDict('contract_category', 'business_direction', 'active_flag', 'contract_flag', 'contract_type', 'contract_status')
 );
 
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const contractInfoList = ref<ContractInfoVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -336,17 +347,33 @@ const handleAdd = () => {
   proxy.$tab.closePage(route);
   router.push({
     path: '/contract/contractInfo/edit',
-    query: {}
+    query: {
+      type: 'add'
+    }
   });
 };
 
 /** 修改按钮操作 */
 const handleUpdate = (row?: ContractInfoVO) => {
   const _contractId = row?.contractId || ids.value[0];
+  proxy.$tab.closePage(route);
   router.push({
     path: '/contract/contractInfo/edit',
     query: {
-      id: _contractId
+      id: _contractId,
+      type: 'update'
+    }
+  });
+};
+
+const handleView = (row?: ContractInfoVO) => {
+  const _contractId = row?.contractId;
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/contract/contractInfo/edit',
+    query: {
+      id: _contractId,
+      type: 'view'
     }
   });
 };
@@ -405,71 +432,8 @@ const downloadFinalContract = (ossId: string | number) => {
   download.oss(ossId);
 };
 
-// 提交审批
-const handleSubmitApproval = async (row: ContractInfoVO) => {
-  try {
-    // 添加确认弹框
-    await proxy?.$modal.confirm('确认提交该合同进行审批？');
-
-    // 启动审批流程
-    const submitFormData: StartProcessBo = {
-      businessId: row.contractId.toString(),
-      flowCode: 'OAC', // 使用现有的流程定义，后续可以创建专门的合同审批流程
-      variables: {
-        // 合同相关的流程变量
-        contractId: row.contractId,
-        contractName: row.contractName,
-        totalPrice: row.totalPrice
-      },
-      bizExt: {
-        businessTitle: '合同审批',
-        businessCode: row.contractId
-      }
-    };
-
-    // 设置任务变量
-    taskVariables.value = {
-      contractId: row.contractId,
-      contractName: row.contractName,
-      totalPrice: row.totalPrice,
-      contractCode: row.contractCode
-    };
-
-    // 启动流程并获取任务ID
-    const resp = await startWorkFlow(submitFormData);
-
-    // 更新合同状态为审批中
-    await updateContractInfo({
-      contractId: row.contractId,
-      contractStatus: '2',
-      flowStatus: 'waiting'
-    } as any);
-
-    // 自动打开审批对话框，调用第一个审批节点
-    if (submitVerifyRef.value && resp.data && resp.data.taskId) {
-      submitVerifyRef.value.openDialog(resp.data.taskId);
-    } else {
-      proxy?.$modal.msgSuccess('审批流程已启动');
-      await getList();
-    }
-  } catch (error) {
-    // 用户取消操作时不显示错误
-    if (error === 'cancel') {
-      return;
-    }
-    console.error('提交审批失败:', error);
-    proxy?.$modal.msgError('提交审批失败，请重试');
-  }
-};
-
 // 查看审批记录
 const handleApprovalRecord = (row: ContractInfoVO) => {
   approvalRecordRef.value?.init(row.contractId);
 };
-
-// 审批提交回调
-const submitCallback = async () => {
-  proxy?.$modal.msgSuccess('审批操作成功');
-  await getList();
-};
 </script>

src/views/oa/erp/projectContracts/index.vue

@@ -0,0 +1,270 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="mb-[10px]">
+                <el-card shadow="hover">
+                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
+                                    <el-form-item label="项目ID" prop="projectId">
+                                        <el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="合同ID" prop="contractId">
+                                        <el-input v-model="queryParams.contractId" placeholder="请输入合同ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="排序号" prop="sortOrder">
+                                        <el-input v-model="queryParams.sortOrder" placeholder="请输入排序号" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="激活标识" prop="activeFlag">
+                                        <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                                            <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                        </el-select>
+                                    </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+            </div>
+        </transition>
+
+        <el-card shadow="never">
+            <template #header>
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:projectContracts:add']">新增</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:projectContracts:edit']">修改</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:projectContracts:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:projectContracts: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="projectContractsList" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column label="关联ID" align="center" prop="projectContractsId" v-if="columns[0].visible"/>
+                        <el-table-column label="项目ID" align="center" prop="projectId" v-if="columns[2].visible"/>
+                        <el-table-column label="合同ID" align="center" prop="contractId" v-if="columns[3].visible"/>
+                        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[4].visible"/>
+                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible"/>
+                        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+                            </template>
+                        </el-table-column>
+                <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-tooltip content="修改" placement="top">
+                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:projectContracts: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:projectContracts: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="projectContractsFormRef" :model="form" :rules="rules" label-width="120px">
+                            <el-form-item label="项目ID" prop="projectId">
+                                <el-input v-model="form.projectId" placeholder="请输入项目ID" />
+                            </el-form-item>
+                            <el-form-item label="合同ID" prop="contractId">
+                                <el-input v-model="form.contractId" placeholder="请输入合同ID" />
+                            </el-form-item>
+                            <el-form-item label="排序号" prop="sortOrder">
+                                <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+                            </el-form-item>
+                            <el-form-item label="备注" prop="remark">
+                                <el-input v-model="form.remark" placeholder="请输入备注" />
+                            </el-form-item>
+                            <el-form-item label="激活标识" prop="activeFlag">
+                                <el-radio-group v-model="form.activeFlag">
+                                    <el-radio
+                                        v-for="dict in active_flag"
+                                        :key="dict.value"
+                                        :value="dict.value"
+                                    >{{dict.label}}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="ProjectContracts" lang="ts">
+    import { listProjectContracts, getProjectContracts, delProjectContracts, addProjectContracts, updateProjectContracts } from '@/api/oa/erp/projectContracts';
+    import { ProjectContractsVO, ProjectContractsQuery, ProjectContractsForm } from '@/api/oa/erp/projectContracts/types';
+
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+        const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+    const projectContractsList = ref<ProjectContractsVO[]>([]);
+    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 projectContractsFormRef = ref<ElFormInstance>();
+
+    const dialog = reactive<DialogOption>({
+        visible: false,
+        title: ''
+    });
+
+    // 列显隐信息
+    const columns = ref<FieldOption[]>([
+            { key: 0, label: `关联ID`, visible: true },
+            { key: 1, label: `租户编号`, visible: true },
+            { key: 2, label: `项目ID`, visible: true },
+            { key: 3, label: `合同ID`, visible: true },
+            { key: 4, label: `排序号`, visible: true },
+            { key: 5, label: `备注`, visible: true },
+            { key: 6, label: `激活标识`, visible: true },
+            { key: 7, label: `删除标志`, visible: true },
+            { key: 8, label: `创建部门`, visible: true },
+            { key: 9, label: `创建人`, visible: true },
+            { key: 10, label: `创建时间`, visible: true },
+            { key: 11, label: `更新人`, visible: true },
+            { key: 12, label: `更新时间`, visible: true },
+    ]);
+
+    const initFormData: ProjectContractsForm = {
+                        projectContractsId: undefined,
+                        projectId: undefined,
+                        contractId: undefined,
+                        sortOrder: undefined,
+                        remark: undefined,
+                        activeFlag: undefined,
+    }
+    const data = reactive<PageData<ProjectContractsForm, ProjectContractsQuery>>({
+        form: {...initFormData},
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+                            projectId: undefined,
+                            contractId: undefined,
+                            sortOrder: undefined,
+                            activeFlag: undefined,
+            params: {
+            }
+        },
+        rules: {
+        }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询项目关联合同列表 */
+    const getList = async () => {
+        loading.value = true;
+        const res = await listProjectContracts(queryParams.value);
+            projectContractsList.value = res.rows;
+        total.value = res.total;
+        loading.value = false;
+    }
+
+    /** 取消按钮 */
+    const cancel = () => {
+        reset();
+        dialog.visible = false;
+    }
+
+    /** 表单重置 */
+    const reset = () => {
+        form.value = {...initFormData};
+            projectContractsFormRef.value?.resetFields();
+    }
+
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        queryFormRef.value?.resetFields();
+        handleQuery();
+    }
+
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: ProjectContractsVO[]) => {
+        ids.value = selection.map(item => item.projectContractsId);
+        single.value = selection.length != 1;
+        multiple.value = !selection.length;
+    }
+
+    /** 新增按钮操作 */
+    const handleAdd = () => {
+        reset();
+        dialog.visible = true;
+        dialog.title = "添加项目关联合同";
+    }
+
+    /** 修改按钮操作 */
+    const handleUpdate = async (row?: ProjectContractsVO) => {
+        reset();
+        const _projectContractsId = row?.projectContractsId || ids.value[0]
+        const res = await getProjectContracts(_projectContractsId);
+        Object.assign(form.value, res.data);
+        dialog.visible = true;
+        dialog.title = "修改项目关联合同";
+    }
+
+    /** 提交按钮 */
+    const submitForm = () => {
+            projectContractsFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                buttonLoading.value = true;
+                if (form.value.projectContractsId) {
+                    await updateProjectContracts(form.value).finally(() =>  buttonLoading.value = false);
+                } else {
+                    await addProjectContracts(form.value).finally(() =>  buttonLoading.value = false);
+                }
+                proxy?.$modal.msgSuccess("操作成功");
+                dialog.visible = false;
+                await getList();
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: ProjectContractsVO) => {
+        const _projectContractsIds = row?.projectContractsId || ids.value;
+        await proxy?.$modal.confirm('是否确认删除项目关联合同编号为"' + _projectContractsIds + '"的数据项？').finally(() => loading.value = false);
+        await delProjectContracts(_projectContractsIds);
+        proxy?.$modal.msgSuccess("删除成功");
+        await getList();
+    }
+
+    /** 导出按钮操作 */
+    const handleExport = () => {
+        proxy?.download('oa/erp/projectContracts/export', {
+            ...queryParams.value
+        }, `projectContracts_${new Date().getTime()}.xlsx`)
+    }
+
+    onMounted(() => {
+        getList();
+    });
+</script>

src/views/oa/erp/projectInfo/index.vue

@@ -0,0 +1,437 @@
+<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="contractFlag">
+              <el-select v-model="queryParams.contractFlag" placeholder="请选择有无合同" clearable>
+                <el-option v-for="dict in contract_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="项目编号" prop="projectCode">
+              <el-input v-model="queryParams.projectCode" placeholder="请输入项目编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
+            </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="projectCategory">-->
+<!--              <el-select v-model="queryParams.projectCategory" placeholder="请选择项目类别" clearable>-->
+<!--                <el-option v-for="dict in project_category" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="备件标识" prop="spareFlag">-->
+<!--              <el-select v-model="queryParams.spareFlag" placeholder="请选择备件标识" clearable>-->
+<!--                <el-option v-for="dict in spare_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+            <el-form-item label="项目状态" prop="projectStatus">
+              <el-select v-model="queryParams.projectStatus" placeholder="请选择项目状态" clearable>
+                <el-option v-for="dict in project_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:projectInfo:add']"> 新增 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:projectInfo:edit']"
+              >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:projectInfo:remove']"
+              >删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:projectInfo: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="projectInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="项目ID" align="center" prop="projectId" v-if="columns[0].visible" />
+        <el-table-column label="有无合同" align="center" prop="contractFlag" v-if="columns[2].visible">
+          <template #default="scope">
+            <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">
+          <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">
+          <template #default="scope">
+            <dict-tag :options="project_category" :value="scope.row.projectCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备件标识" align="center" prop="spareFlag" v-if="columns[7].visible">
+          <template #default="scope">
+            <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="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="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">
+          <template #default="scope">
+            <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="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" />
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[21].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <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>
+          </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>
+  </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';
+
+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 projectInfoList = ref<ProjectInfoVO[]>([]);
+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 projectInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `项目ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: true },
+  { key: 2, label: `有无合同`, visible: true },
+  { key: 3, label: `项目编号`, visible: true },
+  { key: 4, label: `项目名称`, visible: true },
+  { key: 5, label: `业务方向`, visible: true },
+  { key: 6, label: `项目类别`, visible: true },
+  { key: 7, label: `备件标识`, visible: true },
+  { key: 8, label: `项目类型`, visible: true },
+  { key: 9, label: `付款方式`, visible: true },
+  { key: 10, label: `部门ID`, visible: true },
+  { key: 11, label: `项目经理`, visible: true },
+  { key: 12, label: `部门负责人`, visible: true },
+  { key: 13, label: `分管副总`, visible: true },
+  { key: 14, label: `抄送人员`, visible: true },
+  { key: 15, label: `金额`, visible: true },
+  { key: 16, label: `项目状态`, visible: true },
+  { key: 17, label: `流程状态`, visible: true },
+  { key: 18, label: `排序号`, visible: true },
+  { key: 19, label: `合同ID(预留)`, visible: false },
+  { key: 20, label: `备注`, visible: true },
+  { key: 21, label: `激活标识`, visible: false },
+  { key: 22, label: `删除标志`, visible: false },
+  { key: 23, label: `创建部门`, visible: false },
+  { key: 24, label: `创建人`, visible: false },
+  { key: 25, label: `创建时间`, visible: false },
+  { key: 26, label: `更新人`, visible: false },
+  { key: 27, label: `更新时间`, visible: false }
+]);
+
+const initFormData: 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 },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    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,
+    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 getList = async () => {
+  loading.value = true;
+  const res = await listProjectInfo(queryParams.value);
+  projectInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  projectInfoFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ProjectInfoVO[]) => {
+  ids.value = selection.map((item) => item.projectId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加项目信息';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ProjectInfoVO) => {
+  reset();
+  const _projectId = row?.projectId || ids.value[0];
+  const res = await getProjectInfo(_projectId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改项目信息';
+};
+
+/** 提交按钮 */
+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 handleDelete = async (row?: ProjectInfoVO) => {
+  const _projectIds = row?.projectId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除项目信息编号为"' + _projectIds + '"的数据项？').finally(() => (loading.value = false));
+  await delProjectInfo(_projectIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'oa/erp/projectInfo/export',
+    {
+      ...queryParams.value
+    },
+    `projectInfo_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/oa/erp/projectType/index.vue

@@ -0,0 +1,290 @@
+<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="typeName">
+              <el-input v-model="queryParams.typeName" placeholder="请输入项目类型名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="备件标识" prop="spareFlag">-->
+<!--              <el-select v-model="queryParams.spareFlag" placeholder="请选择备件标识" clearable>-->
+<!--                <el-option v-for="dict in spare_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+            <el-form-item label="顶级标识" prop="topFlag">
+              <el-select v-model="queryParams.topFlag" placeholder="请选择顶级标识" clearable>
+                <el-option v-for="dict in top_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['oa/erp:projectType:add']"> 新增 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref="projectTypeTableRef"
+        v-loading="loading"
+        :data="projectTypeList"
+        row-key="typeName"
+        border
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+<!--        <el-table-column label="父级ID" align="center" prop="parentId" />-->
+        <el-table-column label="项目类型名称" align="left" prop="typeName" />
+<!--        <el-table-column label="排序号" align="center" prop="sortOrder" />-->
+        <el-table-column label="备件标识" align="center" prop="spareFlag">
+          <template #default="scope">
+            <dict-tag :options="spare_flag" :value="scope.row.spareFlag" />
+          </template>
+        </el-table-column>
+        <el-table-column label="顶级标识" align="center" prop="topFlag">
+          <template #default="scope">
+            <dict-tag :options="top_flag" :value="scope.row.topFlag" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:projectType:edit']" />
+            </el-tooltip>
+            <el-tooltip content="新增" placement="top">
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['oa/erp:projectType:add']" />
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/erp:projectType:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改项目类型信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="projectTypeFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="父级ID" prop="parentId">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="projectTypeOptions"
+            :props="{ value: 'projectTypeId', label: 'typeName', children: 'children' }"
+            value-key="projectTypeId"
+            placeholder="请选择父级ID"
+            check-strictly
+          />
+        </el-form-item>
+        <el-form-item label="项目类型名称" prop="typeName">
+          <el-input v-model="form.typeName" placeholder="请输入项目类型名称" />
+        </el-form-item>
+<!--        <el-form-item label="排序号" prop="sortOrder">-->
+<!--          <el-input v-model="form.sortOrder" placeholder="请输入排序号" />-->
+<!--        </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="topFlag">
+          <el-radio-group v-model="form.topFlag">
+            <el-radio v-for="dict in top_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </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="ProjectType" lang="ts">
+import { listProjectType, getProjectType, delProjectType, addProjectType, updateProjectType } from '@/api/oa/erp/projectType';
+import { ProjectTypeVO, ProjectTypeQuery, ProjectTypeForm } from '@/api/oa/erp/projectType/types';
+
+type ProjectTypeOption = {
+  projectTypeId: number;
+  typeName: string;
+  children?: ProjectTypeOption[];
+};
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { top_flag, spare_flag } = toRefs<any>(proxy?.useDict('top_flag', 'spare_flag'));
+
+const projectTypeList = ref<ProjectTypeVO[]>([]);
+const projectTypeOptions = ref<ProjectTypeOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const projectTypeFormRef = ref<ElFormInstance>();
+const projectTypeTableRef = ref<ElTableInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ProjectTypeForm = {
+  projectTypeId: undefined,
+  parentId: undefined,
+  typeName: undefined,
+  sortOrder: undefined,
+  spareFlag: undefined,
+  remark: undefined,
+  topFlag: undefined
+};
+
+const data = reactive<PageData<ProjectTypeForm, ProjectTypeQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    parentId: undefined,
+    typeName: undefined,
+    sortOrder: undefined,
+    spareFlag: undefined,
+    topFlag: undefined,
+    params: {}
+  },
+  rules: {
+    projectTypeId: [{ required: true, message: '项目类型ID不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询项目类型信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listProjectType(queryParams.value);
+  const data = proxy?.handleTree<ProjectTypeVO>(res.data, 'projectTypeId', 'parentId');
+  if (data) {
+    projectTypeList.value = data;
+    loading.value = false;
+  }
+};
+
+/** 查询项目类型信息下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listProjectType();
+  projectTypeOptions.value = [];
+  const data: ProjectTypeOption = { projectTypeId: 0, typeName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<ProjectTypeOption>(res.data, 'projectTypeId', 'parentId');
+  projectTypeOptions.value.push(data);
+};
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+// 表单重置
+const reset = () => {
+  form.value = { ...initFormData };
+  projectTypeFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 新增按钮操作 */
+const handleAdd = (row?: ProjectTypeVO) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.projectTypeId) {
+    form.value.parentId = row.projectTypeId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = '添加项目类型信息';
+};
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(projectTypeList.value, isExpandAll.value);
+};
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: ProjectTypeVO[], status: boolean) => {
+  data.forEach((item) => {
+    projectTypeTableRef.value?.toggleRowExpansion(item, status);
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status);
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: ProjectTypeVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getProjectType(row.projectTypeId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改项目类型信息';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  projectTypeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.projectTypeId) {
+        await updateProjectType(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addProjectType(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row: ProjectTypeVO) => {
+  await proxy?.$modal.confirm('是否确认删除项目类型信息编号为"' + row.projectTypeId + '"的数据项？');
+  loading.value = true;
+  await delProjectType(row.projectTypeId).finally(() => (loading.value = false));
+  await getList();
+  proxy?.$modal.msgSuccess('删除成功');
+};
+
+onMounted(() => {
+  getList();
+});
+</script>