diff --git a/src/views/office/copy.vue b/src/views/office/copy.vue index 11f75be..af807af 100644 --- a/src/views/office/copy.vue +++ b/src/views/office/copy.vue @@ -51,7 +51,7 @@ > @@ -103,8 +103,8 @@ diff --git a/src/views/office/detail.vue b/src/views/office/detail.vue index afa2ac8..61a4f74 100644 --- a/src/views/office/detail.vue +++ b/src/views/office/detail.vue @@ -270,7 +270,7 @@ placeholder="请输入部门名称" clearable size="small" - prefix-icon="el-icon-search" + prefix-icon="search" /> { userList.value = response.rows; total.value = response.total; @@ -509,9 +508,9 @@ function handleNodeClick(data) { } function setIcon(val) { if (val) { - return "el-icon-check"; + return "check"; } else { - return "el-icon-time"; + return "time"; } } function setColor(val) { diff --git a/src/views/office/finished.vue b/src/views/office/finished.vue index 8ac9ddc..3dd61fd 100644 --- a/src/views/office/finished.vue +++ b/src/views/office/finished.vue @@ -55,7 +55,7 @@ > @@ -138,8 +138,8 @@ @@ -149,6 +149,7 @@ import { listFinishedProcess } from "@/api/flowable/process"; import { revokeProcess } from "@/api/flowable/finished"; import { useRouter } from "vue-router"; import { ref, reactive, toRefs } from "vue"; +import { ElMessage, ElMessageBox } from "element-plus"; const queryFormRef = ref(); // 遮罩层 const loading = ref(true); @@ -165,10 +166,7 @@ const total = ref(0); // 已办任务列表数据 const finishedList = ref([]); // 弹出层标题 -const title = ref(""); // 是否显示弹出层 -const open = ref(false); -const src = ref(""); const data = reactive({ // 查询参数 @@ -190,7 +188,7 @@ const data = reactive({ // 表单校验 rules: {}, }); -const { queryParams, form, rules } = toRefs(data); +const { queryParams } = toRefs(data); /** 查询流程定义列表 */ function getList() { @@ -204,8 +202,8 @@ function getList() { /** 搜索按钮操作 */ function handleQuery() { - this.queryParams.pageNum = 1; - this.getList(); + queryParams.value.pageNum = 1; + getList(); } /** 重置按钮操作 */ function resetQuery() { @@ -240,24 +238,28 @@ function handleRevoke(row) { procInsId: row.procInsId, }; revokeProcess(params).then((res) => { - this.$modal.msgSuccess(res.msg); - this.getList(); + ElMessage.success(res.msg); + getList(); }); } /** 删除按钮操作 */ function handleDelete(row) { - const ids = row.id || this.ids; - this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) + const deleteIds = row.id || ids.value; + ElMessageBox.confirm( + '是否确认删除流程定义编号为"' + deleteIds + '"的数据项?', + "警告", + { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + } + ) .then(function () { - return delDeployment(ids); + return delDeployment(deleteIds); }) .then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); + getList(); + ElMessage.success("删除成功"); }); } defineExpose({ diff --git a/src/views/office/own.vue b/src/views/office/own.vue index c150eff..1e94600 100644 --- a/src/views/office/own.vue +++ b/src/views/office/own.vue @@ -188,7 +188,6 @@ import { ElMessage, ElMessageBox } from "element-plus"; const queryFormRef = ref(); // 遮罩层 const loading = ref(true); -const processLoading = ref(true); // 选中数组 const ids = ref([]); // 非单个禁用 @@ -200,15 +199,10 @@ const showSearch = ref(true); // 总条数 const total = ref(0); const categoryOptions = ref([]); -const processTotal = ref(0); // 我发起的流程列表数据 const ownProcessList = ref([]); // 弹出层标题 -const title = ref(""); // 是否显示弹出层 -const open = ref(false); -const src = ref(""); -const definitionList = ref([]); const data = reactive({ // 查询参数 queryParams: { @@ -229,7 +223,7 @@ const data = reactive({ // 表单校验 rules: {}, }); -const { queryParams, form, rules } = toRefs(data); +const { queryParams } = toRefs(data); /** 查询流程分类列表 */ function getCategoryList() { @@ -344,21 +338,3 @@ export default { }, }; - diff --git a/src/views/tool/build/JsonDrawer.vue b/src/views/tool/build/JsonDrawer.vue index 72ae1af..0da579c 100644 --- a/src/views/tool/build/JsonDrawer.vue +++ b/src/views/tool/build/JsonDrawer.vue @@ -150,7 +150,7 @@ export default {