diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index f3f02e2a..74fc2a7c 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -2,13 +2,12 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-29 15:59:51 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-29 17:21:00 + * @LastEditTime: 2022-06-29 18:17:07 * @Description: 告诉大家这是什么 --> @@ -82,7 +81,7 @@ import processModule from '@/mixins/process-module' import debounce from 'lodash/debounce' import qs from 'qs' -import RenProcessDetailImport from '@/components/ren-process-detail/src/ren-process-detail-import' +import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail' export default { // 注入公共方法 mixins: [processModule], @@ -142,7 +141,7 @@ export default { // } }, components: { - RenProcessDetailImport + RenProcessDetail }, methods: { init () { diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 83566908..faed5074 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -150,6 +150,16 @@ export function nengliziyuanshangjiaapply(params) { params, }) } +export function getTaskVariables(params) { + return request({ + url: + '/act/task/getTaskVariables?taskId=' + + params.taskId + + '&variableName=tAbilityApplicationDTOList', + method: 'get', + params, + }) +} // 能力下架申请 export function undercarriage(data) { return request({ diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue index 806f5719..ab3d9294 100644 --- a/front/src/views/personalCenter/components/ApplyDetails.vue +++ b/front/src/views/personalCenter/components/ApplyDetails.vue @@ -509,6 +509,7 @@ getTaskHandleDetailInfo, getDemandForm, nengliziyuanshangjiaapply, + getTaskVariables, } from '@/api/personalCenter' import { selectOneDel } from '@/api/home' const downloadFile = (path, name) => { @@ -593,6 +594,12 @@ resourceId: { type: String, default: null }, }) const getInfo = () => { + console.log(props.processInstanceId, '============================') + if (props.processDefinitionName == '能力申请') { + getTaskVariables({ taskId: props.processInstanceId }).then((res) => { + console.log('获取数据====================>', res.data.data) + }) + } if (props.processDefinitionName == '能力申请流程') { getApplyForm(props.businessKey).then((res) => { const { data } = res.data @@ -662,6 +669,7 @@ }) const getResourceURL = () => { + console.log('111111111111111111111111111111', Cookies.get('token')) const params = qs.stringify({ token: Cookies.get('token'), // processInstanceId: this.dataForm.processInstanceId diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 8fa64659..dfa3d105 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -60,7 +60,7 @@

审核结果:{{ - item.ended ? '审核完成' : item.backToFirst ? '被驳回' : '审核中' + item.ended ? '审核完成' : item.backToFirst ? '被终止' : '审核中' }}

@@ -95,10 +95,16 @@
-
查看流程
-
- 修改 +
+ 查看流程
+