From 5a9b31f9dbd1ce22fe385f624a833228f01f319c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 17 八月 2023 16:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
index 4ead723..83d8e01 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -5,19 +5,14 @@
<el-card class="dialogwarp_tab_card">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="涓氬姟鏁版嵁淇℃伅" name="first">
- <businesswork ref="businesswork":ids="ids" :templateId="templateId" :taskId="taskId" :modelKey="modelKey" :codeClassifyOid="codeClassifyOid"></businesswork>
+ <businesswork ref="businesswork" :ids="ids" :templateId="templateId" :taskId="taskId" :modelKey="modelKey" :codeClassifyOid="codeClassifyOid" :stageAttrs="stageAttrs"></businesswork>
</el-tab-pane>
<el-tab-pane label="娴佺▼璺熻釜" name="second">
<avue-crud :data="flowList" :option="option" ref="crud">
</avue-crud>
- <el-card shadow="hover">
- <div slot="header">
- <span>娴佺▼璺熻釜</span>
- </div>
- <el-row class="row-bg">
- <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
- </el-row>
- </el-card>
+ <el-row class="row-bg" style="margin-top: 20px">
+ <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
+ </el-row>
</el-tab-pane>
</el-tabs>
</el-card>
@@ -82,6 +77,7 @@
codeClassifyOid:'',
businessId: '',
processInstanceId: '',
+ stageAttrs:[],
src: '',
flowList: [],
btnList: [],
@@ -136,7 +132,6 @@
this.apiGetBtnTask(this.processInstanceId)
},
formatterPass(row, value, column) {
- console.log('value',value)
return value?'鍚屾剰':'椹冲洖'
},
async apiGetBtnTask(id) {
@@ -147,9 +142,9 @@
this.modelKey=res.data.variables.modelKey;
this.codeClassifyOid=res.data.variables.codeClassifyOid;
this.title=res.data.variables.processName;
+ this.stageAttrs=res.data.stageAttrs;
//this.taskId=res.data.variables.taskId;
if (res.success) {
- console.log(res)
this.btnList = res.data.toTasks;
}
},
@@ -165,7 +160,6 @@
}
},
handelExecute(event) {
- console.log(event)
if(this.$refs.businesswork.hasEditor){
this.$refs.businesswork.HandlerSave()
}
@@ -233,4 +227,11 @@
::v-deep(.el-upload-dragger .el-icon-upload) {
margin: 15px 0 16px;
}
+.el-tab-pane{
+ height: 75vh;
+ overflow: auto;
+}
+.el-button{
+ margin:0 10px 10px 0;
+}
</style>
--
Gitblit v1.9.3