From 40a75dae3182cb55b30a2e8093c5eed82465f59c Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期一, 15 四月 2024 10:40:33 +0800
Subject: [PATCH] fix 修复代码缩进.
---
src/views/workflow/task/allTaskWaiting.vue | 76 ++++++------
src/views/workflow/task/taskFinish.vue | 8
src/views/workflow/task/taskWaiting.vue | 40 ++++-
src/views/workflow/processInstance/index.vue | 12 +-
src/views/workflow/leave/index.vue | 38 +++---
src/views/workflow/formManage/index.vue | 116 +++++++++----------
src/views/workflow/task/myDocument.vue | 28 +---
src/views/workflow/task/taskCopyList.vue | 15 +-
src/views/workflow/model/index.vue | 18 +-
9 files changed, 178 insertions(+), 173 deletions(-)
diff --git a/src/views/workflow/formManage/index.vue b/src/views/workflow/formManage/index.vue
index 752f77d..feed99a 100644
--- a/src/views/workflow/formManage/index.vue
+++ b/src/views/workflow/formManage/index.vue
@@ -1,8 +1,8 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="search" v-show="showSearch">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <div v-show="showSearch" class="search">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="琛ㄥ崟鍚嶇О" prop="formName">
<el-input v-model="queryParams.formName" placeholder="璇疯緭鍏ヨ〃鍗曞悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
</el-form-item>
@@ -18,18 +18,22 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['workflow:formManage:add']">鏂板</el-button>
+ <el-button v-hasPermi="['workflow:formManage:add']" type="primary" plain icon="Plus" @click="handleAdd">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['workflow:formManage:edit']">淇敼</el-button>
+ <el-button v-hasPermi="['workflow:formManage:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+ >淇敼</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['workflow:formManage:remove']">鍒犻櫎</el-button>
+ <el-button v-hasPermi="['workflow:formManage:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+ >鍒犻櫎</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['workflow:formManage:export']">瀵煎嚭</el-button>
+ <el-button v-hasPermi="['workflow:formManage:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
@@ -46,46 +50,40 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="淇敼" placement="top">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['workflow:formManage:edit']"></el-button>
+ <el-button v-hasPermi="['workflow:formManage:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="鍒犻櫎" placement="top">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['workflow:formManage:remove']"></el-button>
+ <el-button v-hasPermi="['workflow:formManage:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
</el-card>
<!-- 娣诲姞鎴栦慨鏀硅〃鍗曠鐞嗗璇濇 -->
- <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
<el-form ref="formManageFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="琛ㄥ崟鍚嶇О" prop="formName">
<el-input v-model="form.formName" placeholder="璇疯緭鍏ヨ〃鍗曞悕绉�" />
</el-form-item>
<el-form-item label="琛ㄥ崟绫诲瀷" prop="formType">
<el-radio-group v-model="form.formType" @change="form.router = ''">
- <el-radio border v-for="dict in wf_form_type" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in wf_form_type" :key="dict.value" border :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="璺敱鍦板潃" prop="router" v-if="form.formType === 'static'">
+ <el-form-item v-if="form.formType === 'static'" label="璺敱鍦板潃" prop="router">
<el-input v-model="form.router" placeholder="璇疯緭鍏ヨ矾鐢卞湴鍧�" />
</el-form-item>
- <el-form-item label="琛ㄥ崟" prop="router" v-else>
- <el-input v-model="form.router" disabled placeholder="璇烽�夋嫨琛ㄥ崟" >
+ <el-form-item v-else label="琛ㄥ崟" prop="router">
+ <el-input v-model="form.router" disabled placeholder="璇烽�夋嫨琛ㄥ崟">
<template #append>
<el-button icon="Search" />
</template>
</el-input>
</el-form-item>
<el-form-item label="澶囨敞" prop="remork">
- <el-input v-model="form.remork" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.remork" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
</el-form>
<template #footer>
@@ -125,10 +123,10 @@
id: undefined,
formName: undefined,
formType: 'static',
- remork: undefined,
-}
+ remork: undefined
+};
const data = reactive<PageData<FormManageForm, FormManageQuery>>({
- form: {...initFormData},
+ form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -136,18 +134,10 @@
formType: undefined
},
rules: {
- id: [
- { required: true, message: "涓婚敭涓嶈兘涓虹┖", trigger: "blur" }
- ],
- formName: [
- { required: true, message: "琛ㄥ崟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
- ],
- formType: [
- { required: true, message: "琛ㄥ崟绫诲瀷涓嶈兘涓虹┖", trigger: "change" }
- ],
- router: [
- { required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
- ],
+ id: [{ required: true, message: '涓婚敭涓嶈兘涓虹┖', trigger: 'blur' }],
+ formName: [{ required: true, message: '琛ㄥ崟鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
+ formType: [{ required: true, message: '琛ㄥ崟绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }],
+ router: [{ required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }]
}
});
@@ -160,55 +150,55 @@
formManageList.value = res.rows;
total.value = res.total;
loading.value = false;
-}
+};
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
reset();
dialog.visible = false;
-}
+};
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = {...initFormData};
+ form.value = { ...initFormData };
formManageFormRef.value?.resetFields();
-}
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
-}
+};
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: FormManageVO[]) => {
- ids.value = selection.map(item => item.id);
+ ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
reset();
dialog.visible = true;
- dialog.title = "娣诲姞琛ㄥ崟绠＄悊";
-}
+ dialog.title = '娣诲姞琛ㄥ崟绠＄悊';
+};
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row?: FormManageVO) => {
reset();
- const _id = row?.id || ids.value[0]
+ const _id = row?.id || ids.value[0];
const res = await getFormManage(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
- dialog.title = "淇敼琛ㄥ崟绠＄悊";
-}
+ dialog.title = '淇敼琛ㄥ崟绠＄悊';
+};
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
@@ -216,32 +206,36 @@
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
- await updateFormManage(form.value).finally(() => buttonLoading.value = false);
+ await updateFormManage(form.value).finally(() => (buttonLoading.value = false));
} else {
- await addFormManage(form.value).finally(() => buttonLoading.value = false);
+ await addFormManage(form.value).finally(() => (buttonLoading.value = false));
}
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
dialog.visible = false;
await getList();
}
});
-}
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: FormManageVO) => {
const _ids = row?.id || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎琛ㄥ崟绠＄悊缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�').finally(() => loading.value = false);
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎琛ㄥ崟绠＄悊缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�').finally(() => (loading.value = false));
await delFormManage(_ids);
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
await getList();
-}
+};
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download('workflow/formManage/export', {
- ...queryParams.value
- }, `formManage_${new Date().getTime()}.xlsx`)
-}
+ proxy?.download(
+ 'workflow/formManage/export',
+ {
+ ...queryParams.value
+ },
+ `formManage_${new Date().getTime()}.xlsx`
+ );
+};
onMounted(() => {
getList();
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index c18eb3d..359ef72 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -80,7 +80,7 @@
>
<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-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">
@@ -131,7 +131,7 @@
const queryFormRef = ref<ElFormInstance>();
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
- form: { },
+ form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -176,35 +176,35 @@
proxy.$tab.closePage(proxy.$route);
proxy.$router.push(`/demo/leaveEdit/index/add/add`);
proxy.$router.push({
- path: `/demo/leaveEdit/index`,
- query: {
- type: 'add'
- }
- })
+ path: `/demo/leaveEdit/index`,
+ query: {
+ type: 'add'
+ }
+ });
};
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: LeaveVO) => {
proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
- path: `/demo/leaveEdit/index`,
- query: {
- id: row.id,
- type: 'update'
- }
- })
+ path: `/demo/leaveEdit/index`,
+ query: {
+ id: row.id,
+ type: 'update'
+ }
+ });
};
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
const handleView = (row?: LeaveVO) => {
proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
- path: `/demo/leaveEdit/index`,
- query: {
- id: row.id,
- type: 'view'
- }
- })
+ path: `/demo/leaveEdit/index`,
+ query: {
+ id: row.id,
+ type: 'view'
+ }
+ });
};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
diff --git a/src/views/workflow/model/index.vue b/src/views/workflow/model/index.vue
index e5cff45..c8c9271 100644
--- a/src/views/workflow/model/index.vue
+++ b/src/views/workflow/model/index.vue
@@ -57,7 +57,7 @@
</el-row>
</template>
- <el-table border v-loading="loading" :data="modelList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="modelList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed align="center" type="index" label="搴忓彿" width="80"></el-table-column>
<el-table-column align="center" :show-overflow-tooltip="true" prop="name" label="妯″瀷鍚嶇О" width="200"></el-table-column>
@@ -85,9 +85,7 @@
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button link type="primary" size="small" icon="CopyDocument" @click="handleCopy(scope.row)">
- 澶嶅埗妯″瀷
- </el-button>
+ <el-button link type="primary" size="small" icon="CopyDocument" @click="handleCopy(scope.row)"> 澶嶅埗妯″瀷 </el-button>
</el-col>
</el-row>
</template>
@@ -144,7 +142,7 @@
import { listModel, addModel, delModel, modelDeploy, getInfo, update } from '@/api/workflow/model';
import { ModelQuery, ModelForm, ModelVO } from '@/api/workflow/model/types';
import { listCategory } from '@/api/workflow/category';
-import { copyModel } from '@/api/workflow/model/index';
+import { copyModel } from '@/api/workflow/model';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -303,7 +301,7 @@
nextTick(async () => {
await getTreeselect();
form.value = { ...initFormData };
- form.value.id = row.id
+ form.value.id = row.id;
dialog.visible = true;
});
};
@@ -313,14 +311,14 @@
formRef.value.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
- if('copy' === billType.value){
+ if ('copy' === billType.value) {
await copyModel(form.value);
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
- }else if(ids.value && ids.value.length > 0 && 'update' === billType.value){
+ } else if (ids.value && ids.value.length > 0 && 'update' === billType.value) {
form.value.id = ids.value[0];
await update(form.value);
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
- }else {
+ } else {
initXml(form.value.key, form.value.name);
form.value.xml = xml.value;
await addModel(form.value);
@@ -350,7 +348,7 @@
};
// 瀵煎嚭娴佺▼妯″瀷
const clickExportZip = () => {
- proxy?.$download.zip('/workflow/model/export/zip/' + ids.value, "妯″瀷");
+ proxy?.$download.zip('/workflow/model/export/zip/' + ids.value, '妯″瀷');
};
/** 鏌ヨ娴佺▼鍒嗙被涓嬫媺鏍戠粨鏋� */
const getTreeselect = async () => {
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 4fed6ba..764ca2f 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -23,8 +23,8 @@
<div class="mb-[10px]">
<el-card shadow="hover" class="text-center">
<el-radio-group v-model="tab" @change="changeTab(tab)">
- <el-radio-button label="running">杩愯涓�</el-radio-button>
- <el-radio-button label="finish">宸插畬鎴�</el-radio-button>
+ <el-radio-button value="running">杩愯涓�</el-radio-button>
+ <el-radio-button value="finish">宸插畬鎴�</el-radio-button>
</el-radio-group>
</el-card>
</div>
@@ -61,7 +61,7 @@
<el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
<template #default="scope">
- <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+ <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
</template>
</el-table-column>
<el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
@@ -77,7 +77,7 @@
<el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
- </template>
+ </template>
</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>
@@ -304,7 +304,7 @@
proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
};
const changeTab = async (data: string) => {
- processInstanceList.value = []
+ processInstanceList.value = [];
queryParams.value.pageNum = 1;
if ('running' === data) {
getProcessInstanceRunningList();
@@ -361,7 +361,7 @@
taskId: row.id,
type: 'view'
});
- workflowCommon.routerJump(routerJumpVo,proxy)
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
onMounted(() => {
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 3adadf5..4fe4518 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -3,8 +3,8 @@
<div class="mb-[10px]">
<el-card shadow="hover" class="text-center">
<el-radio-group v-model="tab" @change="changeTab(tab)">
- <el-radio-button label="waiting">寰呭姙浠诲姟</el-radio-button>
- <el-radio-button label="finish">宸插姙浠诲姟</el-radio-button>
+ <el-radio-button value="waiting">寰呭姙浠诲姟</el-radio-button>
+ <el-radio-button value="finish">宸插姙浠诲姟</el-radio-button>
</el-radio-group>
</el-card>
</div>
@@ -42,9 +42,9 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
+ <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
<template #default="scope">
- <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+ <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
</template>
</el-table-column>
<el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
@@ -58,13 +58,13 @@
</template>
<template v-else>
<el-tag type="success">
- {{ scope.row.assigneeName || '鏃�'}}
+ {{ scope.row.assigneeName || '鏃�' }}
</el-tag>
</template>
</template>
<template v-else-if="tab === 'finish'" #default="scope">
<el-tag type="success">
- {{ scope.row.assigneeName || '鏃�'}}
+ {{ scope.row.assigneeName || '鏃�' }}
</el-tag>
</template>
</el-table-column>
@@ -74,8 +74,8 @@
<el-tag v-else type="success">宸插畬鎴�</el-tag>
</template>
</el-table-column>
- <el-table-column align="center" v-if="tab === 'waiting'" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
- <el-table-column align="center" v-if="tab === 'finish'" prop="startTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
+ <el-table-column v-if="tab === 'waiting'" align="center" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
+ <el-table-column v-if="tab === 'finish'" align="center" prop="startTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
<el-table-column label="鎿嶄綔" align="center" :width="tab === 'finish' ? '80' : '151'">
<template #default="scope">
<el-row :gutter="10" class="mb8">
@@ -86,7 +86,7 @@
<el-button link type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)">娴佺▼鍙橀噺</el-button>
</el-col>
</el-row>
- <el-row :gutter="10" class="mb8" v-if="scope.row.multiInstance" >
+ <el-row v-if="scope.row.multiInstance" :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button link type="primary" size="small" icon="Remove" @click="deleteMultiInstanceUser(scope.row)">鍑忕</el-button>
</el-col>
@@ -111,14 +111,18 @@
<UserSelect ref="userSelectRef" :multiple="false" @confirm-call-back="submitCallback"></UserSelect>
<!-- 娴佺▼鍙橀噺寮�濮� -->
<el-dialog v-model="variableVisible" draggable title="娴佺▼鍙橀噺" width="60%" :close-on-click-modal="false">
- <el-card class="box-card" v-loading="variableLoading">
- <div slot="header" class="clearfix">
- <span>娴佺▼瀹氫箟鍚嶇О锛�<el-tag>{{processDefinitionName}}</el-tag></span>
- </div>
- <div v-for="(v,index) in variableList" :key="index" >
- <el-form :label-position="'right'" v-if="v.key!=='_FLOWABLE_SKIP_EXPRESSION_ENABLED'" label-width="150px">
- <el-form-item :label="v.key+'锛�'">
- {{v.value}}
+ <el-card v-loading="variableLoading" class="box-card">
+ <template #header>
+ <div class="clearfix">
+ <span
+ >娴佺▼瀹氫箟鍚嶇О锛�<el-tag>{{ processDefinitionName }}</el-tag></span
+ >
+ </div>
+ </template>
+ <div v-for="(v, index) in variableList" :key="index">
+ <el-form v-if="v.key !== '_FLOWABLE_SKIP_EXPRESSION_ENABLED'" :label-position="'right'" label-width="150px">
+ <el-form-item :label="v.key + '锛�'">
+ {{ v.value }}
</el-form-item>
</el-form>
</div>
@@ -138,7 +142,7 @@
//瀹℃壒璁板綍缁勪欢
//鍔犵缁勪欢
const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
-//閫変汉缁勪欢
+//閫変汉缁勪欢
const userSelectRef = ref<InstanceType<typeof UserSelect>>();
const queryFormRef = ref<ElFormInstance>();
@@ -162,13 +166,13 @@
// 娴佺▼鍙橀噺鏄惁鏄剧ず
const variableVisible = ref(false);
const variableLoading = ref(true);
-// 娴佺▼鍙橀噺
+// 娴佺▼鍙橀噺
const variableList = ref<VariableVo>({
key: '',
- value: '',
-})
+ value: ''
+});
//娴佺▼瀹氫箟鍚嶇О
-const processDefinitionName = ref(undefined);
+const processDefinitionName = ref();
// 鏌ヨ鍙傛暟
const queryParams = ref<TaskQuery>({
pageNum: 1,
@@ -215,7 +219,7 @@
multiple.value = !selection.length;
};
const changeTab = async (data: string) => {
- taskList.value = []
+ taskList.value = [];
queryParams.value.pageNum = 1;
if ('waiting' === data) {
getWaitingList();
@@ -245,25 +249,25 @@
userSelectRef.value.open();
};
//淇敼鍔炵悊浜�
-const submitCallback = async (data) => {
- if(data && data.length > 0){
+const submitCallback = async (data) => {
+ if (data && data.length > 0) {
await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
loading.value = true;
- await updateAssignee(ids.value, data[0].userId)
- handleQuery()
+ await updateAssignee(ids.value, data[0].userId);
+ handleQuery();
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
- }else{
+ } else {
proxy?.$modal.msgWarning('璇烽�夋嫨鐢ㄦ埛锛�');
}
};
//鏌ヨ娴佺▼鍙橀噺
-const handleInstanceVariable = async (row: TaskVO) => {
- variableLoading.value = true
- variableVisible.value = true
- processDefinitionName.value = row.processDefinitionName
- let data = await getInstanceVariable(row.id)
- variableList.value = data.data
- variableLoading.value = false
+const handleInstanceVariable = async (row: TaskVO) => {
+ variableLoading.value = true;
+ variableVisible.value = true;
+ processDefinitionName.value = row.processDefinitionName;
+ let data = await getInstanceVariable(row.id);
+ variableList.value = data.data;
+ variableLoading.value = false;
};
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
const handleView = (row) => {
@@ -274,7 +278,7 @@
taskId: row.id,
type: 'view'
});
- workflowCommon.routerJump(routerJumpVo,proxy)
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
onMounted(() => {
getWaitingList();
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 01e0a30..e8592f8 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -46,9 +46,9 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column v-if="false" align="center" prop="id" label="id"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
+ <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
<template #default="scope">
- <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+ <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
</template>
</el-table-column>
<el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
@@ -64,36 +64,28 @@
<el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
- </template>
+ </template>
</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" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip
- v-if="
- scope.row.businessStatus === 'draft' ||
- scope.row.businessStatus === 'cancel' ||
- scope.row.businessStatus === 'back'
- "
+ v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
content="淇敼"
placement="top"
>
- <el-button v-hasPermi="['demo:leave:edit']" link type="primary" icon="Edit" @click="handleOpen(scope.row,'update')"></el-button>
+ <el-button v-hasPermi="['demo:leave:edit']" link type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')"></el-button>
</el-tooltip>
<el-tooltip
- v-if="
- scope.row.businessStatus === 'draft' ||
- scope.row.businessStatus === 'cancel' ||
- scope.row.businessStatus === 'back'
- "
+ v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
content="鍒犻櫎"
placement="top"
>
<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="handleOpen(scope.row,'view')"></el-button>
+ <el-tooltip placement="top" content="鏌ョ湅">
+ <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>
</el-tooltip>
<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>
@@ -256,7 +248,7 @@
};
//鍔炵悊
-const handleOpen = async (row,type) => {
+const handleOpen = async (row, type) => {
const routerJumpVo = reactive<RouterJumpVo>({
wfDefinitionConfigVo: row.wfDefinitionConfigVo,
wfNodeConfigVo: row.wfNodeConfigVo,
@@ -264,6 +256,6 @@
taskId: row.id,
type: type
});
- workflowCommon.routerJump(routerJumpVo,proxy)
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
</script>
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index 6eb07c9..1452576 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -31,9 +31,9 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
+ <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
<template #default="scope">
- <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+ <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
</template>
</el-table-column>
<el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
@@ -47,19 +47,19 @@
</template>
<template v-else>
<el-tag type="success">
- {{ scope.row.assigneeName || '鏃�'}}
+ {{ scope.row.assigneeName || '鏃�' }}
</el-tag>
</template>
</template>
</el-table-column>
<el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<template #default="scope">
- <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
+ <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200">
<template #default="scope">
- <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
+ <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
</template>
</el-table-column>
</el-table>
@@ -75,7 +75,7 @@
</template>
<script lang="ts" setup>
-import { getPageByTaskCopy} from '@/api/workflow/task';
+import { getPageByTaskCopy } from '@/api/workflow/task';
import { TaskQuery } from '@/api/workflow/task/types';
import workflowCommon from '@/api/workflow/workflowCommon';
import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
@@ -141,9 +141,8 @@
taskId: row.id,
type: 'view'
});
- workflowCommon.routerJump(routerJumpVo,proxy)
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
-
onMounted(() => {
getTaskCopyList();
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 4d47145..7c84487 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -31,9 +31,9 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
+ <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
<template #default="scope">
- <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+ <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
</template>
</el-table-column>
<el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
@@ -41,7 +41,7 @@
<el-table-column align="center" prop="assigneeName" label="鍔炵悊浜�">
<template #default="scope">
<el-tag type="success">
- {{ scope.row.assigneeName || '鏃�'}}
+ {{ scope.row.assigneeName || '鏃�' }}
</el-tag>
</template>
</el-table-column>
@@ -127,7 +127,7 @@
taskId: row.id,
type: 'view'
});
- workflowCommon.routerJump(routerJumpVo,proxy)
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
onMounted(() => {
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 746d33b..7bf7e29 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -27,13 +27,13 @@
<right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
</el-row>
</template>
-
+
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
+ <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
<template #default="scope">
- <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+ <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
</template>
</el-table-column>
<el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
@@ -54,18 +54,36 @@
</el-table-column>
<el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<template #default="scope">
- <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
+ <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200">
<template #default="scope">
- <el-button v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)"
- type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">鍔炵悊</el-button>
- <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === true"
- type="primary" size="small" icon="Document" @click="handleReturnTask(scope.row.id)">褰掕繕</el-button>
- <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === false"
- type="primary" size="small" icon="Document" @click="handleClaimTask(scope.row.id)">璁ら</el-button>
+ <el-button
+ v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)"
+ type="primary"
+ size="small"
+ icon="Edit"
+ @click="handleOpen(scope.row)"
+ >鍔炵悊</el-button
+ >
+ <el-button
+ v-if="scope.row.participantVo && scope.row.participantVo.claim === true"
+ type="primary"
+ size="small"
+ icon="Document"
+ @click="handleReturnTask(scope.row.id)"
+ >褰掕繕</el-button
+ >
+ <el-button
+ v-if="scope.row.participantVo && scope.row.participantVo.claim === false"
+ type="primary"
+ size="small"
+ icon="Document"
+ @click="handleClaimTask(scope.row.id)"
+ >璁ら</el-button
+ >
</template>
</el-table-column>
</el-table>
@@ -149,7 +167,7 @@
taskId: row.id,
type: 'approval'
});
- workflowCommon.routerJump(routerJumpVo,proxy)
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
/** 璁ら浠诲姟 */
--
Gitblit v1.9.3