From f203421ff763d29a4b9c73539e197f098fa55637 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Mon, 25 Apr 2022 22:23:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?=
=?UTF-8?q?=E6=B5=81=E6=A8=A1=E5=9D=97=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=8A=A5?=
=?UTF-8?q?=E9=94=99=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E6=9D=A1=E7=9B=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/workflow/definition/index.vue | 17 +++++++++--------
ruoyi-ui/src/views/workflow/work/index.vue | 17 +++++++----------
ruoyi-ui/src/views/workflow/work/own.vue | 17 +++++++++--------
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/views/workflow/definition/index.vue b/ruoyi-ui/src/views/workflow/definition/index.vue
index 2f877a9e..c254b4d6 100644
--- a/ruoyi-ui/src/views/workflow/definition/index.vue
+++ b/ruoyi-ui/src/views/workflow/definition/index.vue
@@ -79,11 +79,7 @@
-
-
- {{ categoryOptions.find(k => k.code === scope.row.category).categoryName }}
-
-
+
@@ -425,12 +421,14 @@ export default {
};
},
created() {
- listCategory().then(response => {
- this.categoryOptions = response.rows
- })
+ this.getCategoryList();
this.getList();
},
methods: {
+ /** 查询流程分类列表 */
+ getCategoryList() {
+ listCategory().then(response => this.categoryOptions = response.rows)
+ },
/** 查询流程定义列表 */
getList() {
this.loading = true;
@@ -640,6 +638,9 @@ export default {
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
+ },
+ categoryFormat(row, column) {
+ return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
}
}
};
diff --git a/ruoyi-ui/src/views/workflow/work/index.vue b/ruoyi-ui/src/views/workflow/work/index.vue
index 49d70ffa..2f4d93eb 100644
--- a/ruoyi-ui/src/views/workflow/work/index.vue
+++ b/ruoyi-ui/src/views/workflow/work/index.vue
@@ -36,11 +36,7 @@
-
-
- {{ categoryOptions.find(k => k.code === scope.row.category).categoryName }}
-
-
+
v{{ scope.row.version }}
@@ -121,15 +117,13 @@ export default {
}
},
created() {
- this.getTreeselect();
+ this.getCategoryList();
this.getList();
},
methods: {
/** 查询流程分类列表 */
- getTreeselect() {
- listCategory().then(response => {
- this.categoryOptions = response.rows;
- })
+ getCategoryList() {
+ listCategory().then(response => this.categoryOptions = response.rows)
},
/** 查询流程定义列表 */
getList() {
@@ -168,6 +162,9 @@ export default {
deployId: row.deploymentId,
}
})
+ },
+ categoryFormat(row, column) {
+ return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
}
}
}
diff --git a/ruoyi-ui/src/views/workflow/work/own.vue b/ruoyi-ui/src/views/workflow/work/own.vue
index 7a90893b..941da5c3 100644
--- a/ruoyi-ui/src/views/workflow/work/own.vue
+++ b/ruoyi-ui/src/views/workflow/work/own.vue
@@ -51,11 +51,7 @@
-
-
- {{ categoryOptions.find(k => k.code === scope.row.category).categoryName }}
-
-
+
v{{ scope.row.procDefVersion }}
@@ -163,12 +159,14 @@ export default {
};
},
created() {
- listCategory().then(response => {
- this.categoryOptions = response.rows
- })
+ this.getCategoryList();
this.getList();
},
methods: {
+ /** 查询流程分类列表 */
+ getCategoryList() {
+ listCategory().then(response => this.categoryOptions = response.rows)
+ },
/** 查询流程定义列表 */
getList() {
this.loading = true;
@@ -263,6 +261,9 @@ export default {
}).then(response => {
this.download(response.msg);
})
+ },
+ categoryFormat(row, column) {
+ return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
}
}
};