1.1.19 项目计划添加检索条件,编辑页面项目阶段列显示优化。

dev
yinq 2 weeks ago
parent 78f21aa153
commit 50c37446bf

@ -226,6 +226,11 @@ export interface ErpProjectPlanQuery extends PageQuery {
*/ */
projectPlanCode?: string; projectPlanCode?: string;
/**
*
*/
projectCode?: string;
/** /**
* *
*/ */

@ -155,11 +155,11 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="130" >
<template #default="scope"> <template #default="scope">
<!-- 查看按钮非草稿状态显示 --> <!-- 查看按钮非草稿状态显示 -->
<el-tooltip v-if="scope.row.projectChangeStatus !== '1'" content="查看" placement="top"> <el-tooltip v-if="scope.row.projectChangeStatus !== '1'" content="查看" placement="top">
<el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button> <el-button link type="primary" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
</el-tooltip> </el-tooltip>
<!-- 修改按钮草稿驳回或撤回状态显示 --> <!-- 修改按钮草稿驳回或撤回状态显示 -->
<el-tooltip <el-tooltip
@ -174,27 +174,27 @@
<el-button link type="success" icon="Plus" @click="handleAddChange(scope.row)" v-hasPermi="['oa/erp:erpProjectChange:add']"></el-button> <el-button link type="success" icon="Plus" @click="handleAddChange(scope.row)" v-hasPermi="['oa/erp:erpProjectChange:add']"></el-button>
</el-tooltip> </el-tooltip>
<!-- 审批记录按钮审批中或完成状态显示 --> <!-- 审批记录按钮审批中或完成状态显示 -->
<el-tooltip v-if="scope.row.projectChangeStatus === '2' || scope.row.projectChangeStatus === '3'" content="审批记录" placement="top"> <!-- <el-tooltip v-if="scope.row.projectChangeStatus === '2' || scope.row.projectChangeStatus === '3'" content="审批记录" placement="top">-->
<el-button link type="info" icon="DocumentCopy" @click="handleApprovalRecord(scope.row)"></el-button> <!-- <el-button link type="info" icon="DocumentCopy" @click="handleApprovalRecord(scope.row)"></el-button>-->
</el-tooltip> <!-- </el-tooltip>-->
<!-- 历史变更记录按钮 --> <!-- 历史变更记录按钮 -->
<el-tooltip content="查看历史变更记录" placement="top"> <el-tooltip content="历史变更记录" placement="top">
<el-button link type="warning" icon="Clock" @click="handleViewHistory(scope.row)"></el-button> <el-button link type="warning" icon="Clock" @click="handleViewHistory(scope.row)"></el-button>
</el-tooltip> </el-tooltip>
<!-- 删除按钮草稿驳回或撤回状态显示 --> <!-- 删除按钮草稿驳回或撤回状态显示 -->
<el-tooltip <!-- <el-tooltip-->
v-if="scope.row.projectChangeStatus === '1' || scope.row.flowStatus === 'back' || scope.row.flowStatus === 'cancel'" <!-- v-if="scope.row.projectChangeStatus === '1' || scope.row.flowStatus === 'back' || scope.row.flowStatus === 'cancel'"-->
content="删除" <!-- content="删除"-->
placement="top" <!-- placement="top"-->
> <!-- >-->
<el-button <!-- <el-button-->
link <!-- link-->
type="danger" <!-- type="danger"-->
icon="Delete" <!-- icon="Delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['oa/erp:erpProjectChange:remove']" <!-- v-hasPermi="['oa/erp:erpProjectChange:remove']"-->
></el-button> <!-- ></el-button>-->
</el-tooltip> <!-- </el-tooltip>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

@ -65,11 +65,6 @@
<el-input v-model="selectedProjectCode" placeholder="选择项目后自动显示" disabled /> <el-input v-model="selectedProjectCode" placeholder="选择项目后自动显示" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="付款方式" prop="paymentMethod">
<el-input v-model="form.paymentMethod" placeholder="3-3-3-1" :disabled="!isBasicEditable" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="项目计划状态" prop="projectPlanStatus"> <el-form-item label="项目计划状态" prop="projectPlanStatus">
<!-- <el-select v-model="form.projectPlanStatus" placeholder="请选择项目计划状态" :disabled="!isBasicEditable"> --> <!-- <el-select v-model="form.projectPlanStatus" placeholder="请选择项目计划状态" :disabled="!isBasicEditable"> -->
@ -113,7 +108,7 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划开始时间" width="160" align="center"> <el-table-column label="计划开始日期" width="160" align="center">
<template #default="scope"> <template #default="scope">
<el-date-picker <el-date-picker
v-model="scope.row.planStartTime" v-model="scope.row.planStartTime"
@ -125,7 +120,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划结束时间" width="160" align="center"> <el-table-column label="计划结束日期" width="160" align="center">
<template #default="scope"> <template #default="scope">
<el-date-picker <el-date-picker
v-model="scope.row.planEndTime" v-model="scope.row.planEndTime"
@ -137,92 +132,92 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="回款阶段" width="180" align="center"> <!-- <el-table-column label="回款阶段" width="180" align="center">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-select <!-- <el-select-->
v-model="scope.row.paymentStageId" <!-- v-model="scope.row.paymentStageId"-->
placeholder="请选择回款阶段" <!-- placeholder="请选择回款阶段"-->
style="width: 100%" <!-- style="width: 100%"-->
filterable <!-- filterable-->
clearable <!-- clearable-->
:disabled="!isBasicEditable" <!-- :disabled="!isBasicEditable"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="stage in paymentStageOptions" <!-- v-for="stage in paymentStageOptions"-->
:key="stage.paymentStageId" <!-- :key="stage.paymentStageId"-->
:label="stage.stageName" <!-- :label="stage.stageName"-->
:value="stage.paymentStageId" <!-- :value="stage.paymentStageId"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="回款比例(%)" width="120" align="center"> <!-- <el-table-column label="回款比例(%)" width="120" align="center">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-input-number <!-- <el-input-number-->
v-model="scope.row.repaymentRate" <!-- v-model="scope.row.repaymentRate"-->
:min="0" <!-- :min="0"-->
:max="100" <!-- :max="100"-->
:precision="2" <!-- :precision="2"-->
controls-position="right" <!-- controls-position="right"-->
style="width: 100%" <!-- style="width: 100%"-->
:disabled="!isBasicEditable" <!-- :disabled="!isBasicEditable"-->
/> <!-- />-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="预计回款金额" width="140" align="center"> <!-- <el-table-column label="预计回款金额" width="140" align="center">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-input-number <!-- <el-input-number-->
v-model="scope.row.repaymentAmount" <!-- v-model="scope.row.repaymentAmount"-->
:min="0" <!-- :min="0"-->
:precision="2" <!-- :precision="2"-->
controls-position="right" <!-- controls-position="right"-->
style="width: 100%" <!-- style="width: 100%"-->
:disabled="!isBasicEditable" <!-- :disabled="!isBasicEditable"-->
/> <!-- />-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="预计回款时间" width="160" align="center"> <!-- <el-table-column label="预计回款时间" width="160" align="center">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-date-picker <!-- <el-date-picker-->
v-model="scope.row.repaymentTime" <!-- v-model="scope.row.repaymentTime"-->
type="date" <!-- type="date"-->
value-format="YYYY-MM-DD" <!-- value-format="YYYY-MM-DD"-->
placeholder="选择日期" <!-- placeholder="选择日期"-->
style="width: 100%" <!-- style="width: 100%"-->
:disabled="!isBasicEditable" <!-- :disabled="!isBasicEditable"-->
@change="recalcReceivableDate(scope.row)" <!-- @change="recalcReceivableDate(scope.row)"-->
/> <!-- />-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="回款延期天数" width="140" align="center"> <!-- <el-table-column label="回款延期天数" width="140" align="center">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-input-number <!-- <el-input-number-->
v-model="scope.row.delayDay" <!-- v-model="scope.row.delayDay"-->
:min="0" <!-- :min="0"-->
:step="1" <!-- :step="1"-->
controls-position="right" <!-- controls-position="right"-->
style="width: 100%" <!-- style="width: 100%"-->
:disabled="!canEditLimited" <!-- :disabled="!canEditLimited"-->
@change="recalcReceivableDate(scope.row)" <!-- @change="recalcReceivableDate(scope.row)"-->
/> <!-- />-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<!-- <el-table-column label="应收款日期" width="160" align="center"> <!-- <el-table-column label="应收款日期" width="160" align="center">
<template #default="scope"> <template #default="scope">
<el-date-picker v-model="scope.row.receivableDate" type="date" value-format="YYYY-MM-DD" placeholder="自动计算" style="width: 100%" disabled/> <el-date-picker v-model="scope.row.receivableDate" type="date" value-format="YYYY-MM-DD" placeholder="自动计算" style="width: 100%" disabled/>
</template> </template>
</el-table-column>--> </el-table-column>-->
<el-table-column label="实际开始" min-width="140" align="center"> <el-table-column label="实际开始日期" width="160" align="center">
<template #default="scope"> <template #default="scope">
<el-date-picker v-model="scope.row.realStartTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" /> <el-date-picker v-model="scope.row.realStartTime" type="date" value-format="YYYY-MM-DD" :disabled="!canEditLimited" placeholder="选择日期" style="width: 100%" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际结束" min-width="140" align="center"> <el-table-column label="实际结束日期" width="160" align="center">
<template #default="scope"> <template #default="scope">
<el-date-picker v-model="scope.row.realEndTime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" /> <el-date-picker v-model="scope.row.realEndTime" type="date" value-format="YYYY-MM-DD" :disabled="!canEditLimited" placeholder="选择日期" style="width: 100%" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="进度备注" width="200" align="center"> <el-table-column label="进度备注" min-width="200" align="center">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.scheduleRemark" placeholder="请输入进度备注" :disabled="!canEditLimited" /> <el-input v-model="scope.row.scheduleRemark" placeholder="请输入进度备注" :disabled="!canEditLimited" />
</template> </template>

@ -1,484 +0,0 @@
<template>
<div class="p-2">
<el-card shadow="never">
<!-- 审批按钮组件 -->
<approvalButton
@submitForm="submitForm"
@approvalVerifyOpen="approvalVerifyOpen"
@handleApprovalRecord="handleApprovalRecord"
:buttonLoading="buttonLoading"
:id="form.projectPlanId"
:status="form.flowStatus"
:pageType="approvalPageType"
:mode="false"
/>
<el-form ref="projectPlanFormRef" :model="form" :rules="rules" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" label-width="120px">
<el-divider content-position="left">基本信息</el-divider>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="项目名称" prop="projectId">
<el-select v-model="form.projectId" placeholder="请选择项目" filterable @change="handleProjectChange">
<el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目经理" prop="managerId">
<el-select v-model="form.managerId" placeholder="请选择项目经理" filterable disabled>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.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="请选择部门负责人" filterable disabled>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联合同" prop="contractId">
<el-select v-model="form.contractId" placeholder="请选择合同" filterable clearable>
<el-option v-for="item in contractInfoList" :key="item.contractId" :label="item.contractName" :value="item.contractId"/>
</el-select>
</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="projectPlanStatus">
<el-select v-model="form.projectPlanStatus" placeholder="请选择项目计划状态">
<el-option v-for="dict in project_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">项目阶段计划</el-divider>
<el-row :gutter="10" class="mb8" v-if="isBasicEditable">
<el-col :span="1.5">
<el-button type="primary" icon="Plus" @click="handleAddStage">添加阶段</el-button>
</el-col>
</el-row>
<el-table :data="form.planStageList" border stripe max-height="600">
<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="!isBasicEditable">
<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%" :disabled="!isBasicEditable"/>
</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%" :disabled="!isBasicEditable"/>
</template>
</el-table-column>
<el-table-column label="回款阶段" width="150" align="center">
<template #default="scope">
<el-select v-model="scope.row.collectionStage" placeholder="请选择回款阶段" style="width: 100%" :disabled="!isBasicEditable">
<el-option v-for="dict in collection_stage" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="回款比例(%)" width="120" 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%" :disabled="!isBasicEditable" @change="calculateRepaymentAmount(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="预计回款金额" width="140" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.repaymentAmount" :min="0" :precision="2" controls-position="right" style="width: 100%" :disabled="!isBasicEditable"/>
</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%" :disabled="!isBasicEditable" @change="recalcReceivableDate(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="回款延期天数" width="140" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.delayDay" :min="0" :step="1" controls-position="right" style="width: 100%" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" @change="recalcReceivableDate(scope.row)"/>
</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%" disabled/>
</template>
</el-table-column>
<el-table-column label="进度备注" width="200" align="center">
<template #default="scope">
<el-input v-model="scope.row.scheduleRemark" placeholder="请输入进度备注" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"/>
</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center" fixed="right" v-if="isBasicEditable">
<template #default="scope">
<el-button type="danger" link icon="Delete" @click="handleDeleteStage(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 底部操作按钮 -->
<el-row :gutter="20" class="mt-4" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
<el-col :span="24" style="text-align: center">
<el-button type="primary" :loading="buttonLoading" @click="handleSave">暂存</el-button>
<el-button @click="goBack">返回</el-button>
</el-col>
</el-row>
</el-form>
</el-card>
<!-- 提交审批组件 -->
<submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
<!-- 审批记录 -->
<approvalRecord ref="approvalRecordRef" />
</div>
</template>
<script setup lang="ts" name="ErpProjectPlanEdit">
import { ref, reactive, onMounted, getCurrentInstance, watch, computed } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { getErpProjectPlan, addErpProjectPlan, updateErpProjectPlan, projectPlanSubmitAndFlowStart } from '@/api/oa/erp/erpProjectPlan';
import { ErpProjectPlanForm } from '@/api/oa/erp/erpProjectPlan/types';
import { listUser } from '@/api/system/user';
import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo';
import { getErpContractInfoList } from '@/api/oa/erp/contractInfo';
import SubmitVerify from '@/components/Process/submitVerify.vue';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import ApprovalButton from '@/components/Process/approvalButton.vue';
import { useUserStore } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { project_plan_status , project_phases, collection_stage } = toRefs<any>(
proxy?.useDict('project_plan_status', 'project_phases', 'collection_stage')
);
const route = useRoute();
const router = useRouter();
const userStore = useUserStore();
// 审批相关组件引用
const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
// 路由参数
const routeParams = ref<any>({});
const syncRouteParams = () => {
const projectPlanId = (route.params.projectPlanId as string) || (route.query.id as string);
const type = (route.query.type as string) || (route.params.type as string) || 'edit';
const taskId = (route.query.taskId as string) || (route.params.taskId as string);
routeParams.value = {
projectPlanId,
type,
taskId
};
};
syncRouteParams();
watch(
() => route.fullPath,
() => {
syncRouteParams();
}
);
// approvalButton组件的pageType将'edit'转换为'update'
const approvalPageType = computed(() => {
if (routeParams.value.type === 'edit') {
return 'update';
}
return routeParams.value.type;
});
// 流程相关数据
const taskVariables = ref<any>({});
// 计算属性:判断基础信息是否可编辑(草稿状态才能全面编辑)
const isBasicEditable = computed(() => {
// 查看模式或审批模式不可编辑
if (routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
return false;
}
// 草稿状态('1')可编辑,其他状态不可编辑
return form.value.projectPlanStatus === '1';
});
const projectPlanFormRef = ref<ElFormInstance>();
const buttonLoading = ref(false);
const projectInfoList = ref<any[]>([]);
const userList = ref<any[]>([]);
const contractInfoList = ref<any[]>([]);
const contractTotalPrice = ref<number>(0);
const form = ref<ErpProjectPlanForm>({
projectPlanId: undefined,
projectId: undefined,
managerId: undefined,
chargeId: undefined,
paymentMethod: undefined,
projectPlanStatus: '1',
flowStatus: 'draft',
contractId: undefined,
remark: undefined,
planStageList: []
});
const rules = reactive({
projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
managerId: [{ required: true, message: '请选择项目经理', trigger: 'change' }]
});
/** 获取项目列表 */
const getProjectInfoList = async () => {
const res = await getErpProjectInfoList({});
projectInfoList.value = res.data;
};
/** 获取用户列表 */
const getUserList = async () => {
const res = await listUser({ pageNum: 1, pageSize: 9999 });
userList.value = res.rows;
};
/** 获取合同列表 */
const getContractInfoList = async () => {
const res = await getErpContractInfoList({});
contractInfoList.value = res.data;
};
/** 添加阶段 */
const handleAddStage = () => {
const newStage = {
planStageId: undefined,
projectId: form.value.projectId,
projectPlanId: form.value.projectPlanId,
projectPhases: undefined,
planStartTime: undefined,
planEndTime: undefined,
collectionStage: undefined,
repaymentRate: undefined,
repaymentAmount: undefined,
repaymentTime: undefined,
delayDay: undefined,
receivableDate: undefined,
reasonsExplanation: undefined,
scheduleRemark: undefined,
realStartTime: undefined,
realEndTime: undefined,
sortOrder: (form.value.planStageList?.length || 0) + 1
};
if (!form.value.planStageList) {
form.value.planStageList = [];
}
form.value.planStageList.push(newStage);
};
/** 删除阶段 */
const handleDeleteStage = (index: number) => {
form.value.planStageList?.splice(index, 1);
};
/** 处理项目选择变化,自动填充项目经理和部门负责人 */
const handleProjectChange = (projectId: number) => {
if (!projectId) {
form.value.managerId = undefined;
form.value.chargeId = undefined;
return;
}
const project = projectInfoList.value.find(p => p.projectId === projectId);
if (project) {
form.value.managerId = project.managerId;
form.value.chargeId = project.chargeId;
}
};
/** 根据回款比例计算回款金额 */
const calculateRepaymentAmount = (row: any) => {
if (row.repaymentRate && contractTotalPrice.value > 0) {
row.repaymentAmount = parseFloat((contractTotalPrice.value * row.repaymentRate / 100).toFixed(2));
}
};
/** 根据回款时间与延期天数生成应收款日期 */
const recalcReceivableDate = (row: any) => {
if (!row) return;
const time = row.repaymentTime;
const delay = Number(row.delayDay || 0);
if (!time) {
row.receivableDate = undefined;
return;
}
const base = new Date(time as string);
if (isNaN(base.getTime())) {
row.receivableDate = undefined;
return;
}
const target = new Date(base.getTime());
target.setDate(target.getDate() + delay);
// 使用系统已有的parseTime进行格式化保持与全局一致
row.receivableDate = proxy?.parseTime ? proxy.parseTime(target, '{y}-{m}-{d}') : target.toISOString().slice(0, 10);
};
/** 监听合同变化,更新合同总价 */
watch(() => form.value.contractId, (newContractId) => {
if (newContractId) {
const contract = contractInfoList.value.find(c => c.contractId === newContractId);
if (contract) {
contractTotalPrice.value = contract.totalPrice || 0;
}
} else {
contractTotalPrice.value = 0;
}
});
/** 提交表单 */
const submitForm = async (status = 'draft') => {
// 权限校验:只有项目经理才能提交(超级管理员跳过校验)
if (!form.value.managerId) {
proxy?.$modal.msgError('请先选择项目');
return;
}
// 超级管理员跳过权限校验
const isSuperAdmin = userStore.roles.includes('admin') || userStore.roles.includes('superadmin');
if (!isSuperAdmin && userStore.userId !== form.value.managerId) {
proxy?.$modal.msgError('只有项目经理才能提交项目计划');
return;
}
projectPlanFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
try {
// 更新阶段的projectId
if (form.value.planStageList) {
form.value.planStageList.forEach(stage => {
stage.projectId = form.value.projectId;
});
}
// 提交审批
if (status === 'submit') {
const project = projectInfoList.value.find(p => p.projectId === form.value.projectId);
form.value.flowCode = 'OAPS';
form.value.variables = {
projectId: form.value.projectId,
projectName: project?.projectName,
managerId: form.value.managerId
};
form.value.bizExt = {
businessTitle: '项目计划审批',
businessCode: project?.projectName
};
form.value.projectPlanStatus = '2';
form.value.flowStatus = 'waiting';
const res = await projectPlanSubmitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
form.value = res.data;
buttonLoading.value = false;
proxy?.$modal.msgSuccess('操作成功');
proxy?.$tab.closePage();
router.go(-1);
} else {
// 暂存
if (status === 'draft') {
form.value.projectPlanStatus = '1';
form.value.flowStatus = 'draft';
}
if (form.value.projectPlanId) {
await updateErpProjectPlan(form.value).finally(() => (buttonLoading.value = false));
} else {
await addErpProjectPlan(form.value).finally(() => (buttonLoading.value = false));
}
buttonLoading.value = false;
proxy?.$modal.msgSuccess('暂存成功');
proxy?.$tab.closePage();
router.go(-1);
}
} finally {
buttonLoading.value = false;
}
}
});
};
/** 保存按钮 - 保存为草稿 */
const handleSave = () => {
submitForm('draft');
};
/** 返回列表 */
const goBack = () => {
router.back();
};
/** 初始化数据 */
const initData = async () => {
await Promise.all([getProjectInfoList(), getUserList(), getContractInfoList()]);
syncRouteParams();
const projectPlanId = routeParams.value.projectPlanId;
if (projectPlanId && projectPlanId !== '0') {
const res = await getErpProjectPlan(projectPlanId as string);
form.value = res.data;
// 确保flowStatus有默认值用于approvalButton组件显示
if (!form.value.flowStatus) {
form.value.flowStatus = 'draft';
}
// 获取合同总价用于计算回款金额
if (form.value.contractId) {
const contract = contractInfoList.value.find(c => c.contractId === form.value.contractId);
if (contract) {
contractTotalPrice.value = contract.totalPrice || 0;
}
}
}
// 添加调试日志(完成后可删除)
console.log('=== approvalButton 显示条件 ===');
console.log('form.projectPlanId:', form.value.projectPlanId);
console.log('form.flowStatus:', form.value.flowStatus);
console.log('routeParams.type:', routeParams.value.type);
console.log('approvalPageType:', approvalPageType.value);
console.log('URL:', window.location.href);
};
// 审批
const approvalVerifyOpen = async () => {
await submitVerifyRef.value?.openDialog(routeParams.value.taskId);
};
// 审批记录
const handleApprovalRecord = () => {
approvalRecordRef.value?.init(form.value.projectPlanId);
};
// 提交回调
const submitCallback = async () => {
await proxy?.$tab.closePage(route);
router.go(-1);
};
onMounted(() => {
initData();
});
</script>
<style scoped lang="scss">
.el-divider {
margin: 20px 0;
}
</style>

@ -4,14 +4,17 @@
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="项目计划编号" prop="projectPlanCode">
<el-input v-model="queryParams.projectPlanCode" placeholder="请输入项目计划编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="项目编号" prop="projectCode">
<el-input v-model="queryParams.projectCode" placeholder="请输入项目编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="项目名称" prop="projectId"> <el-form-item label="项目名称" prop="projectId">
<el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable filterable> <el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable filterable>
<el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId" /> <el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="项目计划编号" prop="projectPlanCode">
<el-input v-model="queryParams.projectPlanCode" placeholder="请输入项目计划编号" clearable />
</el-form-item>-->
<el-form-item label="项目经理" prop="managerId"> <el-form-item label="项目经理" prop="managerId">
<el-select v-model="queryParams.managerId" placeholder="请选择项目经理" clearable filterable> <el-select v-model="queryParams.managerId" placeholder="请选择项目经理" clearable filterable>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" /> <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
@ -122,9 +125,9 @@
v-hasPermi="['oa/erp:erpProjectChange:add']" v-hasPermi="['oa/erp:erpProjectChange:add']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="审批记录" placement="top" v-if="scope.row.projectPlanStatus === '2' || scope.row.projectPlanStatus === '3'"> <!-- <el-tooltip content="审批记录" placement="top" v-if="scope.row.projectPlanStatus === '2' || scope.row.projectPlanStatus === '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>-->
<el-tooltip content="甘特图" placement="top" v-if="scope.row.projectPlanId"> <el-tooltip content="甘特图" placement="top" v-if="scope.row.projectPlanId">
<el-button link type="success" icon="Histogram" @click="handleGantt(scope.row)"></el-button> <el-button link type="success" icon="Histogram" @click="handleGantt(scope.row)"></el-button>
</el-tooltip> </el-tooltip>
@ -289,6 +292,7 @@ const data = reactive<PageData<ErpProjectPlanForm, ErpProjectPlanQuery>>({
pageSize: 10, pageSize: 10,
projectId: undefined, projectId: undefined,
projectPlanCode: undefined, projectPlanCode: undefined,
projectCode: undefined,
managerId: undefined, managerId: undefined,
chargeId: undefined, chargeId: undefined,
paymentMethod: undefined, paymentMethod: undefined,

@ -1,402 +0,0 @@
<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="projectId">
<el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable filterable>
<el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
</el-select>
</el-form-item>
<el-form-item label="项目经理" prop="managerId">
<el-select v-model="queryParams.managerId" placeholder="请选择项目经理" clearable filterable>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
</el-select>
</el-form-item>
<el-form-item label="项目计划状态" prop="projectPlanStatus">
<el-select v-model="queryParams.projectPlanStatus" placeholder="请选择项目计划状态" clearable >
<el-option v-for="dict in project_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:erpProjectPlan: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:erpProjectPlan: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:erpProjectPlan:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:erpProjectPlan: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="erpProjectPlanList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目计划ID" align="center" prop="projectPlanId" v-if="columns[0].visible"/>
<el-table-column label="项目名称" align="center" prop="projectName" width="200" v-if="columns[2].visible"/>
<el-table-column label="项目经理" align="center" prop="managerName" v-if="columns[3].visible"/>
<el-table-column label="部门负责人" align="center" prop="chargeName" v-if="columns[4].visible"/>
<el-table-column label="付款方式" align="center" prop="paymentMethod" v-if="columns[5].visible"/>
<el-table-column label="项目计划状态" align="center" prop="projectPlanStatus" v-if="columns[6].visible">
<template #default="scope">
<dict-tag :options="project_plan_status" :value="scope.row.projectPlanStatus"/>
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[7].visible"/>
<el-table-column label="合同名称" align="center" prop="contractName" width="200" v-if="columns[8].visible"/>
<el-table-column label="排序号" align="center" prop="sortOrder" v-if="columns[9].visible"/>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[11].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[12].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[13].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" width="150" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="查看" placement="top" v-if="scope.row.projectPlanStatus !== '1'">
<el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)" v-hasPermi="['oa/erp:erpProjectPlan:query']"></el-button>
</el-tooltip>
<el-tooltip content="修改" placement="top" v-if="scope.row.projectPlanStatus === '1'">
<el-button link type="primary" icon="Edit" @click="handleEdit(scope.row)" v-hasPermi="['oa/erp:erpProjectPlan:edit']"></el-button>
</el-tooltip>
<el-tooltip content="审批记录" placement="top" v-if="scope.row.projectPlanStatus === '2' || scope.row.projectPlanStatus === '3'">
<el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></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>
<!-- 审批记录 -->
<ApprovalRecord ref="approvalRecordRef" />
<!-- 添加或修改项目计划对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
<el-form ref="erpProjectPlanFormRef" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="项目名称" prop="projectId">
<el-select v-model="form.projectId" placeholder="请选择项目" filterable @change="handleProjectChangeInDialog">
<el-option v-for="item in projectInfoList" :key="item.projectId" :label="item.projectName" :value="item.projectId"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目经理" prop="managerId">
<el-select v-model="form.managerId" placeholder="请选择项目经理" filterable disabled>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.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="请选择部门负责人" filterable disabled>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同" prop="contractId">
<el-select v-model="form.contractId" placeholder="请选择合同" filterable clearable>
<el-option v-for="item in contractInfoList" :key="item.contractId" :label="item.contractName" :value="item.contractId"/>
</el-select>
</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="projectPlanStatus">
<el-select v-model="form.projectPlanStatus" placeholder="请选择项目计划状态">
<el-option v-for="dict in project_plan_status" :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="sortOrder">
<el-input v-model="form.sortOrder" placeholder="请输入排序号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
<el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</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="ErpProjectPlan" lang="ts">
import { listErpProjectPlan, getErpProjectPlan, delErpProjectPlan, addErpProjectPlan, updateErpProjectPlan } from '@/api/oa/erp/erpProjectPlan';
import { ErpProjectPlanVO, ErpProjectPlanQuery, ErpProjectPlanForm } from '@/api/oa/erp/erpProjectPlan/types';
import { listUser } from '@/api/system/user';
import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo';
import { getErpContractInfoList } from '@/api/oa/erp/contractInfo';
import { useRouter } from 'vue-router';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const router = useRouter();
const { active_flag, project_plan_status , project_phases, collection_stage} = toRefs<any>(proxy?.useDict('active_flag', 'project_plan_status', 'project_phases', 'collection_stage'));
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
const erpProjectPlanList = ref<ErpProjectPlanVO[]>([]);
const projectInfoList = ref<any[]>([]);
const userList = ref<any[]>([]);
const contractInfoList = ref<any[]>([]);
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 erpProjectPlanFormRef = 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: true },
{ key: 3, label: `项目经理`, visible: true },
{ key: 4, label: `部门负责人`, visible: true },
{ key: 5, label: `付款方式`, visible: true },
{ key: 6, label: `项目计划状态`, visible: true },
{ key: 7, label: `流程状态`, visible: false },
{ key: 8, label: `合同名称`, visible: true },
{ key: 9, label: `排序号`, visible: false },
{ key: 10, label: `备注`, visible: false },
{ key: 11, label: `激活标识`, visible: false },
{ key: 12, label: `创建人`, visible: true },
{ key: 13, label: `创建时间`, visible: true },
]);
const initFormData: ErpProjectPlanForm = {
projectPlanId: undefined,
projectId: undefined,
managerId: undefined,
chargeId: undefined,
paymentMethod: undefined,
projectPlanStatus: undefined,
flowStatus: undefined,
sortOrder: undefined,
contractId: undefined,
remark: undefined,
activeFlag: undefined,
}
const data = reactive<PageData<ErpProjectPlanForm, ErpProjectPlanQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
projectId: undefined,
managerId: undefined,
chargeId: undefined,
paymentMethod: undefined,
projectPlanStatus: undefined,
flowStatus: undefined,
sortOrder: undefined,
contractId: undefined,
activeFlag: undefined,
params: {
}
},
rules: {
projectPlanId: [
{ required: true, message: "项目计划ID不能为空", trigger: "blur" }
],
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询项目计划列表 */
const getList = async () => {
loading.value = true;
const res = await listErpProjectPlan(queryParams.value);
erpProjectPlanList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 获取项目列表 */
const getProjectInfoList = async () => {
const res = await getErpProjectInfoList({});
projectInfoList.value = res.data;
}
/** 获取用户列表 */
const getUserList = async () => {
const res = await listUser({ pageNum: 1, pageSize: 9999 });
userList.value = res.rows;
}
/** 获取合同列表 */
const getContractInfoList = async () => {
const res = await getErpContractInfoList({});
contractInfoList.value = res.data;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
erpProjectPlanFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: ErpProjectPlanVO[]) => {
ids.value = selection.map(item => item.projectPlanId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 对话框中处理项目选择变化,自动填充项目经理和部门负责人 */
const handleProjectChangeInDialog = (projectId: number) => {
if (!projectId) {
form.value.managerId = undefined;
form.value.chargeId = undefined;
return;
}
const project = projectInfoList.value.find(p => p.projectId === projectId);
if (project) {
form.value.managerId = project.managerId;
form.value.chargeId = project.chargeId;
}
}
/** 新增按钮操作 */
const handleAdd = () => {
router.push('/oa/erp/erpProjectPlan/edit/0');
}
/** 查看按钮操作 */
const handleView = (row: ErpProjectPlanVO) => {
router.push(`/oa/erp/erpProjectPlan/view/${row.projectPlanId}?type=view`);
}
/** 编辑按钮操作 */
const handleEdit = (row: ErpProjectPlanVO) => {
router.push(`/oa/erp/erpProjectPlan/edit/${row.projectPlanId}?type=edit`);
}
// 查看审批记录
const handleApprovalRecord = (row: ErpProjectPlanVO) => {
approvalRecordRef.value?.init(row.projectPlanId);
}
/** 修改按钮操作(保留用于对话框形式) */
const handleUpdate = async (row?: ErpProjectPlanVO) => {
reset();
const _projectPlanId = row?.projectPlanId || ids.value[0]
const res = await getErpProjectPlan(_projectPlanId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改项目计划";
}
/** 提交按钮 */
const submitForm = () => {
erpProjectPlanFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.projectPlanId) {
await updateErpProjectPlan(form.value).finally(() => buttonLoading.value = false);
} else {
await addErpProjectPlan(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: ErpProjectPlanVO) => {
const _projectPlanIds = row?.projectPlanId || ids.value;
await proxy?.$modal.confirm('是否确认删除项目计划编号为"' + _projectPlanIds + '"的数据项?').finally(() => loading.value = false);
await delErpProjectPlan(_projectPlanIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('oa/erp/erpProjectPlan/export', {
...queryParams.value
}, `erpProjectPlan_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
getProjectInfoList();
getUserList();
getContractInfoList();
});
</script>
Loading…
Cancel
Save