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

1.0.29 市场项目审批流程

Browse Source
dev
yinq 1 month ago
parent cc7fcb20d8
commit 4d4ef160d4
3 changed files with 94 additions and 69 deletions
Show Stats Download Patch File Download Diff File

7
src/views/oa/erp/contractInfo/index.vue
Unescape Escape View File

@ -163,18 +163,15 @@
</el-table-column> </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="150" fixed="right" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="查看" placement="top" v-if="scope.row.contractStatus !== '1'"> <el-tooltip content="查看详情" placement="top" v-if="scope.row.contractStatus !== '1'">
<el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button> <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="查看合同" placement="top" v-if="scope.row.contractStatus !== '1'"> <el-tooltip content="导出合同" placement="top" v-if=" scope.row.templateId != null">
<el-button link type="info" icon="Reading" @click="contractView(scope.row)"></el-button> <el-button link type="info" icon="Reading" @click="contractView(scope.row)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="修改" placement="top" v-if="scope.row.contractStatus === '1'"> <el-tooltip content="修改" placement="top" v-if="scope.row.contractStatus === '1'">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:contractInfo:edit']"></el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:contractInfo:edit']"></el-button>
</el-tooltip> </el-tooltip>
<!-- <el-tooltip content="删除" placement="top">-->
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/erp:contractInfo:remove']"></el-button>-->
<!-- </el-tooltip>-->
<el-tooltip content="审批记录" placement="top" v-if="scope.row.contractStatus === '2' || scope.row.contractStatus === '3'"> <el-tooltip content="审批记录" placement="top" v-if="scope.row.contractStatus === '2' || scope.row.contractStatus === '3'">
<el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></el-button> <el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></el-button>
</el-tooltip> </el-tooltip>

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

@ -1,6 +1,6 @@
<template> <template>
<div class="p-2"> <div class="p-2">
<el-card shadow="never"> <el-card shadow="never" style="margin-top: 0">
<!-- 审批按钮组件 --> <!-- 审批按钮组件 -->
<approvalButton <approvalButton
@submitForm="submitForm" @submitForm="submitForm"
@ -14,8 +14,8 @@
/> />
</el-card> </el-card>
<el-card shadow="never" style="margin-top: 20px"> <el-card shadow="never" style="margin-top: 0">
<el-form ref="projectInfoFormRef" :model="form" :disabled="routeParams.type === 'view'" :rules="rules" label-width="120px"> <el-form ref="projectInfoFormRef" :model="form" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" :rules="rules" label-width="120px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="有无合同" prop="contractFlag"> <el-form-item label="有无合同" prop="contractFlag">
@ -66,8 +66,6 @@
:options="projectTypeOptions" :options="projectTypeOptions"
:props="{ value: 'projectTypeId', label: 'typeName', children: 'children', emitPath: false }" :props="{ value: 'projectTypeId', label: 'typeName', children: 'children', emitPath: false }"
placeholder="请选择项目类型" placeholder="请选择项目类型"
clearable
filterable
style="width: 100%" style="width: 100%"
/> />
</el-form-item> </el-form-item>
@ -119,13 +117,13 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="项目状态" prop="projectStatus"> <!-- <el-form-item label="项目状态" prop="projectStatus">-->
<el-radio-group v-model="form.projectStatus" disabled> <!-- <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 v-for="dict in project_status" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
@ -136,14 +134,14 @@
</el-card> </el-card>
<!-- 项目关联合同 --> <!-- 项目关联合同 -->
<el-card shadow="never" style="margin-top: 20px" v-if="form.projectId && routeParams.type !== 'add'"> <el-card shadow="never" style="margin-top: 0">
<template #header> <template #header>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="1.5"> <el-col :span="1.5">
<span class="card-title">项目关联合同</span> <span class="card-title">项目关联合同</span>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAddContract" size="small" :disabled="routeParams.type === 'view'" <el-button type="primary" plain icon="Plus" @click="handleAddContract" size="small" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
>新增关联 >新增关联
</el-button> </el-button>
</el-col> </el-col>
@ -268,11 +266,12 @@ import { listProjectType } from '@/api/oa/erp/projectType';
import { ProjectTypeVO } from '@/api/oa/erp/projectType/types'; import { ProjectTypeVO } from '@/api/oa/erp/projectType/types';
import { listUser } from '@/api/system/user'; import { listUser } from '@/api/system/user';
import { UserQuery } from '@/api/system/user/types'; import { UserQuery } from '@/api/system/user/types';
import { CodeRuleEnum, ProjectCategoryEnum } from '@/enums/OAEnum'; import { CodeRuleEnum, FlowCodeEnum, ProjectCategoryEnum } from '@/enums/OAEnum';
import { listProjectContracts, addProjectContracts, delProjectContracts, getErpProjectContractsList } from '@/api/oa/erp/projectContracts'; import { listProjectContracts, addProjectContracts, delProjectContracts, getErpProjectContractsList } from '@/api/oa/erp/projectContracts';
import { ProjectContractsForm, ProjectContractsQuery } from '@/api/oa/erp/projectContracts/types'; import { ProjectContractsForm, ProjectContractsQuery } from '@/api/oa/erp/projectContracts/types';
import { listContractInfo } from '@/api/oa/erp/contractInfo'; import { listContractInfo } from '@/api/oa/erp/contractInfo';
import { ContractInfoVO, ContractInfoQuery } from '@/api/oa/erp/contractInfo/types'; import { ContractInfoVO, ContractInfoQuery } from '@/api/oa/erp/contractInfo/types';
import { getInfo } from '@/api/login';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute(); const route = useRoute();
@ -294,7 +293,7 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
// 流程相关数据 // 流程相关数据
const submitFormData = ref<StartProcessBo>({ const submitFormData = ref<StartProcessBo>({
businessId: '', businessId: '',
flowCode: 'OAP', // 项目流程编码 flowCode: '',
variables: {}, variables: {},
bizExt: {} bizExt: {}
}); });
@ -323,11 +322,14 @@ const getUserList = async () => {
}; };
const projectTypeOptions = ref<ProjectTypeVO[]>([]); const projectTypeOptions = ref<ProjectTypeVO[]>([]);
// 保存原始的项目类型列表（扁平结构），用于查找 parentId
const projectTypeList = ref<ProjectTypeVO[]>([]);
/** 查询项目类型列表 */ /** 查询项目类型列表 */
const getProjectTypeList = async () => { const getProjectTypeList = async () => {
const params = { spareFlag: form.value.spareFlag } as any; const params = { spareFlag: form.value.spareFlag } as any;
console.log(params);
const res = await listProjectType(params); const res = await listProjectType(params);
// 保存原始数据用于查找
projectTypeList.value = res.data || [];
projectTypeOptions.value = proxy?.handleTree<ProjectTypeVO>(res.data, 'projectTypeId', 'parentId') || []; projectTypeOptions.value = proxy?.handleTree<ProjectTypeVO>(res.data, 'projectTypeId', 'parentId') || [];
}; };
@ -410,12 +412,26 @@ const submitForm = (status: string, mode: boolean) => {
// 设置后端发起和不等于草稿状态 直接走流程发起 // 设置后端发起和不等于草稿状态 直接走流程发起
if (status != 'draft') { if (status != 'draft') {
// 后端发起流程模式 // 后端发起流程模式
submitData.flowCode = 'OAP'; submitData.flowCode = FlowCodeEnum.PROJECT_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 = { submitData.variables = {
projectId: submitData.projectId,
projectCode: submitData.projectCode,
projectName: submitData.projectName, projectName: submitData.projectName,
amount: submitData.amount, contractFlag: Number(submitData.contractFlag),
projectCode: submitData.projectCode projectTypeParentId: projectTypeParentId,
}; };
// 流程实例业务扩展字段 // 流程实例业务扩展字段
submitData.bizExt = { submitData.bizExt = {
@ -453,39 +469,40 @@ const submitForm = (status: string, mode: boolean) => {
}; };
// 提交申请 // 提交申请
const handleStartWorkFlow = async (data: ProjectInfoForm) => { // const handleStartWorkFlow = async (data: ProjectInfoForm) => {
try { // try {
submitFormData.value.flowCode = 'OAP'; // submitFormData.value.flowCode = 'OAP';
submitFormData.value.businessId = data.projectId; // submitFormData.value.businessId = data.projectId;
//
// 流程变量 // // 流程变量
taskVariables.value = { // taskVariables.value = {
projectId: data.projectId, // projectId: data.projectId,
projectName: data.projectName, // projectCode: data.projectCode,
amount: data.amount, // projectName: data.projectName,
projectCode: data.projectCode // amount: data.amount,
}; // contractFlag: Number(data.contractFlag)
// };
// 流程实例业务扩展字段 //
flowInstanceBizExtBo.value = { // // 流程实例业务扩展字段
businessTitle: '项目审批', // flowInstanceBizExtBo.value = {
businessCode: data.projectCode // businessTitle: '项目审批',
}; // businessCode: data.projectCode
// };
submitFormData.value.variables = taskVariables.value; //
submitFormData.value.bizExt = flowInstanceBizExtBo.value; // submitFormData.value.variables = taskVariables.value;
// submitFormData.value.bizExt = flowInstanceBizExtBo.value;
const resp = await startWorkFlow(submitFormData.value); //
// const resp = await startWorkFlow(submitFormData.value);
if (submitVerifyRef.value) { //
buttonLoading.value = false; // if (submitVerifyRef.value) {
await submitVerifyRef.value.openDialog(resp.data.taskId); // buttonLoading.value = false;
} // await submitVerifyRef.value.openDialog(resp.data.taskId);
} finally { // }
buttonLoading.value = false; // } finally {
router.go(-1); // buttonLoading.value = false;
} // router.go(-1);
}; // }
// };
//初始化调用 //初始化调用
const loadSelectOptions = () => { const loadSelectOptions = () => {
@ -497,22 +514,18 @@ onMounted(async () => {
nextTick(async () => { nextTick(async () => {
// 获取路由参数 // 获取路由参数
routeParams.value = route.query; routeParams.value = route.query;
proxy?.$modal.loading('正在加载数据，请稍后...');
loadSelectOptions(); loadSelectOptions();
const id = routeParams.value.id as string | number; const id = routeParams.value.id as string | number;
if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) { if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
proxy?.$modal.loading('正在加载数据，请稍后...');
const res = await getProjectInfo(id); const res = await getProjectInfo(id);
Object.assign(form.value, res.data); Object.assign(form.value, res.data);
// 将抄送人员字符串转换为数组，用于多选下拉框显示 // 将抄送人员字符串转换为数组，用于多选下拉框显示
if (form.value.peopleId && typeof form.value.peopleId === 'string') { if (form.value.peopleId && typeof form.value.peopleId === 'string') {
form.value.peopleId = (form.value.peopleId as string).split(',').map((id) => { form.value.peopleId = (form.value.peopleId as string).split(',').map((id) => {
const numId = Number(id.trim()); return String(id.trim());
return isNaN(numId) ? id.trim() : numId;
}) as any; }) as any;
} }
proxy?.$modal.closeLoading();
// 编辑模式：如果已有项目编号，禁用生成按钮 // 编辑模式：如果已有项目编号，禁用生成按钮
if (form.value.projectCode) { if (form.value.projectCode) {
isCodeGenerated.value = true; isCodeGenerated.value = true;
@ -521,6 +534,20 @@ onMounted(async () => {
// 加载项目关联的合同列表 // 加载项目关联的合同列表
await getProjectContractsList(); await getProjectContractsList();
} else { } else {
// 新增模式：获取登录用户信息并自动赋值
try {
const userInfoRes = await getInfo();
const userVO = userInfoRes.data.user;
if (userInfoRes.data?.user) {
form.value.deptId = userVO.deptId;
form.value.managerId = userVO.userId;
form.value.chargeId = userVO.chargeId;
form.value.deputyId = userVO.deputyId;
}
} catch (error) {
console.error('获取用户信息失败:', error);
}
// 新增模式：如果已有项目编号，禁用生成按钮 // 新增模式：如果已有项目编号，禁用生成按钮
if (form.value.projectCode) { if (form.value.projectCode) {
isCodeGenerated.value = true; isCodeGenerated.value = true;
@ -532,6 +559,7 @@ onMounted(async () => {
} }
form.value.spareFlag = form.value.projectCategory === ProjectCategoryEnum.SALE_SPARE ? '1' : '0'; form.value.spareFlag = form.value.projectCategory === ProjectCategoryEnum.SALE_SPARE ? '1' : '0';
await getProjectTypeList(); await getProjectTypeList();
proxy?.$modal.closeLoading();
}); });
}); });
@ -578,7 +606,7 @@ const getProjectContractsList = async () => {
const params = { projectId: form.value.projectId } as any; const params = { projectId: form.value.projectId } as any;
const res = await getErpProjectContractsList(params); const res = await getErpProjectContractsList(params);
// 后端已经通过left join返回了完整的合同信息 // 后端已经通过left join返回了完整的合同信息
projectContractsList.value = res.rows || []; projectContractsList.value = res.data || [];
} catch (error) { } catch (error) {
console.error('查询项目关联合同失败:', error); console.error('查询项目关联合同失败:', error);
} finally { } finally {

8
src/views/oa/erp/projectInfo/index.vue
Unescape Escape View File

@ -93,7 +93,7 @@
<dict-tag :options="contract_flag" :value="scope.row.contractFlag" /> <dict-tag :options="contract_flag" :value="scope.row.contractFlag" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="项目编号" align="center" prop="projectCode" width="120" v-if="columns[3].visible" /> <el-table-column label="项目编号" align="center" prop="projectCode" width="130" v-if="columns[3].visible" />
<el-table-column label="项目名称" align="center" prop="projectName" width="140" v-if="columns[4].visible" /> <el-table-column label="项目名称" align="center" prop="projectName" width="140" v-if="columns[4].visible" />
<el-table-column label="业务方向" align="center" prop="businessDirection" width="100" v-if="columns[5].visible"> <el-table-column label="业务方向" align="center" prop="businessDirection" width="100" v-if="columns[5].visible">
<template #default="scope"> <template #default="scope">
@ -111,8 +111,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="项目类型" align="center" prop="typeName" width="130" v-if="columns[8].visible" /> <el-table-column label="项目类型" align="center" prop="typeName" width="130" v-if="columns[8].visible" />
<el-table-column label="付款方式" align="center" prop="paymentMethod" v-if="columns[9].visible" /> <el-table-column label="付款方式" align="center" prop="paymentMethod" width="120" v-if="columns[9].visible" />
<el-table-column label="部门" align="center" prop="deptName" v-if="columns[10].visible" /> <el-table-column label="部门" align="center" prop="deptName" width="120" v-if="columns[10].visible" />
<el-table-column label="项目经理" align="center" prop="managerName" width="100" v-if="columns[11].visible" /> <el-table-column label="项目经理" align="center" prop="managerName" width="100" v-if="columns[11].visible" />
<el-table-column label="部门负责人" align="center" prop="chargeName" width="120" v-if="columns[12].visible" /> <el-table-column label="部门负责人" align="center" prop="chargeName" width="120" v-if="columns[12].visible" />
<el-table-column label="分管副总" align="center" prop="deputyName" width="100" v-if="columns[13].visible" /> <el-table-column label="分管副总" align="center" prop="deputyName" width="100" v-if="columns[13].visible" />
@ -208,7 +208,7 @@ const columns = ref<FieldOption[]>([
{ key: 15, label: `金额`, visible: true }, { key: 15, label: `金额`, visible: true },
{ key: 16, label: `项目状态`, visible: true }, { key: 16, label: `项目状态`, visible: true },
{ key: 17, label: `流程状态`, visible: true }, { key: 17, label: `流程状态`, visible: true },
{ key: 18, label: `排序号`, visible: true }, { key: 18, label: `排序号`, visible: false },
{ key: 19, label: `合同ID(预留)`, visible: false }, { key: 19, label: `合同ID(预留)`, visible: false },
{ key: 20, label: `备注`, visible: true }, { key: 20, label: `备注`, visible: true },
{ key: 21, label: `激活标识`, visible: false }, { key: 21, label: `激活标识`, visible: false },

Write Preview
Loading…
Cancel
Save