From fcfbafa62aa6f3e57f2e68a0afbfb393a2a876ca Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Tue, 28 Feb 2023 00:31:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?clay=20:=20=E9=80=80=E5=9B=9E=E5=81=9A?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E5=8D=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/AvatarEllipsis.vue | 2 +- .../src/components/common/Comment.vue | 11 ++-- .../src/components/common/RolePicker.vue | 1 - flowable-engine-web/src/store/index.js | 2 + .../admin/layout/process/ProcessTree.vue | 50 +++++++++++-------- .../src/views/common/form/FormRenderView.vue | 6 --- .../common/operation/OperationRender.vue | 10 +--- .../common/process/nodes/ConcurrentNode.vue | 6 +-- .../src/views/workspace/AboutInstance.vue | 5 +- .../src/views/workspace/DisposalTask.vue | 3 +- .../src/views/workspace/InitiateProcess.vue | 1 - .../src/views/workspace/InitiatedInstance.vue | 5 +- .../src/views/workspace/TaskView.vue | 2 - 13 files changed, 53 insertions(+), 51 deletions(-) diff --git a/flowable-engine-web/src/components/common/AvatarEllipsis.vue b/flowable-engine-web/src/components/common/AvatarEllipsis.vue index aa73eeb..34e4618 100644 --- a/flowable-engine-web/src/components/common/AvatarEllipsis.vue +++ b/flowable-engine-web/src/components/common/AvatarEllipsis.vue @@ -70,7 +70,7 @@ export default { this.$set(user, "color", "#0bbd87") } //审批处理中 - if (state === 'process') { + if (state === 'running') { this.$set(user, "icon", "el-icon-loading") this.$set(user, "color", "#f78f5f") } diff --git a/flowable-engine-web/src/components/common/Comment.vue b/flowable-engine-web/src/components/common/Comment.vue index d317bfc..46b11d2 100644 --- a/flowable-engine-web/src/components/common/Comment.vue +++ b/flowable-engine-web/src/components/common/Comment.vue @@ -9,7 +9,7 @@
回退节点： - + @@ -61,7 +61,7 @@
添加图片 {{ sizeTip }}
- +
@@ -140,7 +140,7 @@ export default { authorization: localStorage.getItem("token") }, context: null, - backNode: null, + rollBackId: null, dialogImageUrl: '', dialogVisible: false }; @@ -196,7 +196,7 @@ export default { deleteFile(file.id).then(res => { if (res.code === 1000) { this.$message.success("删除成功") - this.fileList.splice( this.fileList.findIndex((item)=>item.id===file.id),1) + this.fileList.splice(this.fileList.findIndex((item) => item.id === file.id), 1) } }) }, @@ -222,7 +222,8 @@ export default { }) let data = { context: this.context, - attachments: fileList + attachments: fileList, + rollBackId: this.rollBackId, } this.$emit("ok", data, this.type) this.visible = false; diff --git a/flowable-engine-web/src/components/common/RolePicker.vue b/flowable-engine-web/src/components/common/RolePicker.vue index 03ab18a..402aec3 100644 --- a/flowable-engine-web/src/components/common/RolePicker.vue +++ b/flowable-engine-web/src/components/common/RolePicker.vue @@ -82,7 +82,6 @@ export default { //获取角色信息 getRole() { getRole().then(res => { - console.log('系统角色',res.data); this.roleList= res.data.map(function (val){ return {roleId:val.value,roleName:val.label} }) diff --git a/flowable-engine-web/src/store/index.js b/flowable-engine-web/src/store/index.js index 246ad8b..65d06b5 100644 --- a/flowable-engine-web/src/store/index.js +++ b/flowable-engine-web/src/store/index.js @@ -14,6 +14,8 @@ export default new Vuex.Store({ runningList: [], endList: [], noTakeList: [], + refuseList: [], + passList: [], design:{}, }, mutations: { diff --git a/flowable-engine-web/src/views/admin/layout/process/ProcessTree.vue b/flowable-engine-web/src/views/admin/layout/process/ProcessTree.vue index 64258bd..1ae49c8 100644 --- a/flowable-engine-web/src/views/admin/layout/process/ProcessTree.vue +++ b/flowable-engine-web/src/views/admin/layout/process/ProcessTree.vue @@ -32,20 +32,26 @@ export default { dom() { return this.$store.state.design.process; }, - viewer(){ + viewer() { return this.$store.state.diagramMode === 'viewer' }, - preview(){ + preview() { return this.$store.state.preview; }, - runningList(){ - return this.$store.state.runningList + runningList() { + return this.$store.state.runningList }, - endList(){ - return this.$store.state.endList + endList() { + return this.$store.state.endList }, - noTakeList(){ - return this.$store.state.noTakeList + noTakeList() { + return this.$store.state.noTakeList + }, + refuseList() { + return this.$store.state.refuseList + }, + passList() { + return this.$store.state.passList }, }, render(h, ctx) { @@ -63,17 +69,19 @@ export default { return [] } if (node.props && this.viewer && !this.preview) { - let headerBgc = '#ff943e' - if (this.runningList.includes(node.id)) { - headerBgc = '#1e90ff' - } - else if (this.endList.includes(node.id)) { - headerBgc = '#20b2aa' - } - else if (this.noTakeList.includes(node.id)) { - headerBgc = '#909399' - } - node.props.headerBgc = headerBgc + let headerBgc = '#ff943e' + if (this.runningList.includes(node.id)) { + headerBgc = '#1e90ff' + } else if (this.endList.includes(node.id)) { + headerBgc = '#20b2aa' + } else if (this.noTakeList.includes(node.id)) { + headerBgc = '#909399' + } else if (this.refuseList.includes(node.id)) { + headerBgc = '#f56c6c' + } else if (this.passList.includes(node.id)) { + headerBgc = '#ff943e' + } + node.props.headerBgc = headerBgc } if (this.isPrimaryNode(node)) { //普通业务节点 @@ -97,7 +105,7 @@ export default { //插入添加分支/条件的按钮 branchItems.unshift(h('div', {'class': {'add-branch-btn': true}}, [ h('el-button', { - 'class': {'add-branch-btn-el': !this.viewer}, + 'class': {'add-branch-btn-el': !this.viewer}, props: {size: 'small', round: true}, on: {click: () => this.addBranchNode(node)}, domProps: { @@ -160,7 +168,7 @@ export default { this.nodeMap.set(nodeItem.id, nodeItem) this.parentMap.set(nodeItem.parentId, nodeItem) }) - }catch (e){ + } catch (e) { } }, //id映射到map，用来向上遍历 diff --git a/flowable-engine-web/src/views/common/form/FormRenderView.vue b/flowable-engine-web/src/views/common/form/FormRenderView.vue index d9f45c3..0de5034 100644 --- a/flowable-engine-web/src/views/common/form/FormRenderView.vue +++ b/flowable-engine-web/src/views/common/form/FormRenderView.vue @@ -88,9 +88,7 @@ export default { }); }, loadFormConfig(formItems) { - console.log(formItems) formItems.forEach(item => { - console.log(item.perm === 'E',item,"item") if (item.name === 'SpanLayout') { this.loadFormConfig(item.props.items) } else { @@ -98,11 +96,8 @@ export default { if (this.isPreview) { this.$set(item, 'perm', this.model) } - console.log(item.perm === 'E',item,"item") if (item.perm === 'E') { - console.log("进去了") if (item.props.required) { - console.log("开始制作权限了") this.$set(this.rules, item.id, [{ type: item.valueType === 'Array' ? 'array' : undefined, required: true, @@ -112,7 +107,6 @@ export default { } } }) - console.log(this.rules) } } } diff --git a/flowable-engine-web/src/views/common/operation/OperationRender.vue b/flowable-engine-web/src/views/common/operation/OperationRender.vue index 8a88a96..3ebf6f8 100644 --- a/flowable-engine-web/src/views/common/operation/OperationRender.vue +++ b/flowable-engine-web/src/views/common/operation/OperationRender.vue @@ -82,7 +82,6 @@ export default { } }, created() { - console.log(this.operationList) this.init() }, methods: { @@ -120,22 +119,18 @@ export default { break } // let operationListNew = [] - console.log(this.operationList.length, "sdjshjdhasjds") for (let i = 0;i -
+
-
+
@@ -27,7 +27,7 @@
-
+
diff --git a/flowable-engine-web/src/views/workspace/AboutInstance.vue b/flowable-engine-web/src/views/workspace/AboutInstance.vue index 8daf8f0..a81d4a0 100644 --- a/flowable-engine-web/src/views/workspace/AboutInstance.vue +++ b/flowable-engine-web/src/views/workspace/AboutInstance.vue @@ -133,6 +133,8 @@ export default { that.$store.state.runningList = data.runningList; that.$store.state.endList = data.endList; that.$store.state.noTakeList = data.noTakeList; + that.$store.state.refuseList = data.refuseList; + that.$store.state.passList = data.passList; this.loading = false; console.log(data, "获取到的结果数据") }) @@ -144,7 +146,6 @@ export default { formData: {}, formItems: [], processList: [], - operationList: [], }; this.loading = true; @@ -152,6 +153,8 @@ export default { this.$store.state.runningList = []; this.$store.state.endList = []; this.$store.state.noTakeList = []; + this.$store.state.refuseList = []; + this.$store.state.passList = []; this.$store.state.diagramMode = "viewer"; this.$store.state.preview = false; }, diff --git a/flowable-engine-web/src/views/workspace/DisposalTask.vue b/flowable-engine-web/src/views/workspace/DisposalTask.vue index dd0bf43..4fd640e 100644 --- a/flowable-engine-web/src/views/workspace/DisposalTask.vue +++ b/flowable-engine-web/src/views/workspace/DisposalTask.vue @@ -172,11 +172,12 @@ export default { that.taskData = res.data; that.$store.state.design = that.taskData; that.$store.state.userTaskOption = that.taskData.userTaskOption; + + console.log(that.taskData.userTaskOption,"that.taskData.userTaskOption") this.loading = false; }); }, submitTask() { - console.log("wqeqwqewqe") this.$refs.taskViewForm.validate(valid =>{ if (valid){ let params = { diff --git a/flowable-engine-web/src/views/workspace/InitiateProcess.vue b/flowable-engine-web/src/views/workspace/InitiateProcess.vue index 02c4788..60bf2c8 100644 --- a/flowable-engine-web/src/views/workspace/InitiateProcess.vue +++ b/flowable-engine-web/src/views/workspace/InitiateProcess.vue @@ -74,7 +74,6 @@ export default { }); }, validate(call) { - console.log("我被调用了") this.$refs.initiateForm.validate(call); } } diff --git a/flowable-engine-web/src/views/workspace/InitiatedInstance.vue b/flowable-engine-web/src/views/workspace/InitiatedInstance.vue index c42a2b9..de1b103 100644 --- a/flowable-engine-web/src/views/workspace/InitiatedInstance.vue +++ b/flowable-engine-web/src/views/workspace/InitiatedInstance.vue @@ -132,6 +132,8 @@ export default { that.$store.state.runningList = data.runningList; that.$store.state.endList = data.endList; that.$store.state.noTakeList = data.noTakeList; + that.$store.state.refuseList = data.refuseList; + that.$store.state.passList = data.passList; this.loading = false; }) }, @@ -143,13 +145,14 @@ export default { formData: {}, formItems: [], processList: [], - operationList: [], }; this.loading = true; this.$store.state.design = this.taskData; this.$store.state.runningList = []; this.$store.state.endList = []; this.$store.state.noTakeList = []; + this.$store.state.refuseList = []; + this.$store.state.passList = []; this.$store.state.diagramMode = "viewer"; this.$store.state.preview = false; }, diff --git a/flowable-engine-web/src/views/workspace/TaskView.vue b/flowable-engine-web/src/views/workspace/TaskView.vue index 4d6a73c..26172e1 100644 --- a/flowable-engine-web/src/views/workspace/TaskView.vue +++ b/flowable-engine-web/src/views/workspace/TaskView.vue @@ -51,9 +51,7 @@ export default { taskId: this.taskId, formData : JSON.stringify(that.taskData.formData) } - console.log(params,"需要提交的数据") completeTask(params).then(res =>{ - console.log(res) that.$parent.approveOpen = false that.$parent.getList() that.$message.success(res.msg) -- 2.40.1 From 49c295a5bc80951c76bcec858fb5cd5508a6d39c Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Wed, 1 Mar 2023 15:55:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?clay=20:=20=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=9B=9E=E6=98=BE=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flowable-engine-web/src/api/query.js | 70 ++++ .../src/components/Pagination/index.vue | 94 +++++ .../src/components/RightToolbar/index.vue | 38 ++ flowable-engine-web/src/main.js | 7 + flowable-engine-web/src/router/index.js | 6 + flowable-engine-web/src/views/query/index.vue | 352 ++++++++++++++++++ 6 files changed, 567 insertions(+) create mode 100644 flowable-engine-web/src/api/query.js create mode 100644 flowable-engine-web/src/components/Pagination/index.vue create mode 100644 flowable-engine-web/src/components/RightToolbar/index.vue create mode 100644 flowable-engine-web/src/views/query/index.vue diff --git a/flowable-engine-web/src/api/query.js b/flowable-engine-web/src/api/query.js new file mode 100644 index 0000000..2f9f0e9 --- /dev/null +++ b/flowable-engine-web/src/api/query.js @@ -0,0 +1,70 @@ +import request from '@/api/request.js' + + +// 查询万能查询列表 +export function listQuery(query) { + return request({ + url: '/custom-query/uni/query', + method: 'get', + params: query + }) +} + +// 查询万能查询详细 +export function getQuery(id) { + return request({ + url: '/custom-query/uni/query/' + id, + method: 'get' + }) +} + +// 新增万能查询 +export function addQuery(data) { + return request({ + url: '/custom-query/uni/query', + method: 'post', + data: data + }) +} + +// 修改万能查询 +export function updateQuery(data) { + return request({ + url: '/custom-query/uni/query', + method: 'put', + data: data + }) +} + +// 删除万能查询 +export function delQuery(id) { + return request({ + url: '/custom-query/uni/query/' + id, + method: 'delete' + }) +} + +// 导出万能查询 +export function exportQuery(query) { + return request({ + url: '/custom-query/uni/query/export', + method: 'get', + params: query + }) +} + +// 获取条件 +export function getQueryInfo(id) { + return request({ + url: '/query/'+id, + method: 'get', + }) +} +// 修改条件 +export function editQueryInfo(data) { + return request({ + url: '/query', + method: 'put', + data: data + }) +} diff --git a/flowable-engine-web/src/components/Pagination/index.vue b/flowable-engine-web/src/components/Pagination/index.vue new file mode 100644 index 0000000..c1d9ecf --- /dev/null +++ b/flowable-engine-web/src/components/Pagination/index.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/flowable-engine-web/src/components/RightToolbar/index.vue b/flowable-engine-web/src/components/RightToolbar/index.vue new file mode 100644 index 0000000..494c0b8 --- /dev/null +++ b/flowable-engine-web/src/components/RightToolbar/index.vue @@ -0,0 +1,38 @@ + + + diff --git a/flowable-engine-web/src/main.js b/flowable-engine-web/src/main.js index e47427a..1ae1e33 100644 --- a/flowable-engine-web/src/main.js +++ b/flowable-engine-web/src/main.js @@ -48,6 +48,13 @@ Vue.prototype.$deepCopy = function (obj) { return JSON.parse(JSON.stringify(obj)) } +import Pagination from "@/components/Pagination"; +//自定义表格工具扩展 +import RightToolbar from "@/components/RightToolbar" +// 全局组件挂载 +Vue.component('Pagination', Pagination) +Vue.component('RightToolbar', RightToolbar) + new Vue({ router, diff --git a/flowable-engine-web/src/router/index.js b/flowable-engine-web/src/router/index.js index b6941b8..7170001 100644 --- a/flowable-engine-web/src/router/index.js +++ b/flowable-engine-web/src/router/index.js @@ -33,6 +33,12 @@ const router = new Router({ component: () => import("@/views/admin/FormsPanel.vue"), meta: {title: '表单列表', viewport: viewport} }, + { + path: "/query", + name: "query", + component: () => import("@/views/query/index.vue"), + meta: {title: '自定义查询', viewport: viewport} + }, { path: "/admin/design", name: "design", diff --git a/flowable-engine-web/src/views/query/index.vue b/flowable-engine-web/src/views/query/index.vue new file mode 100644 index 0000000..a043720 --- /dev/null +++ b/flowable-engine-web/src/views/query/index.vue @@ -0,0 +1,352 @@ + + + -- 2.40.1