From bcfc5222bf0f670c5722234de5ee24c0324074a8 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Thu, 23 Mar 2023 18:19:33 +0800 Subject: [PATCH] =?UTF-8?q?clay=20:=20=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E6=97=B6=E6=A0=A1=E9=AA=8C=E5=92=8C=E9=87=8D=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/admin/LayoutHeader.vue | 6 +- .../common/process/nodes/ApprovalNode.vue | 16 +++- .../src/views/common/process/nodes/Node.vue | 1 - .../src/views/workspace/AboutInstance.vue | 10 +- .../src/views/workspace/InitiateProcess.vue | 13 ++- .../src/views/workspace/InitiatedInstance.vue | 7 +- .../src/views/workspace/ReProcess.vue | 32 ++++--- .../src/views/workspace/WorkSpace.vue | 94 +++++++++++-------- 8 files changed, 99 insertions(+), 80 deletions(-) diff --git a/flowable-engine-web/src/views/admin/LayoutHeader.vue b/flowable-engine-web/src/views/admin/LayoutHeader.vue index 60b8caf..eacfbb8 100644 --- a/flowable-engine-web/src/views/admin/LayoutHeader.vue +++ b/flowable-engine-web/src/views/admin/LayoutHeader.vue @@ -22,9 +22,9 @@ - - - + + + diff --git a/flowable-engine-web/src/views/common/process/nodes/ApprovalNode.vue b/flowable-engine-web/src/views/common/process/nodes/ApprovalNode.vue index 9ae3058..0079aab 100644 --- a/flowable-engine-web/src/views/common/process/nodes/ApprovalNode.vue +++ b/flowable-engine-web/src/views/common/process/nodes/ApprovalNode.vue @@ -1,5 +1,5 @@ @@ -162,10 +162,8 @@ export default { that.$store.state.refuseList = data.refuseList; that.$store.state.passList = data.passList; this.loading = false; - console.log(data, "获取到的结果数据") }) }, - init() { this.processInstanceData = { userInfo: {}, @@ -173,7 +171,6 @@ export default { formItems: [], processList: [], }; - this.loading = true; this.$store.state.design = this.taskData; this.$store.state.runningList = []; @@ -184,11 +181,6 @@ export default { this.$store.state.diagramMode = "viewer"; this.$store.state.preview = false; }, - resubmit(flag) { - if (flag) { - this.getList(); - } - }, getList() { getAboutInstanceList().then(res => { let data = res.data diff --git a/flowable-engine-web/src/views/workspace/InitiateProcess.vue b/flowable-engine-web/src/views/workspace/InitiateProcess.vue index bb461de..40421a8 100644 --- a/flowable-engine-web/src/views/workspace/InitiateProcess.vue +++ b/flowable-engine-web/src/views/workspace/InitiateProcess.vue @@ -68,9 +68,16 @@ export default { this.$message.error(err); }); }, - validate(call) { - this.$refs.initiateForm.validate(call); - this.$refs.processDiagramViewer.validate(call); + validate() { + let formValidate + this.$refs.initiateForm.validate(formCall => { + formValidate = formCall; + }) + let proValidate = this.$refs.processDiagramViewer.validate() + if (!formValidate) { + return false; + } + return (Array.isArray(proValidate) && proValidate.length === 0); } } }; diff --git a/flowable-engine-web/src/views/workspace/InitiatedInstance.vue b/flowable-engine-web/src/views/workspace/InitiatedInstance.vue index 8b5339e..89c2f4a 100644 --- a/flowable-engine-web/src/views/workspace/InitiatedInstance.vue +++ b/flowable-engine-web/src/views/workspace/InitiatedInstance.vue @@ -96,7 +96,7 @@
- + @@ -155,11 +155,6 @@ export default { this.loading = false; }) }, - resubmit(flag) { - if (flag) { - this.getList(); - } - }, init() { this.processInstanceData = { userInfo: {}, diff --git a/flowable-engine-web/src/views/workspace/ReProcess.vue b/flowable-engine-web/src/views/workspace/ReProcess.vue index 7ccc5b0..df98e4c 100644 --- a/flowable-engine-web/src/views/workspace/ReProcess.vue +++ b/flowable-engine-web/src/views/workspace/ReProcess.vue @@ -97,21 +97,27 @@ export default { formData: JSON.stringify(this.formData), optionalUser: selectUserMap } - this.validate(valid => { - if (valid) { - restartProcessInstance(paramsData).then(res => { - this.$emit("submit", true) - this.openItemDl = false - this.$message.success(res.msg) - }) - } else { - this.$message.warning("请完善表单😥") - } - }) + let valid = this.validate(() => {}) + if (valid) { + restartProcessInstance(paramsData).then(res => { + this.openItemDl = false + this.$message.success(res.msg) + this.$emit("success") + }) + } else { + this.$message.warning("请完善表单😥") + } }, validate(call) { - this.$refs.initiateForm.validate(call); - this.$refs.processDiagramViewer.validate(call); + let formValidate + this.$refs.initiateForm.validate(formCall => { + formValidate = formCall; + }) + let proValidate = this.$refs.processDiagramViewer.validate(call) + if (!formValidate) { + return false; + } + return (Array.isArray(proValidate) && proValidate.length === 0); } } } diff --git a/flowable-engine-web/src/views/workspace/WorkSpace.vue b/flowable-engine-web/src/views/workspace/WorkSpace.vue index e60bade..52eec9b 100644 --- a/flowable-engine-web/src/views/workspace/WorkSpace.vue +++ b/flowable-engine-web/src/views/workspace/WorkSpace.vue @@ -7,7 +7,8 @@ - + @@ -44,15 +45,16 @@ - + - - + + - + 取 消 提 交 @@ -71,7 +73,7 @@ import AboutInstance from "./AboutInstance"; export default { name: "workSpace", - components: {AboutInstance, InitiateProcess,DisposalTask,InitiatedInstance}, + components: {AboutInstance, InitiateProcess, DisposalTask, InitiatedInstance}, data() { return { active: 'disposalTask', @@ -95,16 +97,16 @@ export default { methods: { getGroups() { let groupItem = { - id:100, - name:"clay测试", - items:[] + id: 100, + name: "clay测试", + items: [] } let query = { state: 1 } - getProcessDefinitionList(query).then(res=>{ + getProcessDefinitionList(query).then(res => { groupItem.items = res.data.rows - groupItem.items.forEach(item=>{ + groupItem.items.forEach(item => { item.logo = JSON.parse(item.logo) }) this.actives.push(groupItem.name) @@ -118,26 +120,29 @@ export default { this.openItemDl = true }, // todo 提交流程测试 - submitForm(){ + submitForm() { let processInstance = this.$refs.processInstance; let selectUserMap = {} - this.$store.state.selectUserMap.forEach(((value, key) => {selectUserMap[key]=value})) + this.$store.state.selectUserMap.forEach(((value, key) => { + selectUserMap[key] = value + })) let paramsData = { processDefinitionId: this.selectForm.processDefinitionId, formData: JSON.stringify(processInstance.formData), optionalUser: selectUserMap } - processInstance.validate(valid => { - if (valid) { - startProcessInstance(paramsData).then(res=>{ - this.openItemDl = false - this.$message.success(res.msg) - this.$refs.disposalTask.getList() - }) - } else { - this.$message.warning("请完善表单😥") - } + let valid = processInstance.validate(() => { }) + console.log(valid) + if (valid) { + startProcessInstance(paramsData).then(res => { + this.openItemDl = false + this.$message.success(res.msg) + this.$refs.disposalTask.getList() + }) + } else { + this.$message.warning("请完善表单😥") + } } } } @@ -145,54 +150,63 @@ export default {