yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.78 合同激活页面（多个项目分金额）添加项目标识（可生成项目或选择项目【睿原审批】）

Browse Source
dev
yinq 5 days ago
parent 6da9914114
commit a04734f361
3 changed files with 476 additions and 134 deletions
Show Stats Download Patch File Download Diff File

26
src/api/oa/erp/projectContracts/types.ts
Unescape Escape View File

@ -29,6 +29,16 @@ export interface ProjectContractsVO {
*/
activeFlag: string;
/**
* 项目来源（1新增项目 0选择已有项目）
*/
projectSource?: string;
/**
* 项目编号
*/
projectCode?: string;
/**
* 项目名称
*/
@ -49,6 +59,22 @@ export interface ProjectContractsVO {
*/
totalPrice?: number;
/**
* 部门名称
*/
deptName?: string;
/**
* 项目经理名称
*/
managerName?: string;
/**
* 项目金额
*/
amount?: number;
projectCategory?: string;
/**
* 业务方向
*/

582
src/views/oa/erp/contractInfo/orderActivate.vue
Unescape Escape View File

@ -13,6 +13,42 @@
/>
</el-card>
<!-- 关联项目（erp_project_contracts） -->
<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="!isFormDisabled">
<el-button type="primary" plain icon="Plus" @click="handleAddProject" size="small">新增项目</el-button>
</el-col>
<el-col :span="1.5" v-if="!isFormDisabled">
<el-button type="success" plain icon="Select" @click="handleSelectExistProject" size="small">选择已有项目</el-button>
</el-col>
</el-row>
</template>
<el-table v-loading="projectListLoading" border :data="projectList" max-height="320">
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="项目来源" align="center" prop="projectSource" min-width="100">
<template #default="scope">
<dict-tag :options="project_source" :value="scope.row.projectSource" />
</template>
</el-table-column>
<el-table-column label="项目编号" align="center" prop="projectCode" min-width="120" />
<el-table-column label="项目名称" align="center" prop="projectName" min-width="160" show-overflow-tooltip />
<el-table-column label="部门" align="center" prop="deptName" min-width="140" />
<el-table-column label="项目经理" align="center" prop="managerName" min-width="120" />
<el-table-column label="金额" align="center" prop="amount" min-width="120"/>
<el-table-column label="操作" width="80" align="center" fixed="right" v-if="!isFormDisabled">
<template #default="scope">
<el-button type="danger" link icon="Delete" @click="handleRemoveProject(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card shadow="never" style="margin-top: 0">
<el-form ref="projectInfoFormRef" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="20">
@ -274,6 +310,99 @@
</el-table>
</el-card>
<!-- 新增项目弹窗 -->
<el-dialog title="新增项目" v-model="addProjectDialog.visible" width="800px" append-to-body destroy-on-close @close="resetAddProjectForm">
<el-form ref="addProjectFormRef" :model="addProjectForm" :rules="addProjectRules" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="项目编号" prop="projectCode">
<el-input v-model="addProjectForm.projectCode" placeholder="请输入项目编号">
<template #append>
<el-button type="primary" @click="generateAddProjectCode" :disabled="addProjectCodeGenerated">生成</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="addProjectForm.projectName" placeholder="请输入项目名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目类别" prop="projectCategory">
<el-select v-model="addProjectForm.projectCategory" placeholder="请选择项目类别" style="width: 100%">
<el-option
v-for="dict in project_category"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门" prop="deptId">
<el-select v-model="addProjectForm.deptId" placeholder="请选择部门" style="width: 100%">
<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="addProjectForm.managerId" placeholder="请选择项目经理" style="width: 100%" 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="addProjectForm.chargeId" placeholder="请选择部门负责人" style="width: 100%" clearable filterable>
<el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分管副总" prop="deputyId">
<el-select v-model="addProjectForm.deputyId" placeholder="请选择分管副总" style="width: 100%" clearable filterable>
<el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="抄送人员" prop="peopleId">
<el-select v-model="addProjectForm.peopleId" placeholder="请选择抄送人员" style="width: 100%" 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="addProjectForm.amount" placeholder="请输入金额" style="width: 100%">
<template #append>元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="addProjectForm.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button type="primary" @click="submitAddProject" :loading="addProjectSubmitLoading">确 定</el-button>
<el-button @click="addProjectDialog.visible = false">取 消</el-button>
</template>
</el-dialog>
<!-- 选择已有项目（使用 ProjectSelect 组件） projectStatus: '3' -->
<ProjectSelect
ref="projectSelectRef"
:multiple="true"
:default-query-params="{}"
@confirm-call-back="projectSelectCallback"
/>
<!-- 提交审批组件 -->
<submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
<!-- 审批记录 -->
@ -282,9 +411,12 @@
</template>
<script setup name="ProjectInfoEdit" lang="ts">
import { getErpProjectInfoList, getProjectInfo, listProjectInfo } from '@/api/oa/erp/projectInfo';
import { getErpProjectInfoList, getProjectInfo } from '@/api/oa/erp/projectInfo';
import { saveContractOrder, updateContractOrder, submitContractOrderAndFlowStart } from '@/api/oa/erp/contractOrder';
import { ProjectInfoForm } from '@/api/oa/erp/projectInfo/types';
import { ProjectInfoForm, ProjectInfoVO } from '@/api/oa/erp/projectInfo/types';
import { getErpProjectContractsList } from '@/api/oa/erp/projectContracts';
import { ProjectContractsVO } from '@/api/oa/erp/projectContracts/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';
@ -296,6 +428,7 @@ 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 type { FormInstance } from 'element-plus';
import { getErpProjectPlanStageList, listErpProjectPlanStage } from '@/api/oa/erp/erpProjectPlanStage';
import { ErpProjectPlanStageForm, ErpProjectPlanStageQuery } from '@/api/oa/erp/erpProjectPlanStage/types';
import { listContractInfo, getContractInfo } from '@/api/oa/erp/contractInfo';
@ -303,48 +436,222 @@ 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';
import ProjectSelect from '@/components/ProjectSelect/index.vue';
// ---------------------------------------------------------------------------
// 常量：项目来源、提交状态
// ---------------------------------------------------------------------------
/** 项目来源：新增项目（本页创建） */
const PROJECT_SOURCE_NEW = '1';
/** 项目来源：选择已有项目 */
const PROJECT_SOURCE_EXIST = '0';
/** 提交状态：暂存 */
const SUBMIT_STATUS_DRAFT = 'draft';
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 { business_direction, project_status, contract_flag, project_category, spare_flag, contract_status, project_phases, project_source } = toRefs<any>(
proxy?.useDict('business_direction', 'project_status', 'contract_flag', 'project_category', 'spare_flag', 'contract_status', 'project_phases', 'project_source')
);
const buttonLoading = ref(false);
const projectInfoFormRef = ref<ElFormInstance>();
// 审批相关组件引用
const projectInfoFormRef = ref<FormInstance>();
const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
// 流程相关数据
const submitFormData = ref<StartProcessBo>({
businessId: '',
flowCode: '',
variables: {},
bizExt: {}
});
// 任务变量
const submitFormData = ref<StartProcessBo>({ businessId: '', flowCode: '', variables: {}, bizExt: {} });
const taskVariables = ref<Record<string, any>>({});
const flowInstanceBizExtBo = ref<Record<string, any>>({});
// 项目编号生成状态
const isCodeGenerated = ref(false);
/** 查询部门信息下拉框结构 */
// ---------------------------------------------------------------------------
// 关联项目（erp_project_contracts）：列表、新增弹窗、选择已有项目弹窗
// ---------------------------------------------------------------------------
/** 关联项目行类型：projectSource 区分新增/已有；_projectForm 仅新增项目暂存时的表单快照 */
type ProjectRow = ProjectContractsVO & { _projectForm?: any };
const projectList = ref<ProjectRow[]>([]);
const projectListLoading = ref(false);
// ----- 新增项目弹窗 -----
const addProjectDialog = reactive({ visible: false });
const addProjectFormRef = ref<FormInstance>();
const addProjectCodeGenerated = ref(false);
const addProjectSubmitLoading = ref(false);
const addProjectForm = reactive<Record<string, any>>({
projectCode: undefined,
projectName: undefined,
projectCategory: undefined,
deptId: undefined,
managerId: undefined,
chargeId: undefined,
deputyId: undefined,
peopleId: undefined,
amount: undefined,
remark: undefined
});
const addProjectRules = {
projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
projectCategory: [{ required: true, message: '项目类别不能为空', trigger: 'change' }],
deptId: [{ required: true, message: '部门不能为空', trigger: 'change' }],
managerId: [{ required: true, message: '项目经理不能为空', trigger: 'change' }]
};
const generateAddProjectCode = async () => {
if (addProjectCodeGenerated.value) return;
try {
const codeRuleCode = CodeRuleEnum.PROJECT;
const res = await getRuleGenerateCode({ codeRuleCode } as any);
addProjectForm.projectCode = res.msg;
addProjectCodeGenerated.value = true;
proxy?.$modal.msgSuccess('项目编号生成成功');
} catch (e) {
console.error(e);
proxy?.$modal.msgError('生成项目编号失败');
}
};
const resetAddProjectForm = () => {
addProjectForm.projectCode = undefined;
addProjectForm.projectName = undefined;
addProjectForm.projectCategory = undefined;
addProjectForm.deptId = undefined;
addProjectForm.managerId = undefined;
addProjectForm.chargeId = undefined;
addProjectForm.deputyId = undefined;
addProjectForm.peopleId = undefined;
addProjectForm.amount = undefined;
addProjectForm.remark = undefined;
addProjectCodeGenerated.value = false;
};
/** 新增项目确定：校验后加入 projectList（projectSource=新增），提交时由 submitForm 统一保存 */
const submitAddProject = () => {
addProjectFormRef.value?.validate((valid: boolean) => {
if (!valid) return;
const dept = deptInfoList.value.find((d: any) => d.deptId === addProjectForm.deptId);
const manager = userList.value.find((u: any) => u.userId === addProjectForm.managerId);
const row: ProjectRow = {
projectContractsId: undefined as any,
projectId: undefined as any,
contractId: form.value.contractId as any,
sortOrder: projectList.value.length + 1,
remark: addProjectForm.remark,
activeFlag: '1',
projectCode: addProjectForm.projectCode,
projectName: addProjectForm.projectName,
deptName: dept ? dept.deptName : undefined,
managerName: manager ? manager.nickName : undefined,
amount: addProjectForm.amount as any,
projectCategory: addProjectForm.projectCategory,
projectSource: PROJECT_SOURCE_NEW,
_projectForm: { ...addProjectForm }
};
projectList.value.push(row);
addProjectDialog.visible = false;
proxy?.$modal.msgSuccess('已添加到待保存列表，请在提交时一并保存');
});
};
const handleAddProject = () => {
resetAddProjectForm();
addProjectDialog.visible = true;
};
/** 删除关联项目：从列表中移除（未保存的仅前端移除；已保存的由提交时新列表覆盖） */
const handleRemoveProject = async (row: ProjectRow) => {
try {
await proxy?.$modal.confirm('是否确认删除该关联项目？');
const index = projectList.value.indexOf(row);
if (index > -1) {
projectList.value.splice(index, 1);
}
} catch (e) {
if (e !== 'cancel') console.error(e);
}
};
/** 按合同加载关联项目列表，projectSource 由后端返回 */
const loadProjectContractsList = async () => {
const contractId = form.value.contractId;
if (!contractId) {
projectList.value = [];
return;
}
projectListLoading.value = true;
try {
const res = await getErpProjectContractsList({ contractId } as any);
projectList.value = (res.data || []).map((item: ProjectContractsVO) => ({ ...(item as any) }));
} catch (e) {
console.error(e);
projectList.value = [];
} finally {
projectListLoading.value = false;
}
};
// ----- 选择已有项目（ProjectSelect 组件） -----
const projectSelectRef = ref<InstanceType<typeof ProjectSelect>>();
/** 打开选择已有项目弹窗 */
const handleSelectExistProject = () => {
const contractId = form.value.contractId;
if (!contractId) {
proxy?.$modal.msgWarning('请先选择合同');
return;
}
projectSelectRef.value?.open();
};
/** ProjectSelect 确定回调：将选中项加入 projectList（projectSource=已有），提交时统一保存 */
const projectSelectCallback = (selectedProjects: ProjectInfoVO[]) => {
if (!selectedProjects || selectedProjects.length === 0) return;
const contractId = form.value.contractId;
if (!contractId) {
proxy?.$modal.msgWarning('请先选择合同');
return;
}
const existIds = projectList.value.map((p) => p.projectId);
let added = 0;
selectedProjects.forEach((p) => {
if (existIds.includes(p.projectId)) return;
const row: ProjectRow = {
projectContractsId: undefined as any,
projectId: p.projectId as any,
contractId: contractId as any,
sortOrder: projectList.value.length + added + 1,
remark: '',
activeFlag: '1',
projectCode: p.projectCode,
projectName: p.projectName,
deptName: p.deptName,
managerName: p.managerName,
amount: p.amount as any,
projectSource: PROJECT_SOURCE_EXIST
};
projectList.value.push(row);
existIds.push(p.projectId);
added++;
});
proxy?.$modal.msgSuccess(added > 0 ? '已添加到待保存列表' : '所选项目已在列表中');
};
// ---------------------------------------------------------------------------
// 下拉与字典：部门、用户、回款阶段、项目类型
// ---------------------------------------------------------------------------
const deptInfoList = ref([]);
const getDeptInfoListSelect = async () => {
const params = { deptCategory: '03' } as any;
let res = await allListDept(params);
const res = await allListDept(params);
deptInfoList.value = res.data;
};
/** 查询用户列表 */
const userList = ref([]);
const getUserList = async () => {
const params: UserQuery = { pageNum: 1, pageSize: 9999 };
@ -352,7 +659,6 @@ const getUserList = async () => {
userList.value = res.rows;
};
/** 查询回款阶段列表 */
const paymentStageList = ref<PaymentStageVO[]>([]);
const getPaymentStageList = async () => {
try {
@ -368,17 +674,16 @@ const getPaymentStageList = async () => {
};
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);
// 保存原始数据用于查找
const res = await listProjectType({} as any);
projectTypeList.value = res.data || [];
projectTypeOptions.value = proxy?.handleTree<ProjectTypeVO>(res.data, 'projectTypeId', 'parentId') || [];
};
// ---------------------------------------------------------------------------
// 主表单：合同订单（项目）信息、校验规则、计算属性
// ---------------------------------------------------------------------------
type ProjectInfoFormEx = ProjectInfoForm & {
flowCode?: string;
variables?: any;
@ -386,6 +691,7 @@ type ProjectInfoFormEx = ProjectInfoForm & {
contractCode?: string;
contractName?: string;
planStageList?: ErpProjectPlanStageForm[];
projectContractsList?: any[];
};
const initFormData: ProjectInfoFormEx = {
@ -428,18 +734,17 @@ const data = reactive<{ form: ProjectInfoFormEx; rules: any }>({
projectTypeId: [{ required: true, message: '订单类型不能为空', trigger: 'change' }],
deptId: [{ required: true, message: '部门不能为空', trigger: 'change' }],
managerId: [{ required: true, message: '项目经理不能为空', trigger: 'change' }],
peopleId: [{ required: true, message: '抄送人员不能为空', trigger: 'change' }],
ossId: [{ required: true, message: '请上传终版合同', trigger: 'change' }]
}
});
const { form, rules } = toRefs(data);
// 判断表单是否禁用（查看或审批模式）
const isFormDisabled = computed(() => {
return routeParams.value.type === 'view' || routeParams.value.type === 'approval';
});
/** 是否禁用表单（查看/审批模式） */
const isFormDisabled = computed(() => routeParams.value.type === 'view' || routeParams.value.type === 'approval');
// 附件ID字符串转换（用于FileUpload组件）
/** 附件 ID 与字符串双向转换（供 FileUpload 使用） */
const ossIdString = computed({
get() {
const v = form.value.ossId as any;
@ -450,92 +755,103 @@ const ossIdString = computed({
}
});
//返回
const goBack = () => {
proxy.$tab.closePage(proxy.$route);
proxy.$router.go(-1);
proxy.$tab.closePage(route);
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,
contractManagerId: submitData.peopleId
};
// 流程实例业务扩展字段
submitData.bizExt = {
businessTitle: '合同订单激活'
};
submitData.projectStatus = '3';
submitData.flowStatus = 'finish';
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;
/**
* 将关联项目行转为提交给后端的 DTO（含 projectSource，新增项目时带 _projectForm 字段）
*/
function buildProjectContractsPayload(row: ProjectRow, index: number): Record<string, any> {
const isNewProject = row.projectSource === PROJECT_SOURCE_NEW;
const base: Record<string, any> = {
projectContractsId: row.projectContractsId,
projectId: row.projectId,
projectCategory: row.projectCategory,
spareFlag: row.projectCategory === ProjectCategoryEnum.SALE_SPARE ? '1' : '0',
contractId: form.value.contractId,
sortOrder: row.sortOrder ?? index + 1,
remark: row.remark,
activeFlag: row.activeFlag ?? '1',
projectSource: isNewProject ? PROJECT_SOURCE_NEW : PROJECT_SOURCE_EXIST
};
if (isNewProject && row._projectForm) {
const pf = row._projectForm;
base.projectCode = pf.projectCode;
base.projectName = pf.projectName;
base.deptId = pf.deptId;
base.managerId = pf.managerId;
base.chargeId = pf.chargeId;
base.deputyId = pf.deputyId;
base.peopleId = Array.isArray(pf.peopleId) && pf.peopleId.length > 0 ? pf.peopleId.join(',') : pf.peopleId;
base.amount = pf.amount;
}
return base;
}
/** 抄送人员：数组转逗号分隔字符串（提交用），非数组原样返回 */
function normalizePeopleId(value: string | string[] | number | undefined): string | number | undefined {
return Array.isArray(value) ? value.join(',') : value;
}
/** 提交按钮：暂存走 save/update，正式提交走 submitContractOrderAndFlowStart，关联项目一并提交 */
const submitForm = (status: string, mode: boolean) => {
projectInfoFormRef.value?.validate(async (valid: boolean) => {
if (!valid) return;
const isDraft = status === SUBMIT_STATUS_DRAFT;
buttonLoading.value = true;
try {
const submitData = { ...form.value };
submitData.peopleId = normalizePeopleId(submitData.peopleId);
submitData.planStageList = planStageList.value.map((item) => ({ ...item, projectId: form.value.projectId }));
submitData.projectContractsList = projectList.value.map((row, index) => buildProjectContractsPayload(row, index));
if (isDraft) {
submitData.projectStatus = '1';
submitData.flowStatus = 'draft';
if (submitData.projectId) {
await updateContractOrder(submitData);
} else {
await saveContractOrder(submitData);
}
} else {
// 是否有关联“选择已有项目”（仅走合同订单提交流程，不走 xzxm）
const hasExistProject = projectList.value.some((row) => row.projectSource === PROJECT_SOURCE_EXIST);
submitData.flowCode = FlowCodeEnum.CONTRACT_ORDER_KEY;
submitData.variables = {
projectId: submitData.projectId,
projectCode: submitData.projectCode,
projectName: submitData.projectName,
contractManagerId: submitData.peopleId,
hasExistProject
};
submitData.bizExt = { businessTitle: '合同订单激活' };
// 有关联“选择已有项目”时主订单为审批中(2)、待办(waiting)，否则为可用(3)、完成(finish)
submitData.projectStatus = hasExistProject ? '2' : '3';
submitData.flowStatus = hasExistProject ? 'waiting' : 'finish';
const res = await submitContractOrderAndFlowStart(submitData);
if (res?.data) form.value = res.data;
}
proxy?.$modal.msgSuccess(isDraft ? '暂存成功' : '操作成功');
proxy?.$tab.closePage();
router.go(-1);
} catch (e) {
console.error(e);
} finally {
buttonLoading.value = false;
}
});
};
//初始化调用
// ---------------------------------------------------------------------------
// 数据加载：合同信息、关联项目、项目阶段计划
// ---------------------------------------------------------------------------
const loadSelectOptions = async () => {
await getUserList();
await getDeptInfoListSelect();
await getPaymentStageList();
await Promise.all([getUserList(), getDeptInfoListSelect(), getPaymentStageList()]);
};
/** 查询合同信息并赋值相关字段 */
/** 根据路由 contractId 加载合同信息并回填表单；有项目则加载主项目+阶段+关联项目，无则从合同带出 */
const loadContractInfo = async () => {
const contractId = routeParams.value.contractId as string | number;
if (contractId) {
@ -543,19 +859,15 @@ const loadContractInfo = async () => {
// 先通过 contractId 查询项目
const projectRes = await getErpProjectInfoList({ contractId: contractId } as any);
if (projectRes.data && projectRes.data.length > 0) {
// 如果查出项目，则进行 form 赋值
const projectData = projectRes.data[0];
// 合同订单主数据：取第一个项目赋值 form
const projectData = (projectRes.data as any[])[0];
if (projectData.flowStatus === 'finish') {
routeParams.value.type = 'view';
}
Object.assign(form.value, projectData);
// 将抄送人员字符串转换为数组，用于多选下拉框显示
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;
form.value.peopleId = (form.value.peopleId as string).split(',').map((id) => String(id.trim())) as any;
}
// 查询项目阶段计划列表
await getPlanStageList();
} else {
// 如果没有查询到项目，则查询合同信息并赋值相关字段
@ -612,38 +924,38 @@ const loadContractInfo = async () => {
}
}
}
// 关联项目列表从 erp_project_contracts 加载（form.contractId 已在上面分支中设置）
await loadProjectContractsList();
} 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 isEditMode = id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval');
if (isEditMode) {
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;
form.value.peopleId = (form.value.peopleId as string).split(',').map((id) => String(id.trim())) as any;
}
// 加载项目阶段计划列表
await getPlanStageList();
await loadProjectContractsList();
} else {
// 新增模式，初始化空列表
planStageList.value = [];
try {
// 新增，查询合同信息并赋值业务方向
await loadContractInfo();
} catch (error) {
console.error('获取用户信息失败:', error);
console.error('获取合同信息失败:', error);
}
}
await getProjectTypeList();
@ -651,26 +963,24 @@ onMounted(async () => {
});
});
// 审批记录
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 = [];
@ -746,4 +1056,10 @@ const handleDeletePlanStage = (index: number) => {
font-size: 16px;
color: #303133;
}
.empty-tip {
padding: 16px;
color: #909399;
font-size: 14px;
text-align: center;
}
</style>

2
src/views/oa/erp/projectInfo/edit.vue
Unescape Escape View File

@ -457,7 +457,7 @@ const submitForm = (status: string, mode: boolean) => {
};
// 流程实例业务扩展字段
submitData.bizExt = {
businessTitle: '市场项目审批',
businessTitle: submitData.projectName + '市场项目审批',
businessCode: submitData.projectCode
};
submitData.projectStatus = '2';

Write Preview
Loading…
Cancel
Save