From ec3add985f600fe56a7232484bbe89a11b73c23b Mon Sep 17 00:00:00 2001
From: wanghong <309858992@qq.com>
Date: 星期四, 21 十二月 2023 12:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 83 +++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 40 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 c63ebc4..ba5684a 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>
@@ -58,7 +53,7 @@
<el-button v-if="!isRefuse" type="primary" size="mini" @click="handelAgree">鍚屾剰</el-button>
<el-button v-if="!isAgree" type="primary" size="mini" @click="handelRefuse">涓嶅悓鎰�</el-button> -->
<el-button type="primary" size="mini" @click="handelExecute(item)" v-for="(item, index) in btnList"
- :key="index">{{ item.toName === '鍚屾剰' ? item.toName : `${item.toName}鍒�${item.taskName}` }}</el-button>
+ :key="index">{{ item.toName }}</el-button>
<!-- <el-button v-if="isRefuse" type="primary" size="mini" @click="handelExecute">鎵ц</el-button> -->
</div>
</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) {
@@ -146,9 +141,10 @@
this.templateId=res.data.variables.templateId;
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;
}
},
@@ -164,7 +160,6 @@
}
},
handelExecute(event) {
- console.log(event)
if(this.$refs.businesswork.hasEditor){
this.$refs.businesswork.HandlerSave()
}
@@ -196,40 +191,48 @@
}
</script>
<style lang="scss" scoped>
-.dialogwarp {
- display: -webkit-box;
- display: -ms-flexbox;
- display: flex;
- justify-content: space-between;
- height: 85vh;
+ .dialogwarp {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ justify-content: space-between;
+ height: 85vh;
- &_tab {
- width: 79%;
+ &_tab {
+ width: 79%;
+
+ &_card {
+ width: 100%;
+ height: 100%;
+ }
+ }
&_card {
- width: 100%;
- height: 100%;
+ // margin-left: 20px;
+ width: 20%;
}
}
- &_card {
- // margin-left: 20px;
- width: 20%;
+ ::v-deep {
+ .el-upload {
+ width: 100%;
+ height: 120px;
+ }
+ .el-upload-dragger {
+ width: 100%;
+ height: 120px;
+ }
+ .el-upload-dragger .el-icon-upload {
+ margin: 15px 0 16px;
+ }
}
-}
-::v-deep(.el-upload) {
- width: 100%;
- height: 120px;
-}
-
-::v-deep(.el-upload-dragger) {
- width: 100%;
- height: 120px;
-}
-
-::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