diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue index dea952fda..9efd6e95e 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue @@ -259,6 +259,7 @@ :accept="accept" :fileMax_M="fileMax_M" @uploadSuccess="uploadSuccess"/> + 正在加载数据 @@ -291,6 +292,7 @@ active: '1', accept: '', fileMax_M: 0, + dataLoading: false, drawerModal: false, nodeList: [], formRules: { @@ -337,7 +339,7 @@ checkBox: false, selectType: '', roleForm: {}, - bpnId: '', + bpnId: this.$route.query.bpnId, } }, computed: { @@ -439,7 +441,14 @@ }, }, mounted() { - this.getData() + //获取草稿的数据进行展示 + if (this.bpnId) { + this.getTaskDraftData() + } + //获取流程中数据进行展示 + if (this.taskKey) { + this.getData() + } }, methods: { handlePreview(file) { @@ -551,7 +560,7 @@ form: json, commentText: this.commentText } - this.completeTask(this.$route.query.taskIds,query) + this.completeTask(this.$route.query.taskIds, query) } }, //启动流程 @@ -586,12 +595,24 @@ }, {_this: this}, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId) { + this.taskDel() + } this.$router.push("/processCenter"); } this.isSubmit = false; this.saveLoading = false; }) }, + //删除草稿 + taskDel() { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res => { + return res + }) + }, handleTransfer() { this.title = '转办处理人' this.checkBox = true @@ -670,6 +691,7 @@ this.dataForm = {...this.dataForm} }, getData() { + this.dataLoading = true return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.$route.query.taskIds, @@ -679,7 +701,9 @@ const processForm = JSON.parse(res.mesg) this.formProcessing(processForm) } + this.dataLoading = false }).catch(e => { + this.dataLoading = false }); }); }, @@ -690,6 +714,18 @@ this.$refs.personnelInformationRef.getData(row) } }, + getTaskDraftData() { + this.dataLoading = true + queryTaskFirst({ + bpnId: this.bpnId + }).then(res => { + let mes = JSON.parse(res.mes); + this.dataForm = mes.form + this.roleForm = mes.roleForm + this.commentText = mes.commentText + this.dataLoading = false + }); + }, } } diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index dd8c5fb0b..415a25527 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -1,1020 +1,1042 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - 清空 - 删除 - + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + 清空 + + 删除 + + + + + + - - - - - - - + + - - - - - - - - - - - - {{ scope.row.prcName|| getPrcName(scope.row.prcType) }} - - - - - - - - - - - - - - - {{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }} - - - - - 办理 - - - - - - - - 数据获取中 + @selection-change="handleSelectionChange"> + + + + + + + + + + + + {{ scope.row.prcName|| + getPrcName(scope.row.prcType) }} + + + + + + + + + + + + + + + {{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }} + + + + + 办理 + + + + + + + + 数据获取中 + -