update 优化模型保存位置，审批记录，请假申请按钮
This commit is contained in:
gssong
parent
b8e0f018f0
commit
b2e47f3938
@ -14,29 +14,6 @@
|
||||
<el-header>
|
||||
<div class="process-toolbar">
|
||||
<el-space wrap :size="10">
|
||||
<el-button size="small" type="primary" @click="saveXml">保 存</el-button>
|
||||
<el-dropdown size="small">
|
||||
<el-button size="small" type="primary"> 预 览 </el-button>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item icon="Document" @click="previewXML">XML预览</el-dropdown-item>
|
||||
<el-dropdown-item icon="View" @click="previewSVG"> SVG预览</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
|
||||
<el-dropdown size="small">
|
||||
<el-button size="small" type="primary"> 下 载 </el-button>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item icon="Download" @click="downloadXML">下载XML</el-dropdown-item>
|
||||
<el-dropdown-item icon="Download" @click="downloadSVG"> 下载SVG</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
<el-tooltip effect="dark" content="新建" placement="bottom">
|
||||
<el-button size="small" icon="CirclePlus" @click="newDiagram" />
|
||||
</el-tooltip>
|
||||
<el-tooltip effect="dark" content="自适应屏幕" placement="bottom">
|
||||
<el-button size="small" icon="Rank" @click="fitViewport" />
|
||||
</el-tooltip>
|
||||
@ -53,6 +30,27 @@
|
||||
<el-button size="small" icon="Right" @click="bpmnModeler.get('commandStack').redo()" />
|
||||
</el-tooltip>
|
||||
</el-space>
|
||||
<el-space wrap :size="10" style="float: right; padding-right: 10px">
|
||||
<el-button size="small" type="primary" @click="saveXml">保 存</el-button>
|
||||
<el-dropdown size="small">
|
||||
<el-button size="small" type="primary"> 预 览 </el-button>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item icon="Document" @click="previewXML">XML预览</el-dropdown-item>
|
||||
<el-dropdown-item icon="View" @click="previewSVG"> SVG预览</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
<el-dropdown size="small">
|
||||
<el-button size="small" type="primary"> 下 载 </el-button>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item icon="Download" @click="downloadXML">下载XML</el-dropdown-item>
|
||||
<el-dropdown-item icon="Download" @click="downloadSVG"> 下载SVG</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
</el-space>
|
||||
</div>
|
||||
</el-header>
|
||||
<div ref="canvas" class="canvas" />
|
||||
|
||||
@ -405,5 +405,6 @@ defineExpose({
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -62,7 +62,6 @@ const props = defineProps({
|
||||
const loading = ref(false);
|
||||
const visible = ref(false);
|
||||
const historyList = ref<Array<any>>([]);
|
||||
const deleteReason = ref<string>('');
|
||||
const tabActiveName = ref('bpmn');
|
||||
|
||||
const bpmnViewRef = ref<BpmnView>();
|
||||
@ -74,8 +73,7 @@ const init = async (instanceId: string) => {
|
||||
tabActiveName.value = 'bpmn';
|
||||
historyList.value = [];
|
||||
processApi.getHistoryRecord(instanceId).then((resp) => {
|
||||
historyList.value = resp.data.historyRecordList;
|
||||
deleteReason.value = resp.data.deleteReason;
|
||||
historyList.value = resp.data;
|
||||
loading.value = false;
|
||||
});
|
||||
await nextTick(() => {
|
||||
|
||||
@ -58,34 +58,44 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-tooltip
|
||||
<el-button
|
||||
v-if="
|
||||
scope.row.processInstanceVo.businessStatus === 'draft' ||
|
||||
scope.row.processInstanceVo.businessStatus === 'cancel' ||
|
||||
scope.row.processInstanceVo.businessStatus === 'back'
|
||||
"
|
||||
content="修改"
|
||||
placement="top"
|
||||
v-hasPermi="['demo:leave:edit']"
|
||||
size="small"
|
||||
link
|
||||
type="primary"
|
||||
icon="Edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>修改</el-button
|
||||
>
|
||||
<el-button v-hasPermi="['demo:leave:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip
|
||||
<el-button
|
||||
v-if="
|
||||
scope.row.processInstanceVo.businessStatus === 'draft' ||
|
||||
scope.row.processInstanceVo.businessStatus === 'cancel' ||
|
||||
scope.row.processInstanceVo.businessStatus === 'back'
|
||||
"
|
||||
content="删除"
|
||||
placement="top"
|
||||
v-hasPermi="['demo:leave:remove']"
|
||||
size="small"
|
||||
link
|
||||
type="primary"
|
||||
icon="Delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button
|
||||
>
|
||||
<el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
|
||||
<el-button
|
||||
v-if="scope.row.processInstanceVo.businessStatus === 'waiting'"
|
||||
link
|
||||
size="small"
|
||||
type="primary"
|
||||
icon="Notification"
|
||||
@click="handleCancelProcessApply(scope.row.processInstanceVo.id)"
|
||||
>撤销</el-button
|
||||
>
|
||||
<el-button v-hasPermi="['demo:leave:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip placement="top" content="查看">
|
||||
<el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip v-if="scope.row.processInstanceVo.businessStatus === 'waiting'" content="撤销" placement="top">
|
||||
<el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.processInstanceVo.id)"></el-button>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column align="center" prop="startTime" label="启动时间" width="160"></el-table-column>
|
||||
<el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="结束时间" width="160"></el-table-column>
|
||||
<el-table-column label="操作" align="center" :width="tab === 'finish' ? '130' : '160'">
|
||||
<el-table-column label="操作" align="center" :width="130">
|
||||
<template #default="scope">
|
||||
<el-row v-if="tab === 'running'" :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
@ -97,23 +97,13 @@
|
||||
</el-popover>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="Sort"
|
||||
@click="getProcessDefinitionHitoryList(scope.row.processDefinitionId, scope.row.processDefinitionKey)"
|
||||
>切换版本</el-button
|
||||
>
|
||||
<el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user