diff --git a/flowable-engine-web/src/api/processInstance.js b/flowable-engine-web/src/api/processInstance.js index 1c9b07e..8d6109c 100644 --- a/flowable-engine-web/src/api/processInstance.js +++ b/flowable-engine-web/src/api/processInstance.js @@ -12,6 +12,13 @@ export function startProcessInstance(param) { data: param }) } +export function restartProcessInstance(param) { + return request({ + url: "/flowable/process/instance/restart", + method: "post", + data: param + }) +} export function getAboutInstanceList() { return request({ @@ -33,3 +40,11 @@ export function getInitiatedInstanceInfo(processInstanceId) { method: "get", }) } + + +export function getInitiatedInstanceReInfo(instanceId) { + return request({ + url: "/flowable/process/instance/re/info/"+instanceId, + method: "get", + }) +} diff --git a/flowable-engine-web/src/api/request.js b/flowable-engine-web/src/api/request.js index cdf1367..909558b 100644 --- a/flowable-engine-web/src/api/request.js +++ b/flowable-engine-web/src/api/request.js @@ -10,8 +10,8 @@ Vue.prototype.$axios = axios; // 字体图标 export function getBaseUrl(){ - return "http://gateway.mytwins.top" - // return "http://192.168.101.7:8000" + // return "http://gateway.mytwins.top" + return "http://192.168.101.7:8000" // return "http://localhost:8000" } @@ -51,7 +51,7 @@ service.interceptors.response.use( console.log("请求", err); switch (err.response.status) { case 401: - MessageBox.alert("登陆已过期，请关闭当前窗口重新进入-能臣工作台"); + MessageBox.alert("登陆已过期，请关闭当前窗口重新进入"); break; case 403: //Message.warning("抱歉，您无权访问！") diff --git a/flowable-engine-web/src/views/common/form/FormRenderView.vue b/flowable-engine-web/src/views/common/form/FormRenderView.vue index 0de5034..df36722 100644 --- a/flowable-engine-web/src/views/common/form/FormRenderView.vue +++ b/flowable-engine-web/src/views/common/form/FormRenderView.vue @@ -63,8 +63,6 @@ export default { }, methods: { validate(call) { - console.log("我被执行了") - let success = true this.$refs.formView.validate(valid => { success = valid diff --git a/flowable-engine-web/src/views/common/operation/OperationRender.vue b/flowable-engine-web/src/views/common/operation/OperationRender.vue index 0eb3904..6bdc6df 100644 --- a/flowable-engine-web/src/views/common/operation/OperationRender.vue +++ b/flowable-engine-web/src/views/common/operation/OperationRender.vue @@ -11,8 +11,7 @@
- -
@@ -127,7 +126,7 @@ export default { let userList = [] if (operationNew.userInfo){ for (let user of operationNew.userInfo) { - let userNew = this.initUser(user) + let userNew = this.initUser(user,operationNew.operation) userList.push(userNew) } operationNew.userInfo = userList @@ -150,7 +149,7 @@ export default { } return result; }, - initUser(user) { + initUser(user,type) { let state = user.state //创建节点 if (state === 'CREATE') { @@ -162,6 +161,10 @@ export default { this.$set(user, "icon", "el-icon-check") this.$set(user, "color", "#0bbd87") } + if (type === "CC"){ + this.$set(user, "icon", "el-icon-s-promotion") + this.$set(user, "color", "#3395f8") + } //审批处理中 if (state === 'RUNNING') { this.$set(user, "icon", "el-icon-loading") @@ -216,6 +219,12 @@ export default { this.$set(operation, "remark", ' (拒绝)') } } + //抄送 + if (type === 'CC') { + this.$set(operation, "icon", "el-icon-s-promotion") + this.$set(operation, "color", "#3395f8") + this.$set(operation, "remark", ' (抄送成功)') + } //评论 if (type === 'COMMENT') { //评论 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 7c00b15..9ae3058 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 @@ @@ -60,6 +61,12 @@ export default { type: Boolean, default: false }, + nodeId:{ + type:String, + default:()=>{ + return ""; + } + }, //是否显示节点体 show: { type: Boolean, @@ -76,6 +83,13 @@ export default { default: "" }, //节点内容区域文字 + userInfo: { + type: Array, + default() { + return [] + } + }, + //节点内容区域文字 showAvatar: { type: Boolean, default: false @@ -123,14 +137,36 @@ export default { }, }, data() { - return { - userInfo:[] + return {} + }, + created() { + let userInfo = this.$store.state.selectUserMap.get(this.nodeId); + console.log(this.nodeId,"sadasdasd",userInfo,this._userInfo) + if (userInfo){ + let userInfoList = [] + for (let val of userInfo) { + let userInfo = { + id: val.id, + name: val.name, + avatar: val.avatar, + } + userInfoList.push(userInfo) + } + this._userInfo = userInfoList } }, computed: { viewer() { return this.$store.state.diagramMode === 'viewer' - } + }, + _userInfo: { + get() { + return this.userInfo + }, + set(val) { + this.userInfo = val + } + }, }, methods: { selectedUser(select) { @@ -143,7 +179,8 @@ export default { } userInfoList.push(userInfo) } - this.userInfo = userInfoList + //todo 确认是会包错,邓洁处理 + this._userInfo = userInfoList this.$store.state.selectUserMap.set(this.$store.state.selectedNode.id, userInfoList) }, } diff --git a/flowable-engine-web/src/views/workspace/AboutInstance.vue b/flowable-engine-web/src/views/workspace/AboutInstance.vue index a81d4a0..379a821 100644 --- a/flowable-engine-web/src/views/workspace/AboutInstance.vue +++ b/flowable-engine-web/src/views/workspace/AboutInstance.vue @@ -1,14 +1,14 @@ + + +