From 95252d1f49fb218e0df83362ba53d150925cbbf1 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 13 Dec 2022 11:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E4=B8=8D=E5=88=B7=E6=96=B0=20=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E7=94=B3=E8=AF=B7=E8=A2=AB=E9=A9=B3=E5=9B=9E=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=A2=AB=E4=BF=AE=E6=94=B9=E4=BA=86=EF=BC=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=B8=BA=E9=99=84=E4=BB=B6=EF=BC=8C=E8=80=8C?= =?UTF-8?q?=E9=9D=9E=E5=8E=9F=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/ren-process-detail.vue | 4 +-- .../views/modules/activiti/my-join-task.vue | 28 +++++++-------- .../hasToDoTasks/AbilityResourceShelf.vue | 2 +- .../hasToDoTasks/AbilityResourcesRemoved.vue | 2 +- .../ApplicationForCompetencyRequirements.vue | 2 +- .../hasToDoTasks/CommentModeration.vue | 2 +- .../hasToDoTasks/CompetencyApplication.vue | 2 +- .../src/views/modules/workBench/workBench.vue | 4 +-- .../personalCenter/components/MyApply.vue | 19 +++++------ .../components/addApplication.vue | 34 ++++++++++++------- 10 files changed, 53 insertions(+), 46 deletions(-) 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: 告诉大家这是什么 --> 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 @@ 联系方式
查看详情
- + { - - cloudList.data = res.data.data.list - num.value = [] - total.value = res.data.data.total - } - ) + getZwyBusinessList(params).then((res) => { + cloudList.data = res.data.data.list + num.value = [] + total.value = res.data.data.total + }) } //查询政务云状态 const getCloudResource = () => { diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue index 0dbf351b..b89e39f4 100644 --- a/front/src/views/personalCenter/components/addApplication.vue +++ b/front/src/views/personalCenter/components/addApplication.vue @@ -255,7 +255,6 @@ import { useRouter } from 'vue-router' export default { - name: '', props: {}, components: { HomeHeader, @@ -296,7 +295,7 @@ fileList.value = [ { uid: res.data.data.id, - name: '附件', + name: res.data.data.enclosureName || '附件', staus: 'done', }, ] @@ -339,6 +338,7 @@ } const handleRemove = () => { formName.enclosure = '' + formName.enclosureName = '' } const handleChange = (info) => { if (info.file.status !== 'uploading') { @@ -346,12 +346,15 @@ } if (info.file.status === 'removed') { formName.enclosure = '' + formName.enclosureName = '' } if (info.file.status === 'done') { message.success(`${info.file.name} 文件上传成功`) formName.enclosure = info.file.response.data + formName.enclosureName = info.file.name } else if (info.file.status === 'error') { formName.enclosure = '' + formName.enclosureName = '' fileList.value = [] message.error(`${info.file.name} 文件上传失败`) } @@ -368,21 +371,20 @@ // copy传参 let _postData = JSON.parse(JSON.stringify(formName)) _postData.detailsField = detailsField - if (id.value) { updateDemandForm(_postData).then((upres) => { if (upres.data.code == 0) { relaunch({ data: _postData, taskId: taskId.value }).then( (res) => { console.log('驳回================>', res) - if (res.data.code == 0) { - message.success('重新发起流程成功！') - window.setTimeout(() => { - window.close() - }, 1000) - } else { - message.error('重新发起流程失败！') - } + // if (res.data.code == 0) { + // message.success('重新发起流程成功！') + // window.setTimeout(() => { + // window.close() + // }, 1000) + // } else { + // message.error('重新发起流程失败！') + // } } ) } else { @@ -396,8 +398,16 @@ console.log(detString, _postData.detailsField, 'detString') demandApply(_postData).then((res) => { applySuccess.value = false - message.success('操作成功！') + // message.success('操作成功！') console.log('能力申请================>', res) + if (res.data.code == 0) { + message.success('操作成功！') + window.setTimeout(() => { + window.close() + }, 1000) + } else { + message.error('操作失败') + } }) }) }