diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 8b8634bc..5bce2930 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51
* @LastEditors: Light
- * @LastEditTime: 2022-10-27 16:04:01
+ * @LastEditTime: 2022-11-01 15:00:19
* @Description: 告诉大家这是什么
-->
@@ -63,6 +63,7 @@
申请能力
+
{{deptName}}
-
@@ -157,6 +158,7 @@ export default {
content: {}
},
dataList: [],
+ deptName: '',
inputAgree: '',
inputNo: '',
agreeOrList: '同意'
@@ -228,6 +230,7 @@ export default {
})
},
showDialog (title) {
+ this.input = title
this.dialogVisible = true
this.dialogType = title
},
@@ -270,6 +273,7 @@ export default {
this.dataForm,
'elas============================'
)
+ this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name
this.$http
.get(
`/act/task/getTaskVariables?${params}&variableName=allowEntrust`
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 42474b96..57a235de 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1165,7 +1165,11 @@
res.data.data.map((val) => {
if (mapFlag && val.count != 0) {
mapFlag = false
- changeCards(val.type)
+ if (Cardsname.value === val.type) {
+ getAppResources2()
+ } else {
+ changeCards(val.type)
+ }
}
})
if (!mapFlag) {
diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index f9cd16ae..e4c93573 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -120,36 +120,43 @@
title: '任务名称',
dataIndex: 'activityName',
key: 'activityName',
+ width: '180px',
},
{
title: '处理部门',
dataIndex: 'assigneeDeptName',
key: 'assigneeDeptName',
+ width: '180px',
},
{
title: '处理人',
dataIndex: 'assigneeName',
key: 'assigneeName',
+ width: '180px',
},
{
title: '任务开始时间',
dataIndex: 'startTime',
key: 'startTime',
+ width: '180px',
},
{
title: '任务结束时间',
dataIndex: 'endTime',
key: 'endTime',
+ width: '180px',
},
{
title: '审核意见',
dataIndex: 'comment',
key: 'comment',
+ width: '180px',
},
{
title: '任务时长',
dataIndex: 'duration',
key: 'duration',
+ width: '180px',
},
]
const getInfo = () => {