yxk-20260724
feat(改善提案): 支持直接发起审批流程及通用流程办理 - 新增改善提案专用流程发起接口,直接以 improvement_proposal.id 作为业务ID发起 dev_improvement_proposal_001,不再创建 task_task - 发起时加行锁并校验草稿状态及流程实例,防止重复发起;成功后回写 process_instance_id - 收紧已发起提案的编辑、单删和批量删除限制,避免流程中的业务数据被篡改 - 前端列表接入业务发起接口,仅草稿且未绑定流程实例时显示发起、编辑、删除入口 - 新增 ImprovementProposalBPMForm,只读展示提案信息并复用通用任务办理能力 - 兼容发起接口从 POST 请求体或 URL 参数中接收 id,修复前端参数未绑定导致的缺少 id 异常 - 明确流程变量使用业务表物理列名:proposal_dept_id,用于按提案部门匹配精益专员初审人员
This commit is contained in:
@@ -70,27 +70,22 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="improvementproposal-improvementProposal" setup>
|
||||
import {ref, reactive, computed, unref} from 'vue';
|
||||
import {ref, reactive} from 'vue';
|
||||
import {BasicTable, useTable, TableAction} from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage'
|
||||
import {useModal} from '/@/components/Modal';
|
||||
import ImprovementProposalModal from './components/ImprovementProposalModal.vue'
|
||||
import {columns, superQuerySchema} from './ImprovementProposal.data';
|
||||
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ImprovementProposal.api';
|
||||
import {list, deleteOne, batchDelete, getImportUrl, getExportUrl, startProposalProcess} from './ImprovementProposal.api';
|
||||
import {downloadFile} from '/@/utils/common/renderUtils';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
|
||||
import { startProcess } from '/@/api/common/api';
|
||||
|
||||
const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
const formRef = ref();
|
||||
const queryParam = reactive<any>({});
|
||||
const checkedKeys = ref<Array<string | number>>([]);
|
||||
//注册model
|
||||
const [registerModal, {openModal}] = useModal();
|
||||
const userStore = useUserStore();
|
||||
const { createMessage } = useMessage();
|
||||
//注册table数据
|
||||
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
|
||||
tableProps:{
|
||||
@@ -184,37 +179,44 @@
|
||||
* 操作栏
|
||||
*/
|
||||
function getTableAction(record){
|
||||
return [
|
||||
const actions = [
|
||||
{
|
||||
label: '编辑',
|
||||
onClick: handleEdit.bind(null, record),
|
||||
auth: 'improvementproposal:improvement_proposal:edit'
|
||||
auth: 'improvementproposal:improvement_proposal:edit',
|
||||
ifShow: isDraft(record),
|
||||
}
|
||||
]
|
||||
];
|
||||
return actions;
|
||||
}
|
||||
/**
|
||||
* 下拉操作栏
|
||||
*/
|
||||
function getDropDownAction(record){
|
||||
let dropDownAction = [
|
||||
const dropDownAction: any[] = [
|
||||
{
|
||||
label: '详情',
|
||||
onClick: handleDetail.bind(null, record),
|
||||
}, {
|
||||
}
|
||||
];
|
||||
if (isDraft(record)) {
|
||||
dropDownAction.push({
|
||||
label: '删除',
|
||||
popConfirm: {
|
||||
title: '是否确认删除',
|
||||
confirm: handleDelete.bind(null, record)
|
||||
},
|
||||
auth: 'improvementproposal:improvement_proposal:delete'
|
||||
},
|
||||
});
|
||||
}
|
||||
dropDownAction.push(
|
||||
{
|
||||
label: '审批进度',
|
||||
onClick: handlePreviewPic.bind(null, record),
|
||||
ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
|
||||
}
|
||||
];
|
||||
if(record.bpmStatus == '1' || !record.bpmStatus){
|
||||
);
|
||||
if(isDraft(record)){
|
||||
dropDownAction.push({
|
||||
label: '发起流程',
|
||||
popConfirm: {
|
||||
@@ -231,16 +233,15 @@
|
||||
* 提交流程
|
||||
*/
|
||||
async function handleProcess(record) {
|
||||
let params = {
|
||||
flowCode: 'dev_improvement_proposal_001',
|
||||
id: record.id,
|
||||
formUrl: 'improvementproposal/components/ImprovementProposalForm',
|
||||
formUrlMobile: ''
|
||||
}
|
||||
await startProcess(params);
|
||||
await startProposalProcess(record.id);
|
||||
handleSuccess();
|
||||
}
|
||||
|
||||
/** 只有未绑定流程实例的草稿可以继续维护或发起。 */
|
||||
function isDraft(record) {
|
||||
return String(record?.bpmStatus || '') === '1' && !record?.processInstanceId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 审批进度
|
||||
*/
|
||||
@@ -300,4 +301,4 @@
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user