Commit d0a59f7ef16414f8a72882bda4865e4c01daf626
1 parent
f0b75834
#人事审批流程图获取
Showing
2 changed files
with
10 additions
and
3 deletions
yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue
| @@ -54,8 +54,7 @@ | @@ -54,8 +54,7 @@ | ||
| 54 | </el-steps> | 54 | </el-steps> |
| 55 | </el-tab-pane> | 55 | </el-tab-pane> |
| 56 | <el-tab-pane label="流程图"> | 56 | <el-tab-pane label="流程图"> |
| 57 | - <!-- TODO 云扬四海 svg 要如何展示 --> | ||
| 58 | - 流程图-TODO | 57 | + <div v-html="highlightSvgUrl"></div> |
| 59 | </el-tab-pane> | 58 | </el-tab-pane> |
| 60 | </el-tabs> | 59 | </el-tabs> |
| 61 | 60 | ||
| @@ -98,6 +97,7 @@ export default { | @@ -98,6 +97,7 @@ export default { | ||
| 98 | label: '不同意' | 97 | label: '不同意' |
| 99 | } | 98 | } |
| 100 | ], | 99 | ], |
| 100 | + highlightSvgUrl: "", | ||
| 101 | statusFormat(row, column) { | 101 | statusFormat(row, column) { |
| 102 | return getDictDataLabel(DICT_TYPE.OA_LEAVE_STATUS, row.status) | 102 | return getDictDataLabel(DICT_TYPE.OA_LEAVE_STATUS, row.status) |
| 103 | }, | 103 | }, |
| @@ -145,8 +145,15 @@ export default { | @@ -145,8 +145,15 @@ export default { | ||
| 145 | this.leaveApprove.taskId = taskId; | 145 | this.leaveApprove.taskId = taskId; |
| 146 | this.leaveApprove.processInstanceId = this.$route.query.processInstanceId; | 146 | this.leaveApprove.processInstanceId = this.$route.query.processInstanceId; |
| 147 | this.getForm(businessKey); | 147 | this.getForm(businessKey); |
| 148 | + this.getHighlightImg(this.leaveApprove.processInstanceId); | ||
| 148 | }, | 149 | }, |
| 149 | methods: { | 150 | methods: { |
| 151 | + getHighlightImg(processInstanceId){ | ||
| 152 | + getHighlightImg(processInstanceId).then(response => { | ||
| 153 | + console.log(response) | ||
| 154 | + this.highlightSvgUrl = response | ||
| 155 | + }) | ||
| 156 | + }, | ||
| 150 | /** 提交按钮 */ | 157 | /** 提交按钮 */ |
| 151 | submitForm() { | 158 | submitForm() { |
| 152 | this.$refs["taskForm"].validate(valid => { | 159 | this.$refs["taskForm"].validate(valid => { |
| @@ -180,7 +187,6 @@ export default { | @@ -180,7 +187,6 @@ export default { | ||
| 180 | taskSteps(data).then(response => { | 187 | taskSteps(data).then(response => { |
| 181 | this.handleTask = response.data; | 188 | this.handleTask = response.data; |
| 182 | }); | 189 | }); |
| 183 | - getHighlightImg(this.leaveApprove.processInstanceId); | ||
| 184 | }, | 190 | }, |
| 185 | approveChange(){ | 191 | approveChange(){ |
| 186 | if (this.leaveApprove.approved === 1) { | 192 | if (this.leaveApprove.approved === 1) { |
yudao-admin-ui/src/views/oa/leave/index.vue
| @@ -358,6 +358,7 @@ export default { | @@ -358,6 +358,7 @@ export default { | ||
| 358 | }, | 358 | }, |
| 359 | /** 审批进度 */ | 359 | /** 审批进度 */ |
| 360 | handleStep(row) { | 360 | handleStep(row) { |
| 361 | + const that = this; | ||
| 361 | const id = row.processInstanceId; | 362 | const id = row.processInstanceId; |
| 362 | processHistorySteps(id).then(response => { | 363 | processHistorySteps(id).then(response => { |
| 363 | this.handleTask.historyTask = response.data; | 364 | this.handleTask.historyTask = response.data; |