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

1.0.94 项目审核流程变量优化统一后端。

Browse Source
dev
yinq 15 hours ago
parent 58d1824160
commit 831018f476
4 changed files with 8 additions and 85 deletions
Show Stats Download Patch File Download Diff File

27
src/views/oa/erp/projectInfo/devEdit.vue
Unescape Escape View File

@ -329,7 +329,7 @@ const userList = ref([]);
const getUserSelectList = async () => {
const params = { } as any;
const res = await getUserList(params);
userList.value = res.rows;
userList.value = res.data;
};
const projectTypeOptions = ref<ProjectTypeVO[]>([]);
@ -441,31 +441,6 @@ const submitForm = (status: string, mode: boolean) => {
if (status != 'draft') {
// 后端发起流程模式
submitData.flowCode = FlowCodeEnum.PROJECT_RD_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,
contractFlag: Number(submitData.contractFlag),
projectTypeParentId: projectTypeParentId
};
// 流程实例业务扩展字段
submitData.bizExt = {
businessTitle: '市场项目审批',
businessCode: submitData.projectCode
};
submitData.projectStatus = '2';
submitData.flowStatus = 'waiting';
const res = await projectSubmitAndFlowStart(submitData).finally(() => (buttonLoading.value = false));
form.value = res.data;
buttonLoading.value = false;

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

@ -434,33 +434,6 @@ const submitForm = (status: string, mode: boolean) => {
if (status != 'draft') {
// 后端发起流程模式
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 = {
projectId: submitData.projectId,
projectCode: submitData.projectCode,
projectName: submitData.projectName,
contractFlag: Number(submitData.contractFlag),
projectTypeParentId: projectTypeParentId,
};
// 流程实例业务扩展字段
submitData.bizExt = {
businessTitle: submitData.projectName + '市场项目审批',
businessCode: submitData.projectCode
};
submitData.projectStatus = '2';
submitData.flowStatus = 'waiting';
const res = await projectSubmitAndFlowStart(submitData).finally(() => (buttonLoading.value = false));
form.value = res.data;
buttonLoading.value = false;

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

@ -118,6 +118,11 @@
<dict-tag :options="project_category" :value="scope.row.projectCategory" />
</template>
</el-table-column>
<el-table-column label="项目状态" align="center" prop="projectStatus" v-if="columns[16].visible">
<template #default="scope">
<dict-tag :options="project_status" :value="scope.row.projectStatus" />
</template>
</el-table-column>
<el-table-column label="备件标识" align="center" prop="spareFlag" v-if="columns[7].visible">
<template #default="scope">
<dict-tag :options="spare_flag" :value="scope.row.spareFlag" />
@ -131,11 +136,6 @@
<el-table-column label="分管副总" align="center" prop="deputyName" width="100" v-if="columns[13].visible" />
<el-table-column label="抄送人员" align="center" prop="peopleId" v-if="columns[14].visible" />
<el-table-column label="金额" align="center" prop="amount" width="110" v-if="columns[15].visible" />
<el-table-column label="项目状态" align="center" prop="projectStatus" v-if="columns[16].visible">
<template #default="scope">
<dict-tag :options="project_status" :value="scope.row.projectStatus" />
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[17].visible">
<template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.flowStatus" />
@ -219,7 +219,7 @@ const columns = ref<FieldOption[]>([
{ key: 6, label: `项目类别`, visible: true },
{ key: 7, label: `备件标识`, visible: true },
{ key: 8, label: `项目类型`, visible: true },
{ key: 9, label: `付款方式`, visible: true },
{ key: 9, label: `付款方式`, visible: false },
{ key: 10, label: `部门`, visible: true },
{ key: 11, label: `项目经理`, visible: true },
{ key: 12, label: `部门负责人`, visible: true },

27
src/views/oa/erp/projectInfo/preEdit.vue
Unescape Escape View File

@ -329,7 +329,7 @@ const userList = ref([]);
const getUserSelectList = async () => {
const params = { } as any;
const res = await getUserList(params);
userList.value = res.rows;
userList.value = res.data;
};
const projectTypeOptions = ref<ProjectTypeVO[]>([]);
@ -441,31 +441,6 @@ const submitForm = (status: string, mode: boolean) => {
if (status != 'draft') {
// 后端发起流程模式
submitData.flowCode = FlowCodeEnum.PROJECT_PRE_INVEST_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,
contractFlag: Number(submitData.contractFlag),
projectTypeParentId: projectTypeParentId
};
// 流程实例业务扩展字段
submitData.bizExt = {
businessTitle: '预投项目审批',
businessCode: submitData.projectCode
};
submitData.projectStatus = '2';
submitData.flowStatus = 'waiting';
const res = await projectSubmitAndFlowStart(submitData).finally(() => (buttonLoading.value = false));
form.value = res.data;
buttonLoading.value = false;

Write Preview
Loading…
Cancel
Save