diff --git a/src/api/workflow/definition/index.ts b/src/api/workflow/definition/index.ts
index 775cfa7..50720ff 100644
--- a/src/api/workflow/definition/index.ts
+++ b/src/api/workflow/definition/index.ts
@@ -65,9 +65,9 @@ export const deleteDefinition = (id: string | string[]) => {
* @param definitionId 流程定义id
* @returns
*/
-export const updateDefinitionState = (definitionId: string) => {
+export const updateDefinitionState = (definitionId: string, activityStatus: boolean) => {
return request({
- url: `/workflow/definition/updateDefinitionState/${definitionId}`,
+ url: `/workflow/definition/updateDefinitionState/${definitionId}/${activityStatus}`,
method: 'put'
});
};
diff --git a/src/api/workflow/definition/types.ts b/src/api/workflow/definition/types.ts
index 84a3a28..d30cb25 100644
--- a/src/api/workflow/definition/types.ts
+++ b/src/api/workflow/definition/types.ts
@@ -12,6 +12,7 @@ export interface FlowDefinitionVo extends BaseEntity {
flowCode: string;
version: string;
isPublish: number;
+ activityStatus: boolean;
createTime: Date;
updateTime: Date;
wfDefinitionConfigVo: DefinitionConfigVO;
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 0f09949..62fff66 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -59,24 +59,19 @@
v{{ scope.row.version }}.0
-
+
- {{ scope.row.resourceName }}
+ 挂起
+ 激活
-
-
- {{ scope.row.diagramResourceName }}
-
-
-
+
未发布
已发布
失效
-
@@ -92,10 +87,10 @@
link
type="primary"
size="small"
- :icon="scope.row.suspensionState === 1 ? 'Lock' : 'Unlock'"
+ :icon="!scope.row.activityStatus ? 'Lock' : 'Unlock'"
@click="handleProcessDefState(scope.row)"
>
- {{ scope.row.suspensionState === 1 ? '挂起流程' : '激活流程' }}
+ {{ scope.row.activityStatus ? '挂起流程' : '激活流程' }}
@@ -109,16 +104,13 @@
历史版本
-
- 删除
-
- 转换模型
+ 绑定业务
- 绑定业务
+ 删除
@@ -179,16 +171,12 @@
v{{ scope.row.version }}.0
-
未发布
@@ -205,15 +193,17 @@
link
type="primary"
size="small"
- :icon="scope.row.suspensionState === 1 ? 'Lock' : 'Unlock'"
+ :icon="!scope.row.activityStatus ? 'Lock' : 'Unlock'"
@click="handleProcessDefState(scope.row)"
>
- {{ scope.row.suspensionState === 1 ? '挂起流程' : '激活流程' }}
+ {{ scope.row.activityStatus ? '挂起流程' : '激活流程' }}
绑定业务
+
+
取消发布
-
-
-
- 转换模型
-
删除
@@ -341,8 +326,8 @@ const queryParams = ref({
pageSize: 10,
name: undefined,
key: undefined,
- categoryCode: undefined,
- isPublish: 1
+ categoryCode: undefined
+ // isPublish: 1
});
onMounted(() => {
@@ -467,24 +452,17 @@ const handleUnPublish = async (row?: FlowDefinitionVo) => {
/** 挂起/激活 */
const handleProcessDefState = async (row: FlowDefinitionVo) => {
let msg: string;
- if (row.suspensionState === 1) {
- msg = `暂停后，此流程下的所有任务都不允许往后流转，您确定挂起【${row.name || row.key}】吗？`;
+ if (row.activityStatus) {
+ msg = `暂停后，此流程下的所有任务都不允许往后流转，您确定挂起【${row.flowName || row.flowCode}】吗？`;
} else {
- msg = `启动后，此流程下的所有任务都允许往后流转，您确定激活【${row.name || row.key}】吗？`;
+ msg = `启动后，此流程下的所有任务都允许往后流转，您确定激活【${row.flowName || row.flowCode}】吗？`;
}
await proxy?.$modal.confirm(msg);
loading.value = true;
- await updateDefinitionState(row.id).finally(() => (loading.value = false));
+ await updateDefinitionState(row.id, row.activityStatus).finally(() => (loading.value = false));
await getList();
proxy?.$modal.msgSuccess('操作成功');
};
-/** 流程定义转换为模型 */
-const handleConvertToModel = async (row: FlowDefinitionVo) => {
- await proxy?.$modal.confirm('是否确认转换流程定义key为【' + row.key + '】的数据项？');
- await convertToModel(row.id).finally(() => (loading.value = false));
- getList();
- proxy?.$modal.msgSuccess('操作成功');
-};
//上传文件前的钩子
const handlerBeforeUpload = () => {