diff --git a/back/src/components/ren-process-detail/src/ren-process-detail.vue b/back/src/components/ren-process-detail/src/ren-process-detail.vue index 6215354e..860655f2 100644 --- a/back/src/components/ren-process-detail/src/ren-process-detail.vue +++ b/back/src/components/ren-process-detail/src/ren-process-detail.vue @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 16:30:04 * @LastEditors: Light - * @LastEditTime: 2022-10-26 11:05:07 + * @LastEditTime: 2022-12-13 11:10:46 * @Description: 告诉大家这是什么 --> @@ -103,7 +103,7 @@ export default { padding-left: 20px; color: #212121; font-size: 16px; - margin-bottom: 10px; + margin-bottom: 10px; margin-top: 10px; background: url("~@/assets/img/biaoti.png") no-repeat; background-position-y: 2px; diff --git a/back/src/views/modules/activiti/my-join-task.vue b/back/src/views/modules/activiti/my-join-task.vue index 1e5731c0..0772b1a5 100644 --- a/back/src/views/modules/activiti/my-join-task.vue +++ b/back/src/views/modules/activiti/my-join-task.vue @@ -109,31 +109,31 @@ diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue index 9733e857..0b2fbbc3 100644 --- a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue +++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue @@ -115,7 +115,7 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/act/his/getMyHandledInstancePage', + getDataListURL: '/act/his/getMyHandledInstancePage?ended=1', getDataListIsPage: true, deleteIsBatch: true, deleteIsBatchKey: 'deploymentId' diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue index 1b54ab9b..a2eb4a62 100644 --- a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue +++ b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue @@ -115,7 +115,7 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/act/his/getMyHandledInstancePage', + getDataListURL: '/act/his/getMyHandledInstancePage?ended=1', getDataListIsPage: true, deleteIsBatch: true, deleteIsBatchKey: 'deploymentId' diff --git a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue index be222352..f0aebf5b 100644 --- a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue +++ b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue @@ -115,7 +115,7 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/act/his/getMyHandledInstancePage', + getDataListURL: '/act/his/getMyHandledInstancePage?ended=1', getDataListIsPage: true, deleteIsBatch: true, deleteIsBatchKey: 'deploymentId' diff --git a/back/src/views/modules/hasToDoTasks/CommentModeration.vue b/back/src/views/modules/hasToDoTasks/CommentModeration.vue index cbb0d0fb..9f9597ae 100644 --- a/back/src/views/modules/hasToDoTasks/CommentModeration.vue +++ b/back/src/views/modules/hasToDoTasks/CommentModeration.vue @@ -115,7 +115,7 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/act/his/getMyHandledInstancePage', + getDataListURL: '/act/his/getMyHandledInstancePage?ended=1', getDataListIsPage: true, deleteIsBatch: true, deleteIsBatchKey: 'deploymentId' diff --git a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue index 26de944d..99bc8075 100644 --- a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue +++ b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue @@ -116,7 +116,7 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/act/his/getMyHandledInstancePage', + getDataListURL: '/act/his/getMyHandledInstancePage?ended=1', getDataListIsPage: true, deleteIsBatch: true, deleteIsBatchKey: 'deploymentId' diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index 6c11bf07..db89b9e5 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -90,7 +90,7 @@ export default { created () { bus.$off('workInit') bus.$on('workInit', () => { - console.log("刷新工作台===================") + console.log('刷新工作台===================') this.getToDo() this.getHasToDo() }) @@ -140,7 +140,7 @@ export default { // page: 1 // } this.loadingHasToDo = true - this.$http.get('/act/his/getMyHandledInstancePage?page=1&limit=5').then(res => { + this.$http.get('/act/his/getMyHandledInstancePage?ended=1?page=1&limit=5').then(res => { this.loadingHasToDo = false this.hasToDodoData.list = res.data.data.list || [] this.hasToDodoData.num = res.data.data.total || 0 diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 07c76a49..4be62503 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -220,13 +220,13 @@ 联系方式
- +