1.0.47 合同审批页面优化、销售物料查询优化。合同订单页面

src/api/oa/base/paymentStage/index.ts

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { PaymentStageVO, PaymentStageForm, PaymentStageQuery } from '@/api/oa/base/paymentStage/types';
+
+/**
+ * 查询回款阶段列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listPaymentStage = (query?: PaymentStageQuery): AxiosPromise<PaymentStageVO[]> => {
+  return request({
+    url: '/oa/base/paymentStage/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询回款阶段详细
+ * @param paymentStageId
+ */
+export const getPaymentStage = (paymentStageId: string | number): AxiosPromise<PaymentStageVO> => {
+  return request({
+    url: '/oa/base/paymentStage/' + paymentStageId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增回款阶段
+ * @param data
+ */
+export const addPaymentStage = (data: PaymentStageForm) => {
+  return request({
+    url: '/oa/base/paymentStage',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改回款阶段
+ * @param data
+ */
+export const updatePaymentStage = (data: PaymentStageForm) => {
+  return request({
+    url: '/oa/base/paymentStage',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除回款阶段
+ * @param paymentStageId
+ */
+export const delPaymentStage = (paymentStageId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/base/paymentStage/' + paymentStageId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询回款阶段列表
+ * @param query
+ * @returns {*}
+ */
+export function getBasePaymentStageList (query) {
+    return request({
+        url: '/oa/base/paymentStage/getBasePaymentStageList',
+        method: 'get',
+        params: query
+    });
+};

src/api/oa/base/paymentStage/types.ts

@@ -0,0 +1,116 @@
+export interface PaymentStageVO {
+  /**
+   * 回款阶段ID
+   */
+  paymentStageId: string | number;
+
+  /**
+   * 阶段编码
+   */
+  stageCode: string;
+
+  /**
+   * 阶段名称
+   */
+  stageName: string;
+
+  /**
+   * 回款阶段（关联各节点，提示用）
+   */
+  collectionStage: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建者
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新者
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface PaymentStageForm extends BaseEntity {
+  /**
+   * 回款阶段ID
+   */
+  paymentStageId?: string | number;
+
+  /**
+   * 阶段编码
+   */
+  stageCode?: string;
+
+  /**
+   * 阶段名称
+   */
+  stageName?: string;
+
+  /**
+   * 回款阶段（关联各节点，提示用）
+   */
+  collectionStage?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface PaymentStageQuery extends PageQuery {
+
+  /**
+   * 阶段编码
+   */
+  stageCode?: string;
+
+  /**
+   * 阶段名称
+   */
+  stageName?: string;
+
+  /**
+   * 回款阶段（关联各节点，提示用）
+   */
+  collectionStage?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

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

@@ -157,7 +157,7 @@ export interface ContractInfoVO {
   /**
    * 合同负责人
    */
-  contractManagerId: string | number;
+  contractManagerId: number;
 
   /**
    * 合同负责人名称
@@ -335,7 +335,7 @@ export interface ContractInfoForm extends BaseEntity {
   /**
    * 合同负责人
    */
-  contractManagerId?: string | number;
+  contractManagerId?: number;
 
   /**
    * 合同大写金额
@@ -506,7 +506,7 @@ export interface ContractInfoQuery extends PageQuery {
   /**
    * 合同负责人
    */
-  contractManagerId?: string | number;
+  contractManagerId?: number;
 
   /**
    * 合同大写金额

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

@@ -0,0 +1,51 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProjectInfoVO, ProjectInfoForm } from '@/api/oa/erp/projectInfo/types';
+
+/**
+ * 暂存合同订单（项目信息）
+ * @param data
+ */
+export const saveContractOrder = (data: ProjectInfoForm): AxiosPromise<ProjectInfoVO> => {
+  return request({
+    url: '/oa/erp/contractOrder/save',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 提交合同订单并提交流程
+ * @param data
+ */
+export const submitContractOrderAndFlowStart = (data: ProjectInfoForm): AxiosPromise<ProjectInfoVO> => {
+  return request({
+    url: '/oa/erp/contractOrder/submitAndFlowStart',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改合同订单（项目信息）
+ * @param data
+ */
+export const updateContractOrder = (data: ProjectInfoForm): AxiosPromise<ProjectInfoVO> => {
+  return request({
+    url: '/oa/erp/contractOrder',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 查询合同订单详细信息
+ * @param projectId
+ */
+export const getContractOrder = (projectId: string | number): AxiosPromise<ProjectInfoVO> => {
+  return request({
+    url: '/oa/erp/contractOrder/' + projectId,
+    method: 'get'
+  });
+};
+

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

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ContractPaymentStageVO, ContractPaymentStageForm, ContractPaymentStageQuery } from '@/api/oa/erp/contractPaymentStage/types';
+
+/**
+ * 查询合同回款阶段列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listContractPaymentStage = (query?: ContractPaymentStageQuery): AxiosPromise<ContractPaymentStageVO[]> => {
+  return request({
+    url: '/oa/erp/contractPaymentStage/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询合同回款阶段详细
+ * @param contractStageId
+ */
+export const getContractPaymentStage = (contractStageId: string | number): AxiosPromise<ContractPaymentStageVO> => {
+  return request({
+    url: '/oa/erp/contractPaymentStage/' + contractStageId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增合同回款阶段
+ * @param data
+ */
+export const addContractPaymentStage = (data: ContractPaymentStageForm) => {
+  return request({
+    url: '/oa/erp/contractPaymentStage',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改合同回款阶段
+ * @param data
+ */
+export const updateContractPaymentStage = (data: ContractPaymentStageForm) => {
+  return request({
+    url: '/oa/erp/contractPaymentStage',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除合同回款阶段
+ * @param contractStageId
+ */
+export const delContractPaymentStage = (contractStageId: string | number | Array<string | number>) => {
+  return request({
+    url: '/oa/erp/contractPaymentStage/' + contractStageId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询合同回款阶段列表
+ * @param query
+ * @returns {*}
+ */
+export function getErpContractPaymentStageList (query) {
+    return request({
+        url: '/oa/erp/contractPaymentStage/getErpContractPaymentStageList',
+        method: 'get',
+        params: query
+    });
+};

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

@@ -0,0 +1,256 @@
+export interface ContractPaymentStageVO {
+  /**
+   * 合同回款阶段ID
+   */
+  contractStageId: string | number;
+
+  /**
+   * 合同ID
+   */
+  contractId: string | number;
+
+  /**
+   * 回款阶段ID
+   */
+  paymentStageId: string | number;
+
+  /**
+   * 阶段名称
+   */
+  stageName: string;
+
+  /**
+   * 回款阶段
+   */
+  collectionStage: string;
+
+  /**
+   * 回款比例(%)
+   */
+  repaymentRate: number;
+
+  /**
+   * 预计回款日期
+   */
+  expectRepaymentDate: string;
+
+  /**
+   * 回款延期天数
+   */
+  delayDay: number;
+
+  /**
+   * 实际回款日期
+   */
+  actualRepaymentDate: string;
+
+  /**
+   * 回款标识（0否 1是）
+   */
+  repaymentFlag: string;
+
+  /**
+   * 原因说明
+   */
+  reasonsExplanation: string;
+
+  /**
+   * 进度备注
+   */
+  scheduleRemark: string;
+
+  /**
+   * 回款金额（预留）
+   */
+  repaymentAmount: number;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建者
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新者
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface ContractPaymentStageForm extends BaseEntity {
+  /**
+   * 合同回款阶段ID
+   */
+  contractStageId?: string | number;
+
+  /**
+   * 合同ID
+   */
+  contractId?: string | number;
+
+  /**
+   * 回款阶段ID
+   */
+  paymentStageId?: string | number;
+
+  /**
+   * 阶段名称
+   */
+  stageName?: string;
+
+  /**
+   * 回款阶段
+   */
+  collectionStage?: string;
+
+  /**
+   * 回款比例(%)
+   */
+  repaymentRate?: number;
+
+  /**
+   * 预计回款日期
+   */
+  expectRepaymentDate?: string;
+
+  /**
+   * 回款延期天数
+   */
+  delayDay?: number;
+
+  /**
+   * 实际回款日期
+   */
+  actualRepaymentDate?: string;
+
+  /**
+   * 回款标识（0否 1是）
+   */
+  repaymentFlag?: string;
+
+  /**
+   * 原因说明
+   */
+  reasonsExplanation?: string;
+
+  /**
+   * 进度备注
+   */
+  scheduleRemark?: string;
+
+  /**
+   * 回款金额（预留）
+   */
+  repaymentAmount?: number;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ContractPaymentStageQuery extends PageQuery {
+
+  /**
+   * 合同ID
+   */
+  contractId?: string | number;
+
+  /**
+   * 回款阶段ID
+   */
+  paymentStageId?: string | number;
+
+  /**
+   * 阶段名称
+   */
+  stageName?: string;
+
+  /**
+   * 回款阶段
+   */
+  collectionStage?: string;
+
+  /**
+   * 回款比例(%)
+   */
+  repaymentRate?: number;
+
+  /**
+   * 预计回款日期
+   */
+  expectRepaymentDate?: string;
+
+  /**
+   * 回款延期天数
+   */
+  delayDay?: number;
+
+  /**
+   * 实际回款日期
+   */
+  actualRepaymentDate?: string;
+
+  /**
+   * 回款标识（0否 1是）
+   */
+  repaymentFlag?: string;
+
+  /**
+   * 原因说明
+   */
+  reasonsExplanation?: string;
+
+  /**
+   * 进度备注
+   */
+  scheduleRemark?: string;
+
+  /**
+   * 回款金额（预留）
+   */
+  repaymentAmount?: number;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

src/components/SaleMaterialSelect/index.vue

@@ -32,7 +32,7 @@
             <template v-if="prop.multiple" #header>
               <el-tag
                 v-for="material in selectMaterialList"
-                :key="material.materialId"
+                :key="getRowKey(material)"
                 closable
                 style="margin: 2px"
                 @close="handleCloseTag(material)"
@@ -48,7 +48,7 @@
               show-overflow
               :data="materialInfoList"
               :loading="loading"
-              :row-config="{ keyField: 'relationMaterialId', isHover: true }"
+              :row-config="{ keyField: 'rowKey', isHover: true }"
               :checkbox-config="{ reserve: true, trigger: 'row', highlight: true, showHeader: prop.multiple }"
               @checkbox-all="handleCheckboxAll"
               @checkbox-change="handleCheckboxChange"
@@ -119,6 +119,13 @@ const showSearch = ref(true);
 const total = ref(0);
 const selectMaterialList = ref<RelationMaterialVO[]>([]);
 
+/**
+ * 生成组合主键：materialId_relationMaterialId
+ */
+const getRowKey = (material: RelationMaterialVO): string => {
+  return `${material.materialId}_${material.relationMaterialId}`;
+};
+
 const queryFormRef = ref<ElFormInstance>();
 const tableRef = ref<VxeTableInstance<RelationMaterialVO>>();
 
@@ -166,14 +173,18 @@ const getList = async () => {
   loading.value = true;
   const res = await listMaterialInfoWithRelation(queryParams.value);
   loading.value = false;
-  materialInfoList.value = res.rows;
+  // 为每个物料添加组合主键
+  materialInfoList.value = res.rows.map((item) => ({
+    ...item,
+    rowKey: getRowKey(item)
+  }));
   total.value = res.total;
 };
 
 const pageList = async () => {
   await getList();
   const materials = materialInfoList.value.filter((item) => {
-    return selectMaterialList.value.some((material) => material.relationMaterialId === item.relationMaterialId);
+    return selectMaterialList.value.some((material) => getRowKey(material) === getRowKey(item));
   });
   await tableRef.value.setCheckboxRow(materials, true);
 };
@@ -201,7 +212,7 @@ const handleCheckboxChange = (checked) => {
     selectMaterialList.value.push(row);
   } else {
     selectMaterialList.value = selectMaterialList.value.filter((item) => {
-      return item.relationMaterialId !== row.relationMaterialId;
+      return getRowKey(item) !== getRowKey(row);
     });
   }
 };
@@ -210,21 +221,21 @@ const handleCheckboxAll = (checked) => {
   const rows = materialInfoList.value;
   if (checked.checked) {
     rows.forEach((row) => {
-      if (!selectMaterialList.value.some((item) => item.relationMaterialId === row.relationMaterialId)) {
+      if (!selectMaterialList.value.some((item) => getRowKey(item) === getRowKey(row))) {
         selectMaterialList.value.push(row);
       }
     });
   } else {
     selectMaterialList.value = selectMaterialList.value.filter((item) => {
-      return !rows.some((row) => row.relationMaterialId === item.relationMaterialId);
+      return !rows.some((row) => getRowKey(row) === getRowKey(item));
     });
   }
 };
 
 const handleCloseTag = (material: RelationMaterialVO) => {
-  const relationMaterialId = material.relationMaterialId;
+  const rowKey = getRowKey(material);
   // 使用splice删除物料
-  const index = selectMaterialList.value.findIndex((item) => item.relationMaterialId === relationMaterialId);
+  const index = selectMaterialList.value.findIndex((item) => getRowKey(item) === rowKey);
   const rows = selectMaterialList.value[index];
   tableRef.value?.setCheckboxRow(rows, false);
   selectMaterialList.value.splice(index, 1);
@@ -233,6 +244,7 @@ const handleCloseTag = (material: RelationMaterialVO) => {
 const initSelectMaterial = async () => {
   if (defaultSelectMaterialIds.value.length > 0) {
     // 从当前列表中筛选已选择的物料
+    // 注意：defaultSelectMaterialIds 可能是 relationMaterialId 的数组，需要匹配
     const materials = materialInfoList.value.filter((item) => {
       return defaultSelectMaterialIds.value.includes(String(item.relationMaterialId));
     });

src/enums/OAEnum.ts

@@ -132,5 +132,10 @@ export enum FlowCodeEnum {
   /**
    * 邮寄申请标识KEY
    */
-  MAILING_APPLY_CODE = 'CRMMA'
+  MAILING_APPLY_CODE = 'CRMMA',
+
+  /**
+   * 合同订单标识KEY
+   */
+  CONTRACT_ORDER_KEY = 'htdd',
 }

src/views/oa/base/paymentStage/index.vue

@@ -0,0 +1,284 @@
+<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="stageCode">-->
+<!--              <el-input v-model="queryParams.stageCode" placeholder="请输入阶段编码" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+            <el-form-item label="阶段名称" prop="stageName">
+              <el-input v-model="queryParams.stageName" placeholder="请输入阶段名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="回款阶段" prop="collectionStage">
+              <el-select v-model="queryParams.collectionStage" placeholder="请选择回款阶段" clearable>
+                <el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <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/base:paymentStage:add']"> 新增 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/base:paymentStage:edit']"
+              >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/base:paymentStage:remove']"
+              >删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/base:paymentStage: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="paymentStageList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="回款阶段ID" align="center" prop="paymentStageId" v-if="columns[0].visible" />
+        <el-table-column label="阶段编码" align="center" prop="stageCode" v-if="columns[2].visible" />
+        <el-table-column label="阶段名称" align="center" prop="stageName" v-if="columns[3].visible" />
+        <el-table-column label="回款阶段" align="center" prop="collectionStage" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="collection_stage" :value="scope.row.collectionStage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[5].visible" />
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[6].visible" />
+        <el-table-column label="创建者" align="center" prop="createBy" v-if="columns[9].visible" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[10].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新者" align="center" prop="updateBy" v-if="columns[11].visible" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[12].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </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/base:paymentStage:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/base:paymentStage: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="paymentStageFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="阶段编码" prop="stageCode">-->
+<!--          <el-input v-model="form.stageCode" placeholder="请输入阶段编码" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="阶段名称" prop="stageName">
+          <el-input v-model="form.stageName" placeholder="请输入阶段名称" />
+        </el-form-item>
+        <el-form-item label="回款阶段" prop="collectionStage">
+          <el-select v-model="form.collectionStage" placeholder="请选择回款阶段">
+            <el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </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" type="textarea" 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="PaymentStage" lang="ts">
+import { listPaymentStage, getPaymentStage, delPaymentStage, addPaymentStage, updatePaymentStage } from '@/api/oa/base/paymentStage';
+import { PaymentStageVO, PaymentStageQuery, PaymentStageForm } from '@/api/oa/base/paymentStage/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { collection_stage } = toRefs<any>(proxy?.useDict('collection_stage'));
+
+const paymentStageList = ref<PaymentStageVO[]>([]);
+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 paymentStageFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `回款阶段ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `阶段编码`, visible: false },
+  { key: 3, label: `阶段名称`, visible: true },
+  { key: 4, label: `回款阶段`, visible: true },
+  { key: 5, label: `排序号`, visible: true },
+  { key: 6, label: `备注`, visible: false },
+  { key: 7, label: `删除标志`, visible: false },
+  { key: 8, label: `创建部门`, visible: false },
+  { key: 9, label: `创建者`, visible: false },
+  { key: 10, label: `创建时间`, visible: true },
+  { key: 11, label: `更新者`, visible: false },
+  { key: 12, label: `更新时间`, visible: true }
+]);
+
+const initFormData: PaymentStageForm = {
+  paymentStageId: undefined,
+  stageCode: undefined,
+  stageName: undefined,
+  collectionStage: undefined,
+  sortOrder: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<PaymentStageForm, PaymentStageQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    stageCode: undefined,
+    stageName: undefined,
+    collectionStage: undefined,
+    sortOrder: undefined,
+    params: {}
+  },
+  rules: {
+    stageName: [{ required: true, message: '阶段名称不能为空', trigger: 'blur' }],
+    collectionStage: [{ required: true, message: '回款阶段不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询回款阶段列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listPaymentStage(queryParams.value);
+  paymentStageList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  paymentStageFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: PaymentStageVO[]) => {
+  ids.value = selection.map((item) => item.paymentStageId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加回款阶段';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: PaymentStageVO) => {
+  reset();
+  const _paymentStageId = row?.paymentStageId || ids.value[0];
+  const res = await getPaymentStage(_paymentStageId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改回款阶段';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  paymentStageFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.paymentStageId) {
+        await updatePaymentStage(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addPaymentStage(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: PaymentStageVO) => {
+  const _paymentStageIds = row?.paymentStageId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除回款阶段编号为"' + _paymentStageIds + '"的数据项？').finally(() => (loading.value = false));
+  await delPaymentStage(_paymentStageIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'oa/base/paymentStage/export',
+    {
+      ...queryParams.value
+    },
+    `paymentStage_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>

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

@@ -17,13 +17,7 @@
       />
     </el-card>
     <el-card shadow="never" style="margin-top: 0">
-      <el-form
-        ref="contractInfoFormRef"
-        :model="form"
-        :loading="buttonLoading"
-        :rules="rules"
-        label-width="120px"
-      >
+      <el-form ref="contractInfoFormRef" :model="form" :loading="buttonLoading" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="有无合同" prop="contractFlag">
@@ -36,14 +30,14 @@
             <el-form-item label="合同编号" prop="contractCode">
               <el-input v-model="form.contractCode" placeholder="请输入合同编号" :disabled="isFormDisabled">
                 <template #append>
-                  <el-button type="primary" @click="generateContractCode" :disabled="isCodeGenerated">生成合同编号 </el-button>
+                  <el-button type="primary" @click="generateContractCode" :disabled="isCodeGenerated">生成合同编号</el-button>
                 </template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="合同名称" prop="contractName">
-              <el-input v-model="form.contractName" placeholder="请输入合同名称" :disabled="isFormDisabled"/>
+              <el-input v-model="form.contractName" placeholder="请输入合同名称" :disabled="isFormDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -53,13 +47,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="合同类型" prop="contractType">-->
-<!--              <el-select v-model="form.contractType" placeholder="请选择合同类型">-->
-<!--                <el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="合同类型" prop="contractType">-->
+          <!--              <el-select v-model="form.contractType" placeholder="请选择合同类型">-->
+          <!--                <el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="业务方向" prop="businessDirection">
               <el-select v-model="form.businessDirection" placeholder="请选择业务方向" :disabled="isFormDisabled">
@@ -69,14 +63,21 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="部门" prop="contractDeptId">
-              <el-select v-model="form.contractDeptId" :disabled="isFormDisabled">
+              <el-select v-model="form.contractDeptId" :disabled="isFormDisabled" 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="contractDate">
-              <el-date-picker clearable v-model="form.contractDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" :disabled="isFormDisabled" placeholder="请选择合同时间">
+              <el-date-picker
+                clearable
+                v-model="form.contractDate"
+                type="date"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="isFormDisabled"
+                placeholder="请选择合同时间"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -103,23 +104,37 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲方授权代表" prop="oneRepresent">
-              <el-input v-model="form.oneRepresent" placeholder="请输入甲方授权代表" :disabled="isFormDisabled"/>
+              <el-input v-model="form.oneRepresent" placeholder="请输入甲方授权代表" :disabled="isFormDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="乙方授权代表" prop="twoRepresent">
-              <el-input v-model="form.twoRepresent" placeholder="请输入乙方授权代表" :disabled="isFormDisabled"/>
+              <el-input v-model="form.twoRepresent" placeholder="请输入乙方授权代表" :disabled="isFormDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲方签字日期" prop="oneDate">
-              <el-date-picker clearable v-model="form.oneDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择甲方签字日期" :disabled="isFormDisabled">
+              <el-date-picker
+                clearable
+                v-model="form.oneDate"
+                type="date"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择甲方签字日期"
+                :disabled="isFormDisabled"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="乙方签字日期" prop="twoDate">
-              <el-date-picker clearable v-model="form.twoDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择乙方签字日期" :disabled="isFormDisabled">
+              <el-date-picker
+                clearable
+                v-model="form.twoDate"
+                type="date"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择乙方签字日期"
+                :disabled="isFormDisabled"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -181,22 +196,22 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="isFormDisabled"/>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="isFormDisabled" />
             </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="paymentMethod">-->
+          <!--              <el-input v-model="form.paymentMethod" placeholder="（如：3-3-3-1）" />-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
         </el-row>
       </el-form>
     </el-card>
 
-    <!-- 合同物料管理区域 -->
+    <!-- 合同物料区域 -->
     <el-card shadow="never" style="margin-top: 0">
       <template #header>
-        <div style="text-align: left; font-weight: bold; font-size: 18px">合同物料管理</div>
+        <div style="text-align: left; font-weight: bold; font-size: 18px">合同物料</div>
       </template>
 
       <!-- 合同物料表格 -->
@@ -472,7 +487,7 @@ const contractMaterialList = computed(() => {
 /** 查询打印模板下拉框结构 */
 const printTemplateList = ref([]);
 const getPrintTemplateListSelect = async () => {
-  const res = await getBasePrintTemplateList(null);
+  const res = await getBasePrintTemplateList({ templateType: '1' });
   printTemplateList.value = res.data;
 };
 
@@ -586,6 +601,7 @@ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
     contractName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
     businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'blur' }],
     contractManagerId: [{ required: true, message: '合同负责人不能为空', trigger: 'blur' }],
+    contractDeptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
     contractTemplateFlag: [{ required: true, message: '合同模板标识不能为空', trigger: 'blur' }],
   }
 });
@@ -923,12 +939,12 @@ onMounted(async () => {
         isCodeGenerated.value = false;
       }
     } else {
-      // 新增模式：获取登录用户部门ID并自动赋值
       try {
-        const userInfoRes = await getInfo();
-        if (userInfoRes.data?.user?.deptId && !form.value.contractDeptId) {
-          form.value.contractDeptId = userInfoRes.data.user.deptId;
-        }
+        // 新增模式：获取登录用户部门ID并自动赋值
+        // const userInfoRes = await getInfo();
+        // if (userInfoRes.data?.user?.deptId && !form.value.contractDeptId) {
+        //   form.value.contractDeptId = userInfoRes.data.user.deptId;
+        // }
         form.value.contractCategory = routeParams.value.contractCategory as string;
       } catch (error) {
         console.error('获取用户信息失败:', error);

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

@@ -187,7 +187,7 @@
             <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="200" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看详情" placement="top" v-if="canViewDetail(scope.row)">
               <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
@@ -210,6 +210,14 @@
                 v-hasPermi="['oa/erp:contractInfo:edit']"
               ></el-button>
             </el-tooltip>
+            <el-tooltip content="合同订单激活" placement="top" v-if="canActivateOrder(scope.row)">
+              <el-button
+                link
+                type="warning"
+                icon="CircleCheck"
+                @click="handleOrderActivate(scope.row)"
+              ></el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -575,4 +583,27 @@ const contractView = (e) => {
 const canViewDetail = (row: ContractInfoVO) => {
   return row.contractStatus !== '1';
 };
+
+/** 判断是否可以激活合同订单 */
+const canActivateOrder = (row: ContractInfoVO) => {
+  // 合同大类是产品销售且合同状态为可用（3）
+  if (row.contractStatus !== '3') {
+    return false;
+  }
+  // "合同大类(1市场实施 2产品销售）
+  return row.contractCategory === '2';
+};
+
+/** 订单激活按钮操作 */
+const handleOrderActivate = (row?: ContractInfoVO) => {
+  const _contractId = row?.contractId;
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/contract/contractInfo/orderActivate',
+    query: {
+      contractId: _contractId,
+      type: 'add',
+    }
+  });
+};
 </script>

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

@@ -0,0 +1,726 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never" style="margin-top: 0">
+      <approvalButton
+        @submitForm="submitForm"
+        @approvalVerifyOpen="approvalVerifyOpen"
+        @handleApprovalRecord="handleApprovalRecord"
+        :buttonLoading="buttonLoading"
+        :id="form.contractId"
+        :status="form.flowStatus"
+        :pageType="routeParams.type"
+        :mode="false"
+      />
+    </el-card>
+
+    <el-card shadow="never" style="margin-top: 0">
+      <el-form
+        ref="projectInfoFormRef"
+        :model="form"
+        :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
+        :rules="rules"
+        label-width="120px"
+      >
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="项目编号" prop="projectCode">
+              <el-input v-model="form.projectCode" placeholder="自动生成项目编号" :disabled="true" />
+            </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="请选择业务方向" :disabled="true">
+                <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="请选择项目类型"
+                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="请选择部门负责人" :disabled="true">
+                <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="请选择分管副总" :disabled="true">
+                <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="contractCode">
+              <el-input v-model="form.contractCode" placeholder="请输入合同编号" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同名称" prop="contractName">
+              <el-input v-model="form.contractName" placeholder="请输入合同名称" :disabled="true" />
+            </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="请输入合同总价" :disabled="true">
+                <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="12">
+            <el-form-item label="终版合同上传" prop="ossId">
+              <FileUpload
+                v-model="ossIdString"
+                :limit="5"
+                :fileSize="20"
+                :fileType="['doc', 'docx', 'pdf', 'xls', 'xlsx']"
+                :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
+                :isShowTip="true"
+              />
+            </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: 0">
+      <template #header>
+        <el-row :gutter="10">
+          <el-col :span="1.5">
+            <span class="card-title">项目阶段计划</span>
+          </el-col>
+          <el-col :span="1.5" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
+            <el-button type="primary" icon="Plus" @click="handleAddPlanStage">添加阶段</el-button>
+          </el-col>
+        </el-row>
+      </template>
+
+      <el-table :data="planStageList" border stripe max-height="400">
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <el-table-column label="项目阶段" width="150" align="center">
+          <template #default="scope">
+            <el-select
+              v-model="scope.row.projectPhases"
+              placeholder="请选择项目阶段"
+              style="width: 100%"
+              :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
+            >
+              <el-option v-for="dict in project_phases" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划开始时间" width="160" align="center">
+          <template #default="scope">
+            <el-date-picker
+              v-model="scope.row.planStartTime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="计划结束时间" width="160" align="center">
+          <template #default="scope">
+            <el-date-picker
+              v-model="scope.row.planEndTime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="回款阶段" width="150" align="center">
+          <template #default="scope">
+            <el-select v-model="scope.row.collectionStage" placeholder="请选择回款阶段" clearable style="width: 100%">
+              <el-option
+                v-for="stage in paymentStageList"
+                :key="stage.paymentStageId"
+                :label="stage.stageName"
+                :value="stage.collectionStage"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="预计回款比例(%)" width="150" align="center">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.repaymentRate"
+              :min="0"
+              :max="100"
+              :precision="2"
+              controls-position="right"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="预计回款金额" width="150" align="center">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.repaymentAmount"
+              :min="0"
+              :precision="2"
+              controls-position="right"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="预计回款时间" width="160" align="center">
+          <template #default="scope">
+            <el-date-picker
+              v-model="scope.row.repaymentTime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="回款延期天数" width="130" align="center">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.delayDay"
+              :min="0"
+              controls-position="right"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="应收款日期" width="160" align="center">
+          <template #default="scope">
+            <el-date-picker
+              v-model="scope.row.receivableDate"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="原因说明" min-width="200" align="center">
+          <template #default="scope">
+            <el-input v-model="scope.row.reasonsExplanation" placeholder="请输入原因说明" />
+          </template>
+        </el-table-column>
+        <el-table-column label="进度备注" min-width="200" align="center">
+          <template #default="scope">
+            <el-input v-model="scope.row.scheduleRemark" placeholder="请输入进度备注" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="150" align="center">
+          <template #default="scope">
+            <el-input v-model="scope.row.remark" placeholder="请输入备注" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'" label="操作" width="80" align="center" fixed="right">
+          <template #default="scope">
+            <el-button type="danger" link icon="Delete" @click="handleDeletePlanStage(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+
+    <!-- 提交审批组件 -->
+    <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+    <!-- 审批记录 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script setup name="ProjectInfoEdit" lang="ts">
+import { getProjectInfo } from '@/api/oa/erp/projectInfo';
+import { saveContractOrder, updateContractOrder, submitContractOrderAndFlowStart } from '@/api/oa/erp/contractOrder';
+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, FlowCodeEnum, ProjectCategoryEnum } from '@/enums/OAEnum';
+import { listErpProjectPlanStage } from '@/api/oa/erp/erpProjectPlanStage';
+import { ErpProjectPlanStageForm, ErpProjectPlanStageQuery } from '@/api/oa/erp/erpProjectPlanStage/types';
+import { listContractInfo, getContractInfo } from '@/api/oa/erp/contractInfo';
+import { ContractInfoVO, ContractInfoQuery } from '@/api/oa/erp/contractInfo/types';
+import { getBasePaymentStageList } from '@/api/oa/base/paymentStage';
+import { PaymentStageVO } from '@/api/oa/base/paymentStage/types';
+import { getInfo } from '@/api/login';
+import FileUpload from '@/components/FileUpload/index.vue';
+
+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, project_phases } = toRefs<any>(
+  proxy?.useDict('business_direction', 'project_status', 'contract_flag', 'project_category', 'spare_flag', 'contract_status', 'project_phases')
+);
+
+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: '',
+  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 paymentStageList = ref<PaymentStageVO[]>([]);
+const getPaymentStageList = async () => {
+  try {
+    const res = await getBasePaymentStageList({ pageNum: 1, pageSize: 9999 });
+    paymentStageList.value = res.data || [];
+  } catch (error) {
+    console.error('查询回款阶段列表失败:', error);
+    paymentStageList.value = [];
+  }
+};
+
+const projectTypeOptions = ref<ProjectTypeVO[]>([]);
+// 保存原始的项目类型列表（扁平结构），用于查找 parentId
+const projectTypeList = ref<ProjectTypeVO[]>([]);
+/** 查询项目类型列表 */
+const getProjectTypeList = async () => {
+  const params = { spareFlag: form.value.spareFlag } as any;
+  const res = await listProjectType(params);
+  // 保存原始数据用于查找
+  projectTypeList.value = res.data || [];
+  projectTypeOptions.value = proxy?.handleTree<ProjectTypeVO>(res.data, 'projectTypeId', 'parentId') || [];
+};
+
+type ProjectInfoFormEx = ProjectInfoForm & {
+  flowCode?: string;
+  variables?: any;
+  bizExt?: any;
+  contractCode?: string;
+  contractName?: string;
+  planStageList?: ErpProjectPlanStageForm[];
+};
+
+const initFormData: ProjectInfoFormEx = {
+  projectId: undefined,
+  contractFlag: '1',
+  projectCode: undefined,
+  projectName: undefined,
+  businessDirection: undefined,
+  projectCategory: '5',
+  spareFlag: '1',
+  projectTypeId: undefined,
+  paymentMethod: undefined,
+  deptId: undefined,
+  managerId: undefined,
+  chargeId: undefined,
+  deputyId: undefined,
+  peopleId: undefined,
+  amount: undefined,
+  projectStatus: '1',
+  flowStatus: undefined,
+  sortOrder: 0,
+  contractId: undefined,
+  contractCode: undefined,
+  contractName: undefined,
+  remark: undefined,
+  ossId: 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' }],
+    projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
+    businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'change' }],
+    projectCategory: [{ required: true, message: '项目类别不能为空', trigger: 'change' }]
+  }
+});
+
+const { form, rules } = toRefs(data);
+
+// 附件ID字符串转换（用于FileUpload组件）
+const ossIdString = computed({
+  get() {
+    const v = form.value.ossId as any;
+    return v === undefined || v === null ? '' : String(v);
+  },
+  set(val: string) {
+    form.value.ossId = val || (undefined as any);
+  }
+});
+
+// 生成项目编号
+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 goBack = () => {
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+
+/** 提交按钮 */
+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;
+        }
+        // 添加项目阶段计划列表
+        submitData.planStageList = planStageList.value.map((item) => ({
+          ...item,
+          projectId: form.value.projectId
+        }));
+
+        // 设置后端发起和不等于草稿状态 直接走流程发起
+        if (status != 'draft') {
+          // 后端发起流程模式
+          submitData.flowCode = FlowCodeEnum.CONTRACT_ORDER_KEY;
+
+          // 根据 projectTypeId 查找对应的 parentId
+          let projectTypeParentId = undefined;
+          if (submitData.projectTypeId) {
+            const projectType = projectTypeList.value.find((item) => item.projectTypeId === submitData.projectTypeId);
+            if (projectType) {
+              projectTypeParentId = projectType.parentId;
+            }
+          }
+          // 流程变量
+          submitData.variables = {
+            projectId: submitData.projectId,
+            projectCode: submitData.projectCode,
+            projectName: submitData.projectName
+          };
+          // 流程实例业务扩展字段
+          submitData.bizExt = {
+            businessTitle: '合同订单激活',
+            businessCode: submitData.projectCode
+          };
+          submitData.projectStatus = '2';
+          submitData.flowStatus = 'waiting';
+          const res = await submitContractOrderAndFlowStart(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 updateContractOrder(submitData).finally(() => (buttonLoading.value = false));
+          } else {
+            await saveContractOrder(submitData).finally(() => (buttonLoading.value = false));
+          }
+          buttonLoading.value = false;
+          proxy?.$modal.msgSuccess('暂存成功');
+          proxy?.$tab.closePage();
+          router.go(-1);
+        }
+      }
+    });
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+
+
+//初始化调用
+const loadSelectOptions = async () => {
+  await getUserList();
+  await getDeptInfoListSelect();
+  await getPaymentStageList();
+};
+
+/** 查询合同信息并赋值相关字段 */
+const loadContractInfo = async () => {
+  const contractId = routeParams.value.contractId as string | number;
+  if (contractId) {
+    try {
+      const contractRes = await getContractInfo(contractId);
+      if (contractRes.data) {
+        const contractData = contractRes.data;
+        form.value.contractId = contractData.contractId;
+        form.value.projectName = contractData.contractName + "订单";
+        form.value.businessDirection = contractData.businessDirection;
+        form.value.deptId = contractData.contractDeptId;
+        form.value.contractCode = contractData.contractCode;
+        form.value.contractName = contractData.contractName;
+        form.value.amount = contractData.totalPrice;
+
+          // 根据部门ID查找部门信息，获取部门负责人和分管副总
+          const deptInfo = deptInfoList.value.find((dept: any) => dept.deptId === contractData.contractDeptId);
+          form.value.chargeId = deptInfo.leader;
+          form.value.deputyId = deptInfo.vicePresident;
+        // 将抄送人员字符串转换为数组，用于多选下拉框显示
+        if (contractData.contractManagerId) {
+          form.value.peopleId = String(contractData.contractManagerId).split(',').map((id) => {
+            return String(id.trim());
+          }) as any;
+        }
+      }
+    } catch (error) {
+      console.error('查询合同信息失败:', error);
+    }
+  }
+};
+
+onMounted(async () => {
+  nextTick(async () => {
+    // 获取路由参数
+    routeParams.value = route.query;
+    proxy?.$modal.loading('正在加载数据，请稍后...');
+    await loadSelectOptions();
+    const id = routeParams.value.id as string | number;
+    if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
+      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) => {
+          return String(id.trim());
+        }) as any;
+      }
+      // 加载项目阶段计划列表
+      await getPlanStageList();
+    } else {
+      // 新增模式，初始化空列表
+      planStageList.value = [];
+      try {
+        // 新增，查询合同信息并赋值业务方向
+        await loadContractInfo();
+      } catch (error) {
+        console.error('获取用户信息失败:', error);
+      }
+    }
+    await getProjectTypeList();
+    proxy?.$modal.closeLoading();
+  });
+});
+
+// 审批记录
+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 planStageList = ref<ErpProjectPlanStageForm[]>([]);
+
+/** 查询项目阶段计划列表 */
+const getPlanStageList = async () => {
+  if (!form.value.projectId) {
+    planStageList.value = [];
+    return;
+  }
+
+  try {
+    const params: ErpProjectPlanStageQuery = {
+        projectId: form.value.projectId,
+      pageNum: 1,
+      pageSize: 9999
+    };
+    const res = await listErpProjectPlanStage(params);
+    planStageList.value = (res.rows || []).map((item: any) => ({
+      ...item,
+      // 确保所有字段都有默认值
+      projectPhases: item.projectPhases || '',
+      planStartTime: item.planStartTime || undefined,
+      planEndTime: item.planEndTime || undefined,
+      collectionStage: item.collectionStage || '',
+      repaymentRate: item.repaymentRate || undefined,
+      repaymentAmount: item.repaymentAmount || undefined,
+      repaymentTime: item.repaymentTime || undefined,
+      delayDay: item.delayDay || undefined,
+      receivableDate: item.receivableDate || undefined,
+      reasonsExplanation: item.reasonsExplanation || '',
+      scheduleRemark: item.scheduleRemark || '',
+      remark: item.remark || '',
+      sortOrder: item.sortOrder || planStageList.value.length + 1,
+      activeFlag: item.activeFlag || '1'
+    }));
+  } catch (error) {
+    console.error('查询项目阶段计划失败:', error);
+    planStageList.value = [];
+  }
+};
+
+/** 添加项目阶段计划行 */
+const handleAddPlanStage = () => {
+  const newStage: ErpProjectPlanStageForm = {
+    planStageId: undefined,
+    projectId: form.value.projectId,
+    projectPlanId: undefined,
+    projectPhases: '',
+    planStartTime: undefined,
+    planEndTime: undefined,
+    collectionStage: '',
+    repaymentRate: undefined,
+    repaymentAmount: undefined,
+    repaymentTime: undefined,
+    delayDay: undefined,
+    receivableDate: undefined,
+    reasonsExplanation: '',
+    scheduleRemark: '',
+    realStartTime: undefined,
+    realEndTime: undefined,
+    sortOrder: planStageList.value.length + 1,
+    remark: '',
+    activeFlag: '1'
+  };
+  planStageList.value.push(newStage);
+};
+
+/** 删除项目阶段计划行 */
+const handleDeletePlanStage = (index: number) => {
+  planStageList.value.splice(index, 1);
+  // 重新排序
+  planStageList.value.forEach((item, idx) => {
+    item.sortOrder = idx + 1;
+  });
+};
+</script>
+
+<style scoped lang="scss">
+.card-title {
+  font-weight: bold;
+  font-size: 16px;
+  color: #303133;
+}
+</style>

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

@@ -0,0 +1,411 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="mb-[10px]">
+                <el-card shadow="hover">
+                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
+                                    <el-form-item label="合同ID" prop="contractId">
+                                        <el-input v-model="queryParams.contractId" placeholder="请输入合同ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="回款阶段ID" prop="paymentStageId">
+                                        <el-input v-model="queryParams.paymentStageId" placeholder="请输入回款阶段ID" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="阶段名称" prop="stageName">
+                                        <el-input v-model="queryParams.stageName" placeholder="请输入阶段名称" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="回款阶段" prop="collectionStage">
+                                        <el-select v-model="queryParams.collectionStage" placeholder="请选择回款阶段" clearable >
+                                            <el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                        </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="回款比例(%)" prop="repaymentRate">
+                                        <el-input v-model="queryParams.repaymentRate" placeholder="请输入回款比例(%)" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="预计回款日期" prop="expectRepaymentDate">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.expectRepaymentDate"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择预计回款日期"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="回款延期天数" prop="delayDay">
+                                        <el-input v-model="queryParams.delayDay" placeholder="请输入回款延期天数" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="实际回款日期" prop="actualRepaymentDate">
+                                        <el-date-picker clearable
+                                                        v-model="queryParams.actualRepaymentDate"
+                                                        type="date"
+                                                        value-format="YYYY-MM-DD"
+                                                        placeholder="请选择实际回款日期"
+                                        />
+                                    </el-form-item>
+                                    <el-form-item label="回款标识" prop="repaymentFlag">
+                                        <el-input v-model="queryParams.repaymentFlag" placeholder="请输入回款标识" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="原因说明" prop="reasonsExplanation">
+                                        <el-input v-model="queryParams.reasonsExplanation" placeholder="请输入原因说明" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="进度备注" prop="scheduleRemark">
+                                        <el-input v-model="queryParams.scheduleRemark" placeholder="请输入进度备注" clearable @keyup.enter="handleQuery" />
+                                    </el-form-item>
+                                    <el-form-item label="回款金额" prop="repaymentAmount">
+                                        <el-input v-model="queryParams.repaymentAmount" placeholder="请输入回款金额" 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>
+                            <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:contractPaymentStage: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:contractPaymentStage: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:contractPaymentStage:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:contractPaymentStage: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="contractPaymentStageList" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column label="合同回款阶段ID" align="center" prop="contractStageId" v-if="columns[0].visible"/>
+                        <el-table-column label="合同ID" align="center" prop="contractId" v-if="columns[2].visible"/>
+                        <el-table-column label="回款阶段ID" align="center" prop="paymentStageId" v-if="columns[3].visible"/>
+                        <el-table-column label="阶段名称" align="center" prop="stageName" v-if="columns[4].visible"/>
+                        <el-table-column label="回款阶段" align="center" prop="collectionStage" v-if="columns[5].visible">
+                            <template #default="scope">
+                                    <dict-tag :options="collection_stage" :value="scope.row.collectionStage"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="回款比例(%)" align="center" prop="repaymentRate" v-if="columns[6].visible"/>
+                        <el-table-column label="预计回款日期" align="center" prop="expectRepaymentDate" width="180" v-if="columns[7].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.expectRepaymentDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="回款延期天数" align="center" prop="delayDay" v-if="columns[8].visible"/>
+                        <el-table-column label="实际回款日期" align="center" prop="actualRepaymentDate" width="180" v-if="columns[9].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.actualRepaymentDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="回款标识" align="center" prop="repaymentFlag" v-if="columns[10].visible"/>
+                        <el-table-column label="原因说明" align="center" prop="reasonsExplanation" v-if="columns[11].visible"/>
+                        <el-table-column label="进度备注" align="center" prop="scheduleRemark" v-if="columns[12].visible"/>
+                        <el-table-column label="回款金额" align="center" prop="repaymentAmount" v-if="columns[13].visible"/>
+                        <el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[14].visible"/>
+                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[15].visible"/>
+                        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[17].visible"/>
+                        <el-table-column label="创建者" align="center" prop="createBy" v-if="columns[18].visible"/>
+                        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[19].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="更新者" align="center" prop="updateBy" v-if="columns[20].visible"/>
+                        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[21].visible">
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </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:contractPaymentStage: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:contractPaymentStage: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="contractPaymentStageFormRef" :model="form" :rules="rules" label-width="120px">
+                            <el-form-item label="合同ID" prop="contractId">
+                                <el-input v-model="form.contractId" placeholder="请输入合同ID" />
+                            </el-form-item>
+                            <el-form-item label="回款阶段ID" prop="paymentStageId">
+                                <el-input v-model="form.paymentStageId" placeholder="请输入回款阶段ID" />
+                            </el-form-item>
+                            <el-form-item label="阶段名称" prop="stageName">
+                                <el-input v-model="form.stageName" placeholder="请输入阶段名称" />
+                            </el-form-item>
+                            <el-form-item label="回款阶段" prop="collectionStage">
+                                <el-select v-model="form.collectionStage" placeholder="请选择回款阶段">
+                                    <el-option
+                                        v-for="dict in collection_stage"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="回款比例(%)" prop="repaymentRate">
+                                <el-input v-model="form.repaymentRate" placeholder="请输入回款比例(%)" />
+                            </el-form-item>
+                            <el-form-item label="预计回款日期" prop="expectRepaymentDate">
+                                <el-date-picker clearable
+                                                v-model="form.expectRepaymentDate"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择预计回款日期">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="回款延期天数" prop="delayDay">
+                                <el-input v-model="form.delayDay" placeholder="请输入回款延期天数" />
+                            </el-form-item>
+                            <el-form-item label="实际回款日期" prop="actualRepaymentDate">
+                                <el-date-picker clearable
+                                                v-model="form.actualRepaymentDate"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择实际回款日期">
+                                </el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="回款标识" prop="repaymentFlag">
+                                <el-input v-model="form.repaymentFlag" placeholder="请输入回款标识" />
+                            </el-form-item>
+                            <el-form-item label="原因说明" prop="reasonsExplanation">
+                                <el-input v-model="form.reasonsExplanation" type="textarea" placeholder="请输入内容" />
+                            </el-form-item>
+                            <el-form-item label="进度备注" prop="scheduleRemark">
+                                <el-input v-model="form.scheduleRemark" type="textarea" placeholder="请输入内容" />
+                            </el-form-item>
+                            <el-form-item label="回款金额" prop="repaymentAmount">
+                                <el-input v-model="form.repaymentAmount" placeholder="请输入回款金额" />
+                            </el-form-item>
+                            <el-form-item label="排序号" prop="sortOrder">
+                                <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+                            </el-form-item>
+                            <el-form-item label="备注" prop="remark">
+                                <el-input v-model="form.remark" type="textarea" 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="ContractPaymentStage" lang="ts">
+    import { listContractPaymentStage, getContractPaymentStage, delContractPaymentStage, addContractPaymentStage, updateContractPaymentStage } from '@/api/oa/erp/contractPaymentStage';
+    import { ContractPaymentStageVO, ContractPaymentStageQuery, ContractPaymentStageForm } from '@/api/oa/erp/contractPaymentStage/types';
+
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+        const { collection_stage } = toRefs<any>(proxy?.useDict('collection_stage'));
+
+    const contractPaymentStageList = ref<ContractPaymentStageVO[]>([]);
+    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 contractPaymentStageFormRef = ref<ElFormInstance>();
+
+    const dialog = reactive<DialogOption>({
+        visible: false,
+        title: ''
+    });
+
+    // 列显隐信息
+    const columns = ref<FieldOption[]>([
+            { key: 0, label: `合同回款阶段ID`, visible: true },
+            { key: 1, label: `租户编号`, visible: true },
+            { key: 2, label: `合同ID`, visible: true },
+            { key: 3, label: `回款阶段ID`, visible: true },
+            { key: 4, label: `阶段名称`, visible: true },
+            { key: 5, label: `回款阶段`, visible: true },
+            { key: 6, label: `回款比例(%)`, visible: true },
+            { key: 7, label: `预计回款日期`, visible: true },
+            { key: 8, label: `回款延期天数`, visible: true },
+            { key: 9, label: `实际回款日期`, visible: true },
+            { key: 10, label: `回款标识`, visible: true },
+            { key: 11, label: `原因说明`, visible: true },
+            { key: 12, label: `进度备注`, visible: true },
+            { key: 13, label: `回款金额`, visible: true },
+            { key: 14, label: `排序号`, visible: true },
+            { key: 15, label: `备注`, visible: true },
+            { key: 16, label: `删除标志`, visible: true },
+            { key: 17, label: `创建部门`, visible: true },
+            { key: 18, label: `创建者`, visible: true },
+            { key: 19, label: `创建时间`, visible: true },
+            { key: 20, label: `更新者`, visible: true },
+            { key: 21, label: `更新时间`, visible: true },
+    ]);
+
+    const initFormData: ContractPaymentStageForm = {
+                        contractStageId: undefined,
+                        contractId: undefined,
+                        paymentStageId: undefined,
+                        stageName: undefined,
+                        collectionStage: undefined,
+                        repaymentRate: undefined,
+                        expectRepaymentDate: undefined,
+                        delayDay: undefined,
+                        actualRepaymentDate: undefined,
+                        repaymentFlag: undefined,
+                        reasonsExplanation: undefined,
+                        scheduleRemark: undefined,
+                        repaymentAmount: undefined,
+                        sortOrder: undefined,
+                        remark: undefined,
+    }
+    const data = reactive<PageData<ContractPaymentStageForm, ContractPaymentStageQuery>>({
+        form: {...initFormData},
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+                            contractId: undefined,
+                            paymentStageId: undefined,
+                            stageName: undefined,
+                            collectionStage: undefined,
+                            repaymentRate: undefined,
+                            expectRepaymentDate: undefined,
+                            delayDay: undefined,
+                            actualRepaymentDate: undefined,
+                            repaymentFlag: undefined,
+                            reasonsExplanation: undefined,
+                            scheduleRemark: undefined,
+                            repaymentAmount: undefined,
+                            sortOrder: undefined,
+            params: {
+            }
+        },
+        rules: {
+                            contractStageId: [
+                            { required: true, message: "合同回款阶段ID不能为空", trigger: "blur" }
+                        ],
+                            contractId: [
+                            { required: true, message: "合同ID不能为空", trigger: "blur" }
+                        ],
+                            paymentStageId: [
+                            { required: true, message: "回款阶段ID不能为空", trigger: "blur" }
+                        ],
+        }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询合同回款阶段列表 */
+    const getList = async () => {
+        loading.value = true;
+        const res = await listContractPaymentStage(queryParams.value);
+            contractPaymentStageList.value = res.rows;
+        total.value = res.total;
+        loading.value = false;
+    }
+
+    /** 取消按钮 */
+    const cancel = () => {
+        reset();
+        dialog.visible = false;
+    }
+
+    /** 表单重置 */
+    const reset = () => {
+        form.value = {...initFormData};
+            contractPaymentStageFormRef.value?.resetFields();
+    }
+
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        queryFormRef.value?.resetFields();
+        handleQuery();
+    }
+
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: ContractPaymentStageVO[]) => {
+        ids.value = selection.map(item => item.contractStageId);
+        single.value = selection.length != 1;
+        multiple.value = !selection.length;
+    }
+
+    /** 新增按钮操作 */
+    const handleAdd = () => {
+        reset();
+        dialog.visible = true;
+        dialog.title = "添加合同回款阶段";
+    }
+
+    /** 修改按钮操作 */
+    const handleUpdate = async (row?: ContractPaymentStageVO) => {
+        reset();
+        const _contractStageId = row?.contractStageId || ids.value[0]
+        const res = await getContractPaymentStage(_contractStageId);
+        Object.assign(form.value, res.data);
+        dialog.visible = true;
+        dialog.title = "修改合同回款阶段";
+    }
+
+    /** 提交按钮 */
+    const submitForm = () => {
+            contractPaymentStageFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                buttonLoading.value = true;
+                if (form.value.contractStageId) {
+                    await updateContractPaymentStage(form.value).finally(() =>  buttonLoading.value = false);
+                } else {
+                    await addContractPaymentStage(form.value).finally(() =>  buttonLoading.value = false);
+                }
+                proxy?.$modal.msgSuccess("操作成功");
+                dialog.visible = false;
+                await getList();
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: ContractPaymentStageVO) => {
+        const _contractStageIds = row?.contractStageId || ids.value;
+        await proxy?.$modal.confirm('是否确认删除合同回款阶段编号为"' + _contractStageIds + '"的数据项？').finally(() => loading.value = false);
+        await delContractPaymentStage(_contractStageIds);
+        proxy?.$modal.msgSuccess("删除成功");
+        await getList();
+    }
+
+    /** 导出按钮操作 */
+    const handleExport = () => {
+        proxy?.download('oa/erp/contractPaymentStage/export', {
+            ...queryParams.value
+        }, `contractPaymentStage_${new Date().getTime()}.xlsx`)
+    }
+
+    onMounted(() => {
+        getList();
+    });
+</script>