From 2ab725f7c48945cf134cbb30bade9ea6a644a71d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 一月 2024 15:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/FlowPath.vue | 2 +-
Source/UBCS-WEB/src/components/template/Stage.vue | 3 +--
Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
index 1a0018d..5886b02 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
@@ -34,7 +34,7 @@
prop: 'tab3',
}]
},
- checkStatus:false,//鏄惁闇�瑕侀獙璇佹ā鏉跨姸鎬�,
+ checkStatus:false,//鏄惁闇�瑕侀獙璇佹ā鏉跨姸鎬�,false涓哄叧闂潈闄�
}
},
created() {
diff --git a/Source/UBCS-WEB/src/components/template/FlowPath.vue b/Source/UBCS-WEB/src/components/template/FlowPath.vue
index f5cfaee..dd5cdac 100644
--- a/Source/UBCS-WEB/src/components/template/FlowPath.vue
+++ b/Source/UBCS-WEB/src/components/template/FlowPath.vue
@@ -47,7 +47,7 @@
startData: [],
form: {},
option: {
- height: 'auto',
+ height: 285,
border: true,
align: 'center',
menu: !this.checkStatus || this.crudLCStatus == 'Editing',
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index 508d8fb..3d897db 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -55,7 +55,6 @@
},
data() {
const options = {
- height: "auto",
border: true,
addBtn: false,
align: 'center',
@@ -111,7 +110,7 @@
],
option: {
...options,
- height: 'auto',
+ height: 330,
column: [
{label: '妯℃澘缂栧彿', prop: 'modelKey'},
{label: '妯℃澘鍚嶇О', prop: 'modelName'},
--
Gitblit v1.9.3