From c73952ebfde4ae8d3c5755f87bd2e4d293ed19c6 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 22 Mar 2023 21:09:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?clay=20:=20=E8=8A=82=E7=82=B9=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/processInstance.js                |  15 ++
 .../common/operation/OperationRender.vue      |  14 +-
 .../src/views/common/process/nodes/Node.vue   |  25 +++-
 .../src/views/workspace/AboutInstance.vue     |   2 +-
 .../src/views/workspace/InitiatedInstance.vue |  44 +++++-
 .../src/views/workspace/ReProcess.vue         | 141 ++++++++++++++++++
 6 files changed, 225 insertions(+), 16 deletions(-)
 create mode 100644 flowable-engine-web/src/views/workspace/ReProcess.vue

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/views/common/operation/OperationRender.vue b/flowable-engine-web/src/views/common/operation/OperationRender.vue
index 0eb3904..871a3fe 100644
--- a/flowable-engine-web/src/views/common/operation/OperationRender.vue
+++ b/flowable-engine-web/src/views/common/operation/OperationRender.vue
@@ -127,7 +127,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 +150,7 @@ export default {
       }
       return result;
     },
-    initUser(user) {
+    initUser(user,type) {
       let state = user.state
       //创建节点
       if (state === 'CREATE') {
@@ -162,6 +162,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 +220,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/Node.vue b/flowable-engine-web/src/views/common/process/nodes/Node.vue
index 9d03513..24fc062 100644
--- a/flowable-engine-web/src/views/common/process/nodes/Node.vue
+++ b/flowable-engine-web/src/views/common/process/nodes/Node.vue
@@ -43,6 +43,7 @@
       </div>
     </div>
     <user-picker v-if="selectUser.show" title="请选择系统用户" :multiple="selectUser.multiple" ref="userPicker"
+                 :selected="_userInfo"
                  @ok="selectedUser"/>
   </div>
 </template>
@@ -76,6 +77,13 @@ export default {
       default: ""
     },
     //节点内容区域文字
+    userInfo: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    //节点内容区域文字
     showAvatar: {
       type: Boolean,
       default: false
@@ -123,14 +131,20 @@ export default {
     },
   },
   data() {
-    return {
-      userInfo:[]
-    }
+    return {}
   },
   computed: {
     viewer() {
       return this.$store.state.diagramMode === 'viewer'
-    }
+    },
+    _userInfo: {
+      get() {
+        return this.userInfo
+      },
+      set(val) {
+        this.userInfo = val
+      }
+    },
   },
   methods: {
     selectedUser(select) {
@@ -143,7 +157,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..962ad3c 100644
--- a/flowable-engine-web/src/views/workspace/AboutInstance.vue
+++ b/flowable-engine-web/src/views/workspace/AboutInstance.vue
@@ -8,7 +8,7 @@
           label="审批类型"
           width="180"/>
       <el-table-column
-          prop="approveName"
+          prop="initiator"
           label="发起人"
           width="180"/>
       <el-table-column
diff --git a/flowable-engine-web/src/views/workspace/InitiatedInstance.vue b/flowable-engine-web/src/views/workspace/InitiatedInstance.vue
index c07d4bd..6b1b7a5 100644
--- a/flowable-engine-web/src/views/workspace/InitiatedInstance.vue
+++ b/flowable-engine-web/src/views/workspace/InitiatedInstance.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table :data="tableData"
-              @row-click="clickRow"
+              @cell-click="showDetails"
               style="width: 100%">
       <el-table-column
           prop="deploymentName"
@@ -39,7 +39,12 @@
       <el-table-column
           label="操作">
         <template slot-scope="scope">
-          <el-button size="min" type="text" icon="el-icon-thumb">再次提交</el-button>
+          <template v-if="scope.row.state === '4'">
+            <el-button size="min" type="text" icon="el-icon-thumb">再次提交</el-button>
+          </template>
+          <template v-if="scope.row.state === '2' || scope.row.state === '3'">
+            <el-button size="min" type="text" icon="el-icon-thumb" @click="resubmitHander(scope.row.taskId)">重新提交</el-button>
+          </template>
         </template>
       </el-table-column>
     </el-table>
@@ -85,18 +90,28 @@
       <process-diagram-viewer v-if="processDiagramViewer"/>
       <div style="height: 70px;"></div>
     </el-dialog>
+
+    <re-process :code="selectInstanceId" v-if="openItemDl"/>
+<!--    <el-dialog title="发起审批" :visible.sync="openItemDl" :close-on-click-modal="true">-->
+<!--      <re-initiate-process ref="processInstance" :code="selectInstanceId" v-if="openItemDl"></re-initiate-process>-->
+<!--      <span slot="footer" class="dialog-footer">-->
+<!--				<el-button size="mini" @click="openItemDl = false">取 消</el-button>-->
+<!--				<el-button size="mini" type="primary" @click="submitForm">提 交</el-button>-->
+<!--			</span>-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
 <script>
 import FormRenderView from '@/views/common/form/FormRenderView'
 import ProcessDiagramViewer from "../admin/layout/ProcessDiagramViewer";
+import ReProcess from "./ReProcess";
 import {getInitiatedInstanceList, getInitiatedInstanceInfo} from "@/api/processInstance";
 import {timeLength} from '@/utils/date'
 import OperationRender from "../common/operation/OperationRender";
 export default {
   name: "InitiatedInstance",
-  components: {OperationRender, FormRenderView, ProcessDiagramViewer},
+  components: {ReProcess, OperationRender, FormRenderView, ProcessDiagramViewer},
   data() {
     return {
       approveOpen: false,
@@ -104,6 +119,8 @@ export default {
       selectProcessInstance: {},
       tableData: [],
       loading: false,
+      openItemDl:false,
+      selectInstanceId:null,
       processInstanceData: {
         userInfo: {},
         formData: {},
@@ -117,10 +134,12 @@ export default {
     this.getList();
   },
   methods: {
-    clickRow(row) {
-      this.approveOpen = true;
-      this.loadProcessInstance(row.processInstanceId)
-      this.selectProcessInstance = row
+    showDetails(row,column) {
+      if (column.label !== '操作'){
+        this.approveOpen = true;
+        this.loadProcessInstance(row.processInstanceId)
+        this.selectProcessInstance = row
+      }
     },
     loadProcessInstance(processInstanceId) {
       let that = this;
@@ -156,7 +175,16 @@ export default {
       this.$store.state.diagramMode = "viewer";
       this.$store.state.preview = false;
     },
-
+    resubmitHander(instanceId){
+      this.selectInstanceId = instanceId;
+      this.openItemDl = false
+      // 在组件移除后，重新渲染组件
+      // this.$nextTick可实现在DOM 状态更新后，执行传入的方法。
+      this.$nextTick(() => {
+        this.openItemDl = true
+      })
+      console.log("书剑")
+    },
     getList() {
       getInitiatedInstanceList().then(res => {
         let data = res.data
diff --git a/flowable-engine-web/src/views/workspace/ReProcess.vue b/flowable-engine-web/src/views/workspace/ReProcess.vue
new file mode 100644
index 0000000..3444b6e
--- /dev/null
+++ b/flowable-engine-web/src/views/workspace/ReProcess.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <el-dialog title="发起审批" :visible.sync="openItemDl" :close-on-click-modal="true">
+      <div v-loading="loading" class="initiate_process">
+        <div v-if="!loading" style="min-width: 338px;">
+          <!--渲染表单-->
+          <form-render class="process-form" ref="initiateForm" :form-items="processDefinition.formItems"
+                       v-model="formData"/>
+        </div>
+        <div style="display: flex;justify-content: center;flex-direction: column;min-width: 1036px;">
+          <span style="font-size: 18px;text-align: center;padding-top: 20px;">审批流程</span>
+          <process-diagram-viewer ref="processDiagramViewer"/>
+          <!--渲染流程执行过程-->
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+				<el-button size="mini" @click="openItemDl = false">取 消</el-button>
+				<el-button size="mini" type="primary" @click="resubmitForm">提 交</el-button>
+			</span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import FormRender from "@/views/common/form/FormRender";
+import ProcessDiagramViewer from "../admin/layout/ProcessDiagramViewer";
+import {getInitiatedInstanceReInfo,restartProcessInstance} from "@/api/processInstance";
+
+export default {
+  name: "ReProcess",
+  components: {FormRender, ProcessDiagramViewer},
+  props: {
+    code: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      openItemDl: false,
+      scale: 100,
+      loading: true,
+      formData: {},
+      processDefinition: {
+        processDefinitionKey: "",
+        deploymentName: "",
+        logo: {},
+        formItems: [],
+        process: {},
+        remark: ""
+      }
+    }
+  },
+  mounted() {
+    this.$store.state.preview = true;
+    this.loadProcessDefinitionReInfo(this.code);
+  },
+  created() {
+    this.$store.state.preview = true;
+  },
+  computed: {
+    forms() {
+      return this.$store.state.design.formItems;
+    }
+  },
+  destroyed() {
+    this.$store.state.preview = false;
+  },
+  methods: {
+    loadProcessDefinitionReInfo(instanceId) {
+      this.openItemDl = true;
+          getInitiatedInstanceReInfo(instanceId).then(res => {
+        let processDefinition = res.data;
+        this.processDefinition = processDefinition;
+        this.formData = processDefinition.formData
+        //构建表单及校验规则
+        this.$store.state.design = processDefinition;
+        this.loading = false;
+      }).catch(err => {
+        this.$message.error(err);
+      });
+    },
+
+    resubmitForm(){
+      let selectUserMap = {}
+      this.$store.state.selectUserMap.forEach(((value, key) => {selectUserMap[key]=value}))
+      let paramsData = {
+        processDefinitionId: this.code,
+        formData: JSON.stringify(this.formData),
+        optionalUser: selectUserMap
+      }
+      this.validate(valid => {
+        if (valid) {
+          restartProcessInstance(paramsData).then(res=>{
+            this.openItemDl = false
+            this.$message.success(res.msg)
+          })
+        } else {
+          this.$message.warning("请完善表单😥")
+        }
+      })
+    },
+    validate(call) {
+      this.$refs.initiateForm.validate(call);
+      this.$refs.processDiagramViewer.validate(call);
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@media screen and (max-width: 1545px) {
+  .initiate_process {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+  }
+}
+
+.initiate_process {
+  display: flex;
+  flex: 1;
+  justify-content: space-around;
+}
+
+.process-form {
+  /deep/ .el-form-item__label {
+    padding: 0 0;
+  }
+
+  /deep/ .el-divider--horizontal {
+    margin: 0;
+  }
+}
+
+/deep/ .el-divider__text {
+  font-size: 16px;
+}
+
+</style>
+
-- 
2.40.1


From 9ff802fe0dbd28e6b5f67d74c0aa535bd51ded5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Wed, 22 Mar 2023 21:18:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?dengjie=20:=20=E4=BF=AE=E6=94=B9=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/common/operation/OperationRender.vue             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/flowable-engine-web/src/views/common/operation/OperationRender.vue b/flowable-engine-web/src/views/common/operation/OperationRender.vue
index 871a3fe..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 @@
           <div style="display: flex;">
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
                 <el-avatar size="large" :src="user.avatar"></el-avatar>
-                <!--v-if="!$slots.dot && operation.userInfo.length > 1" -->
-                <div v-if="user.icon"
+                <div v-if="!$slots.dot && operation.userInfo.length > 1"
                      class="el-timeline-item__node" :style="{
                       backgroundColor: user.color
                     }">
-- 
2.40.1


From 5334ea30e3b69d24a2afa3761ea2d3b1d26a85c7 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 22 Mar 2023 22:51:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?clay=20:=20=E6=B5=81=E7=A8=8B=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=96=E5=B1=82=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/src/api/request.js        |  6 +-
 .../src/views/common/form/FormRenderView.vue  |  2 -
 .../common/process/nodes/ApprovalNode.vue     |  2 +-
 .../src/views/common/process/nodes/CcNode.vue |  2 +-
 .../src/views/common/process/nodes/Node.vue   | 22 +++++
 .../src/views/workspace/AboutInstance.vue     | 92 ++++++++++++-------
 .../src/views/workspace/InitiateProcess.vue   | 11 +--
 .../src/views/workspace/InitiatedInstance.vue | 91 +++++++++---------
 .../src/views/workspace/ReProcess.vue         | 19 +++-
 9 files changed, 150 insertions(+), 97 deletions(-)

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/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 @@
 <template>
-  <node :title="config.name" :show-error="showError" :content="content"
+  <node :title="config.name" :show-error="showError" :content="content" :node-id="config.id"
         :show-avatar="config.props.assignedType === 'ASSIGN_USER'" :user-info="assignedUser"
         :error-info="errorInfo"
         :select-user="selectUser"
diff --git a/flowable-engine-web/src/views/common/process/nodes/CcNode.vue b/flowable-engine-web/src/views/common/process/nodes/CcNode.vue
index 21a5b8c..8dbb720 100644
--- a/flowable-engine-web/src/views/common/process/nodes/CcNode.vue
+++ b/flowable-engine-web/src/views/common/process/nodes/CcNode.vue
@@ -1,5 +1,5 @@
 <template>
-  <node :title="config.name" :show-error="showError" :select-user="selectUser" :content="content"
+  <node :title="config.name" :show-error="showError" :select-user="selectUser" :content="content" :node-id="config.id"
         :error-info="errorInfo" :show-avatar="true" :user-info="config.props.assignedUser"
         @selected="$emit('selected')" @delNode="$emit('delNode')" @insertNode="type => $emit('insertNode', type)"
         placeholder="请设置抄送人" :header-bgc="headerBgc" header-icon="el-icon-s-promotion"/>
diff --git a/flowable-engine-web/src/views/common/process/nodes/Node.vue b/flowable-engine-web/src/views/common/process/nodes/Node.vue
index 24fc062..79d4bf9 100644
--- a/flowable-engine-web/src/views/common/process/nodes/Node.vue
+++ b/flowable-engine-web/src/views/common/process/nodes/Node.vue
@@ -61,6 +61,12 @@ export default {
       type: Boolean,
       default: false
     },
+    nodeId:{
+      type:String,
+      default:()=>{
+        return "";
+      }
+    },
     //是否显示节点体
     show: {
       type: Boolean,
@@ -133,6 +139,22 @@ export default {
   data() {
     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'
diff --git a/flowable-engine-web/src/views/workspace/AboutInstance.vue b/flowable-engine-web/src/views/workspace/AboutInstance.vue
index 962ad3c..379a821 100644
--- a/flowable-engine-web/src/views/workspace/AboutInstance.vue
+++ b/flowable-engine-web/src/views/workspace/AboutInstance.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table :data="tableData"
-              @row-click="clickRow"
+              @cell-click="showDetails"
               style="width: 100%">
       <el-table-column
           prop="deploymentName"
@@ -39,7 +39,15 @@
       <el-table-column
           label="操作">
         <template slot-scope="scope">
-          <el-button size="min" type="text" icon="el-icon-thumb">再次提交</el-button>
+          <template v-if="scope.row.isSelf">
+            <template v-if="scope.row.state === '4'">
+              <el-button size="min" type="text" icon="el-icon-thumb" @click="resubmitHander(scope.row.taskId)">再次提交</el-button>
+            </template>
+            <template v-if="scope.row.state === '2' || scope.row.state === '3'">
+              <el-button size="min" type="text" icon="el-icon-thumb" @click="resubmitHander(scope.row.taskId)">重新提交
+              </el-button>
+            </template>
+          </template>
         </template>
       </el-table-column>
     </el-table>
@@ -52,17 +60,20 @@
         <div class="top">
           <div class="top_left">
             <el-avatar size="large" :src="processInstanceData.userInfo.avatar"></el-avatar>
-            <span style="text-align: center;color: #19191a;font-size: 14px;">{{ processInstanceData.userInfo.name }}</span>
+            <span style="text-align: center;color: #19191a;font-size: 14px;">{{processInstanceData.userInfo.name}}</span>
           </div>
           <div class="top_right">
             <div style="margin-bottom: 12px">
               <span style="font-size: 15px;">{{ selectProcessInstance.deploymentName }}</span>
-              <el-tag class="state_tag" v-if="selectProcessInstance.state === '1'" size="mini" >进行中</el-tag>
-              <el-tag class="state_tag" v-if="selectProcessInstance.state === '4'" size="mini" type="success">审批通过</el-tag>
-              <el-tag class="state_tag" v-if="selectProcessInstance.state === '3'" size="mini" type="danger">审批驳回</el-tag>
+              <el-tag class="state_tag" v-if="selectProcessInstance.state === '1'" size="mini">进行中</el-tag>
+              <el-tag class="state_tag" v-if="selectProcessInstance.state === '4'" size="mini" type="success">审批通过
+              </el-tag>
+              <el-tag class="state_tag" v-if="selectProcessInstance.state === '3'" size="mini" type="danger">审批驳回
+              </el-tag>
               <el-tag class="state_tag" v-if="selectProcessInstance.state === '2'" size="mini" type="info">已撤销</el-tag>
               <el-tooltip class="item" effect="dark" content="查看详细流程" placement="top-start">
-                <el-icon class="el-icon-view" style="float: right;font-size: 20px;cursor: pointer" @click.native="processDiagramViewer = true"></el-icon>
+                <el-icon class="el-icon-view" style="float: right;font-size: 20px;cursor: pointer"
+                         @click.native="processDiagramViewer = true"></el-icon>
               </el-tooltip>
             </div>
             <div>
@@ -85,25 +96,32 @@
       <process-diagram-viewer v-if="processDiagramViewer"/>
       <div style="height: 70px;"></div>
     </el-dialog>
+
+
+    <re-process :code="selectInstanceId" v-if="openItemDl" @submit="resubmit"/>
   </div>
 </template>
 
 <script>
 import FormRenderView from '@/views/common/form/FormRenderView'
+import ReProcess from "./ReProcess";
 import ProcessDiagramViewer from "../admin/layout/ProcessDiagramViewer";
 import {getAboutInstanceList, getInitiatedInstanceInfo} from "@/api/processInstance";
 import {timeLength} from '@/utils/date'
 import OperationRender from "../common/operation/OperationRender";
+
 export default {
   name: "AboutInstance",
-  components: {OperationRender, FormRenderView, ProcessDiagramViewer},
+  components: {ReProcess, OperationRender, FormRenderView, ProcessDiagramViewer},
   data() {
     return {
       approveOpen: false,
       processDiagramViewer: false,
       selectProcessInstance: {},
+      selectInstanceId: null,
       tableData: [],
       loading: false,
+      openItemDl: false,
       processInstanceData: {
         userInfo: {},
         formData: {},
@@ -117,12 +135,20 @@ export default {
     this.getList();
   },
   methods: {
-    clickRow(row) {
-      this.approveOpen = true;
-      this.loadProcessInstance(row.processInstanceId)
-      this.selectProcessInstance = row
+    showDetails(row, column) {
+      if (column.label !== '操作') {
+        this.approveOpen = true;
+        this.loadProcessInstance(row.processInstanceId)
+        this.selectProcessInstance = row
+      }
+    },
+    resubmitHander(instanceId) {
+      this.selectInstanceId = instanceId;
+      this.openItemDl = false
+      this.$nextTick(() => {
+        this.openItemDl = true
+      })
     },
-
     loadProcessInstance(processInstanceId) {
       let that = this;
       this.init();
@@ -158,7 +184,11 @@ 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
@@ -168,7 +198,7 @@ export default {
     getTimeConsuming(instance) {
       if (instance.state != 1) {
         //dateFormat(开始时间,结束时间)
-        return timeLength(instance.submitTime,instance.endTime);
+        return timeLength(instance.submitTime, instance.endTime);
       }
     }
   }
@@ -180,24 +210,24 @@ export default {
   padding: 0 10px 10px 10px;
   display: flex;
 
-.top_left {
-  display: flex;
-  flex-direction: column;
-  width: 50px;
-  align-items: center;
+  .top_left {
+    display: flex;
+    flex-direction: column;
+    width: 50px;
+    align-items: center;
+  }
+
+  .top_right {
+    width: 85%;
+    display: flex;
+    flex-direction: column;
+    //justify-content: space-between;
+    font-size: 13px;
+    margin-left: 10px;
+  }
 }
 
-.top_right {
-  width: 85%;
-  display: flex;
-  flex-direction: column;
-//justify-content: space-between;
-  font-size: 13px;
-  margin-left: 10px;
-}
-}
-
-.state_tag{
+.state_tag {
   font-size: 12px;
   //margin-right: 15px;
 }
diff --git a/flowable-engine-web/src/views/workspace/InitiateProcess.vue b/flowable-engine-web/src/views/workspace/InitiateProcess.vue
index a2d4ad4..bb461de 100644
--- a/flowable-engine-web/src/views/workspace/InitiateProcess.vue
+++ b/flowable-engine-web/src/views/workspace/InitiateProcess.vue
@@ -2,17 +2,12 @@
   <div v-loading="loading" class="initiate_process">
     <div v-if="!loading" style="min-width: 338px;">
       <!--渲染表单-->
-      <form-render class="process-form" ref="initiateForm" :form-items="processDefinition.formItems" v-model="formData"/>
+      <form-render class="process-form" ref="initiateForm" :form-items="processDefinition.formItems"
+                   v-model="formData"/>
     </div>
     <div style="display: flex;justify-content: center;flex-direction: column;min-width: 1036px;">
-        <span style="font-size: 18px;text-align: center;padding-top: 20px;">审批流程</span>
+      <span style="font-size: 18px;text-align: center;padding-top: 20px;">审批流程</span>
       <process-diagram-viewer ref="processDiagramViewer"/>
-      <!--渲染流程执行过程-->
-      <el-timeline :reverse="false">
-        <!--        <el-timeline-item v-for="(activity, index) in activities" :key="index">-->
-
-        <!--        </el-timeline-item>-->
-      </el-timeline>
     </div>
   </div>
 </template>
diff --git a/flowable-engine-web/src/views/workspace/InitiatedInstance.vue b/flowable-engine-web/src/views/workspace/InitiatedInstance.vue
index 6b1b7a5..8b5339e 100644
--- a/flowable-engine-web/src/views/workspace/InitiatedInstance.vue
+++ b/flowable-engine-web/src/views/workspace/InitiatedInstance.vue
@@ -39,11 +39,14 @@
       <el-table-column
           label="操作">
         <template slot-scope="scope">
-          <template v-if="scope.row.state === '4'">
-            <el-button size="min" type="text" icon="el-icon-thumb">再次提交</el-button>
-          </template>
-          <template v-if="scope.row.state === '2' || scope.row.state === '3'">
-            <el-button size="min" type="text" icon="el-icon-thumb" @click="resubmitHander(scope.row.taskId)">重新提交</el-button>
+          <template v-if="scope.row.isSelf">
+            <template v-if="scope.row.state === '4'">
+              <el-button size="min" type="text" icon="el-icon-thumb" @click="resubmitHander(scope.row.taskId)">再次提交</el-button>
+            </template>
+            <template v-if="scope.row.state === '2' || scope.row.state === '3'">
+              <el-button size="min" type="text" icon="el-icon-thumb" @click="resubmitHander(scope.row.taskId)">重新提交
+              </el-button>
+            </template>
           </template>
         </template>
       </el-table-column>
@@ -57,17 +60,20 @@
         <div class="top">
           <div class="top_left">
             <el-avatar size="large" :src="processInstanceData.userInfo.avatar"></el-avatar>
-            <span style="text-align: center;color: #19191a;font-size: 14px;">{{ processInstanceData.userInfo.name }}</span>
+            <span style="text-align: center;color: #19191a;font-size: 14px;">{{processInstanceData.userInfo.name}}</span>
           </div>
           <div class="top_right">
             <div style="margin-bottom: 12px">
               <span style="font-size: 15px;margin-right: 15px">{{ selectProcessInstance.deploymentName }}</span>
-              <el-tag class="state_tag" v-if="selectProcessInstance.state === '1'" size="mini" >进行中</el-tag>
-              <el-tag class="state_tag" v-if="selectProcessInstance.state === '4'" size="mini" type="success">审批通过</el-tag>
-              <el-tag class="state_tag" v-if="selectProcessInstance.state === '3'" size="mini" type="danger">审批驳回</el-tag>
+              <el-tag class="state_tag" v-if="selectProcessInstance.state === '1'" size="mini">进行中</el-tag>
+              <el-tag class="state_tag" v-if="selectProcessInstance.state === '4'" size="mini" type="success">审批通过
+              </el-tag>
+              <el-tag class="state_tag" v-if="selectProcessInstance.state === '3'" size="mini" type="danger">审批驳回
+              </el-tag>
               <el-tag class="state_tag" v-if="selectProcessInstance.state === '2'" size="mini" type="info">已撤销</el-tag>
               <el-tooltip class="item" effect="dark" content="查看详细流程" placement="top-start">
-                <el-icon class="el-icon-view" style="float: right;font-size: 20px;cursor: pointer" @click.native="processDiagramViewer = true"></el-icon>
+                <el-icon class="el-icon-view" style="float: right;font-size: 20px;cursor: pointer"
+                         @click.native="processDiagramViewer = true"></el-icon>
               </el-tooltip>
             </div>
             <div>
@@ -90,15 +96,7 @@
       <process-diagram-viewer v-if="processDiagramViewer"/>
       <div style="height: 70px;"></div>
     </el-dialog>
-
-    <re-process :code="selectInstanceId" v-if="openItemDl"/>
-<!--    <el-dialog title="发起审批" :visible.sync="openItemDl" :close-on-click-modal="true">-->
-<!--      <re-initiate-process ref="processInstance" :code="selectInstanceId" v-if="openItemDl"></re-initiate-process>-->
-<!--      <span slot="footer" class="dialog-footer">-->
-<!--				<el-button size="mini" @click="openItemDl = false">取 消</el-button>-->
-<!--				<el-button size="mini" type="primary" @click="submitForm">提 交</el-button>-->
-<!--			</span>-->
-<!--    </el-dialog>-->
+    <re-process :code="selectInstanceId" v-if="openItemDl" @submit="resubmit"/>
   </div>
 </template>
 
@@ -109,6 +107,7 @@ import ReProcess from "./ReProcess";
 import {getInitiatedInstanceList, getInitiatedInstanceInfo} from "@/api/processInstance";
 import {timeLength} from '@/utils/date'
 import OperationRender from "../common/operation/OperationRender";
+
 export default {
   name: "InitiatedInstance",
   components: {ReProcess, OperationRender, FormRenderView, ProcessDiagramViewer},
@@ -119,8 +118,8 @@ export default {
       selectProcessInstance: {},
       tableData: [],
       loading: false,
-      openItemDl:false,
-      selectInstanceId:null,
+      openItemDl: false,
+      selectInstanceId: null,
       processInstanceData: {
         userInfo: {},
         formData: {},
@@ -134,8 +133,8 @@ export default {
     this.getList();
   },
   methods: {
-    showDetails(row,column) {
-      if (column.label !== '操作'){
+    showDetails(row, column) {
+      if (column.label !== '操作') {
         this.approveOpen = true;
         this.loadProcessInstance(row.processInstanceId)
         this.selectProcessInstance = row
@@ -156,8 +155,11 @@ export default {
         this.loading = false;
       })
     },
-
-
+    resubmit(flag) {
+      if (flag) {
+        this.getList();
+      }
+    },
     init() {
       this.processInstanceData = {
         userInfo: {},
@@ -175,15 +177,12 @@ export default {
       this.$store.state.diagramMode = "viewer";
       this.$store.state.preview = false;
     },
-    resubmitHander(instanceId){
+    resubmitHander(instanceId) {
       this.selectInstanceId = instanceId;
       this.openItemDl = false
-      // 在组件移除后，重新渲染组件
-      // this.$nextTick可实现在DOM 状态更新后，执行传入的方法。
       this.$nextTick(() => {
         this.openItemDl = true
       })
-      console.log("书剑")
     },
     getList() {
       getInitiatedInstanceList().then(res => {
@@ -194,7 +193,7 @@ export default {
     getTimeConsuming(instance) {
       if (instance.state != 1) {
         //dateFormat(开始时间,结束时间)
-        return timeLength(instance.submitTime,instance.endTime);
+        return timeLength(instance.submitTime, instance.endTime);
       }
     }
   }
@@ -206,24 +205,24 @@ export default {
   padding: 0 10px 10px 10px;
   display: flex;
 
-.top_left {
-  display: flex;
-  flex-direction: column;
-  width: 50px;
-  align-items: center;
+  .top_left {
+    display: flex;
+    flex-direction: column;
+    width: 50px;
+    align-items: center;
+  }
+
+  .top_right {
+    width: 85%;
+    display: flex;
+    flex-direction: column;
+    //justify-content: space-between;
+    font-size: 13px;
+    margin-left: 10px;
+  }
 }
 
-.top_right {
-  width: 85%;
-  display: flex;
-  flex-direction: column;
-//justify-content: space-between;
-  font-size: 13px;
-  margin-left: 10px;
-}
-}
-
-.state_tag{
+.state_tag {
   font-size: 12px;
   //margin-right: 15px;
 }
diff --git a/flowable-engine-web/src/views/workspace/ReProcess.vue b/flowable-engine-web/src/views/workspace/ReProcess.vue
index 3444b6e..7ccc5b0 100644
--- a/flowable-engine-web/src/views/workspace/ReProcess.vue
+++ b/flowable-engine-web/src/views/workspace/ReProcess.vue
@@ -24,7 +24,7 @@
 <script>
 import FormRender from "@/views/common/form/FormRender";
 import ProcessDiagramViewer from "../admin/layout/ProcessDiagramViewer";
-import {getInitiatedInstanceReInfo,restartProcessInstance} from "@/api/processInstance";
+import {getInitiatedInstanceReInfo, restartProcessInstance} from "@/api/processInstance";
 
 export default {
   name: "ReProcess",
@@ -69,10 +69,16 @@ export default {
   methods: {
     loadProcessDefinitionReInfo(instanceId) {
       this.openItemDl = true;
-          getInitiatedInstanceReInfo(instanceId).then(res => {
+      getInitiatedInstanceReInfo(instanceId).then(res => {
         let processDefinition = res.data;
         this.processDefinition = processDefinition;
         this.formData = processDefinition.formData
+        if (processDefinition.optionalUser){
+          this.$store.state.selectUserMap = new Map();
+          for (let key in processDefinition.optionalUser) {
+            this.$store.state.selectUserMap.set(key,processDefinition.optionalUser[key])
+          }
+        }
         //构建表单及校验规则
         this.$store.state.design = processDefinition;
         this.loading = false;
@@ -81,9 +87,11 @@ export default {
       });
     },
 
-    resubmitForm(){
+    resubmitForm() {
       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.code,
         formData: JSON.stringify(this.formData),
@@ -91,7 +99,8 @@ export default {
       }
       this.validate(valid => {
         if (valid) {
-          restartProcessInstance(paramsData).then(res=>{
+          restartProcessInstance(paramsData).then(res => {
+            this.$emit("submit", true)
             this.openItemDl = false
             this.$message.success(res.msg)
           })
-- 
2.40.1