From 08038c5e370af58687e69cda44af1b99f177f5ef Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 03 八月 2023 10:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/api/work/process.js | 6 +++---
Source/UBCS-WEB/src/views/work/process/leave/detail.vue | 2 +-
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 2 +-
Source/UBCS-WEB/src/router/views/index.js | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/work/process.js b/Source/UBCS-WEB/src/api/work/process.js
index 5eb0a95..4c0a27b 100644
--- a/Source/UBCS-WEB/src/api/work/process.js
+++ b/Source/UBCS-WEB/src/api/work/process.js
@@ -23,13 +23,13 @@
})
}
-export const leaveDetail = (businessId) => {
+export const leaveDetail = (businessId,processInstanceId) => {
return request({
url: '/api/ubcs-desk/process/leave/detail',
method: 'get',
params: {
- businessId
-
+ businessId,
+ processInstanceId
}
})
}
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 10d9680..767e02d 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -558,7 +558,7 @@
value: formItem.defaultValue,
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
- tip: formItem.explain,
+ tip: formItem.tooltips,
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
diff --git a/Source/UBCS-WEB/src/router/views/index.js b/Source/UBCS-WEB/src/router/views/index.js
index 383242e..8c6a0e4 100644
--- a/Source/UBCS-WEB/src/router/views/index.js
+++ b/Source/UBCS-WEB/src/router/views/index.js
@@ -80,7 +80,7 @@
redirect: '/work/process/leave/form',
children: [{
path: 'form/:processDefinitionId',
- name: '璇峰亣娴佺▼',
+ name: '鍙戝竷娴佺▼',
meta: {
i18n: 'work'
},
@@ -88,7 +88,7 @@
import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
}, {
path: 'handle/:taskId/:processInstanceId/:businessId',
- name: '澶勭悊璇峰亣娴佺▼',
+ name: '澶勭悊鍙戝竷娴佺▼',
meta: {
i18n: 'work'
},
@@ -96,7 +96,7 @@
import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
}, {
path: 'detail/:processInstanceId/:businessId',
- name: '璇峰亣娴佺▼璇︽儏',
+ name: '鍙戝竷娴佺▼璇︽儏',
meta: {
i18n: 'work'
},
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/detail.vue b/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
index 9dc6b12..ac6c335 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
@@ -91,7 +91,7 @@
this.flowList = data.data;
}
})
- leaveDetail(this.businessId).then(res => {
+ leaveDetail(this.businessId,this.processInstanceId).then(res => {
const data = res.data;
if (data.success) {
this.form = data.data;
--
Gitblit v1.9.3