From 3bcd305ef9408ae54f7ef62b8472d0813ae34333 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:53:44 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/components/template/Stage.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index 31ee7b5..3959152 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -8,7 +8,7 @@
@click="handleMaintenance(row, index)">缁存姢</el-button>
</template>
</avue-crud>
- <el-dialog title="妯℃澘闃舵" width="50%" append-to-body="true" :visible.sync="dialogNode">
+ <el-dialog title="妯℃澘闃舵" width="50%" append-to-body="true" :visible.sync="dialogNode">
<avue-crud ref="crud" :table-loading="loading" :data="stageData" :option="stageOption" @on-load="getStagelist"
@row-click="handleRowStageClick">
<template slot-scope="{type,size,row,index}" slot="menu">
@@ -106,6 +106,7 @@
},
stageOption: {
...options,
+ height:620,
column: [
{ label: '闃舵缂栧彿', prop: 'taskId' },
{ label: '闃舵鍚嶇О', prop: 'taskName' },
--
Gitblit v1.9.3