taoge_xiaodi/maintenance_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

https://gitee.com/dromara/RuoYi-Cloud-Plus/issues/I9US1Q fix修复我的单据撤销，删除参数错误

Browse Source
This commit is contained in:
songgaoshuai
2024-06-04 11:26:38 +08:00
parent 3fead37924
commit c467d95703
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/workflow/task/myDocument.vue
View File

@ -88,7 +88,7 @@
<el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button> <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="撤销" placement="top"> <el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="撤销" placement="top">
<el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)"></el-button> <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.businessKey)"></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
@ -123,7 +123,7 @@ const categoryTreeRef = ref<ElTreeInstance>();
// 遮罩层 // 遮罩层
const loading = ref(true); const loading = ref(true);
// 选中数组 // 选中数组
const ids = ref<Array<any>>([]); const businessKeys = ref<Array<any>>([]);
// 非单个禁用 // 非单个禁用
const single = ref(true); const single = ref(true);
// 非多个禁用 // 非多个禁用
@ -190,12 +190,6 @@ const getTreeselect = async () => {
categoryOptions.value.push(data); categoryOptions.value.push(data);
}; };
//审批记录
const handleApprovalRecord = (processInstanceId: string) => {
if (approvalRecordRef.value) {
approvalRecordRef.value.init(processInstanceId);
}
};
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
getList(); getList();
@ -210,7 +204,7 @@ const resetQuery = () => {
}; };
// 多选框选中数据 // 多选框选中数据
const handleSelectionChange = (selection: ProcessInstanceVO[]) => { const handleSelectionChange = (selection: ProcessInstanceVO[]) => {
ids.value = selection.map((item: any) => item.id); businessKeys.value = selection.map((item: any) => item.businessKey);
single.value = selection.length !== 1; single.value = selection.length !== 1;
multiple.value = !selection.length; multiple.value = !selection.length;
}; };
@ -226,22 +220,22 @@ const getList = () => {
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (row: ProcessInstanceVO) => { const handleDelete = async (row: ProcessInstanceVO) => {
const id = row.id || ids.value; const businessKey = row.businessKey || businessKeys.value;
await proxy?.$modal.confirm('是否确认删除id为【' + id + '】的数据项？'); await proxy?.$modal.confirm('是否确认删除业务id为【' + businessKey + '】的数据项？');
loading.value = true; loading.value = true;
if ('running' === tab.value) { if ('running' === tab.value) {
await deleteRunAndHisInstance(id).finally(() => (loading.value = false)); await deleteRunAndHisInstance(businessKey).finally(() => (loading.value = false));
getList(); getList();
} }
proxy?.$modal.msgSuccess('删除成功'); proxy?.$modal.msgSuccess('删除成功');
}; };
/** 撤销按钮操作 */ /** 撤销按钮操作 */
const handleCancelProcessApply = async (processInstanceId: string) => { const handleCancelProcessApply = async (businessKey: string) => {
await proxy?.$modal.confirm('是否确认撤销当前单据？'); await proxy?.$modal.confirm('是否确认撤销当前单据？');
loading.value = true; loading.value = true;
if ('running' === tab.value) { if ('running' === tab.value) {
await cancelProcessApply(processInstanceId).finally(() => (loading.value = false)); await cancelProcessApply(businessKey).finally(() => (loading.value = false));
getList(); getList();
} }
proxy?.$modal.msgSuccess('撤销成功'); proxy?.$modal.msgSuccess('撤销成功');