Merge remote-tracking branch 'origin/master'

 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
    }
  })
}

 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,

 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'
    },

 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;