From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 ffcad37..1d81c3e 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -5,7 +5,7 @@
<el-card class="dialogwarp_tab_card">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="涓氬姟鏁版嵁淇℃伅" name="first">
- <businesswork :ids="ids" :templateId="templateId"></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">
@@ -78,8 +78,11 @@
ids:[],
templateId:'',
taskId: '',
+ modelKey:'',
+ codeClassifyOid:'',
businessId: '',
processInstanceId: '',
+ stageAttrs:[],
src: '',
flowList: [],
btnList: [],
@@ -142,9 +145,13 @@
const res = response.data
this.ids=res.data.variables.ids;
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
+ this.btnList = res.data.toTasks;
}
},
async apiExamineTask(param) {
@@ -159,7 +166,9 @@
}
},
handelExecute(event) {
- console.log(event)
+ if(this.$refs.businesswork.hasEditor){
+ this.$refs.businesswork.HandlerSave()
+ }
const { toName, conditionKey, conditionValue } = event
let param = {
comment: this.opinionVal || '鍚屾剰',
--
Gitblit v1.9.3