From f049bd7530d9f9d9178e49462f9c9754e1a7cfe7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 16 Jan 2022 17:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=94=AF=E6=8C=81=E4=B8=9A=E5=8A=A1=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-admin-ui/src/api/bpm/processInstance.js |   7 +
 yudao-admin-ui/src/api/bpm/task.js            |   1 +
 .../src/views/bpm/processInstance/create.vue  |  36 ++--
 .../src/views/bpm/processInstance/detail.vue  | 171 ++++++++++++++++++
 .../src/views/bpm/processInstance/index.vue   |   2 +-
 5 files changed, 197 insertions(+), 20 deletions(-)
 create mode 100644 yudao-admin-ui/src/views/bpm/processInstance/detail.vue

diff --git a/yudao-admin-ui/src/api/bpm/processInstance.js b/yudao-admin-ui/src/api/bpm/processInstance.js
index 2340356f..54feaede 100644
--- a/yudao-admin-ui/src/api/bpm/processInstance.js
+++ b/yudao-admin-ui/src/api/bpm/processInstance.js
@@ -26,3 +26,10 @@ export function cancelProcessInstance(id, reason) {
     }
   })
 }
+
+export function getMyProcessInstance(id) {
+  return request({
+    url: '/bpm/process-instance/get?id=' + id,
+    method: 'get',
+  })
+}
diff --git a/yudao-admin-ui/src/api/bpm/task.js b/yudao-admin-ui/src/api/bpm/task.js
index 3b4dc305..8a570488 100644
--- a/yudao-admin-ui/src/api/bpm/task.js
+++ b/yudao-admin-ui/src/api/bpm/task.js
@@ -39,3 +39,4 @@ export function rejectTask(data) {
     data: data
   })
 }
+
diff --git a/yudao-admin-ui/src/views/bpm/processInstance/create.vue b/yudao-admin-ui/src/views/bpm/processInstance/create.vue
index d265bc9e..1d3c0965 100644
--- a/yudao-admin-ui/src/views/bpm/processInstance/create.vue
+++ b/yudao-admin-ui/src/views/bpm/processInstance/create.vue
@@ -32,7 +32,7 @@
     <div v-else>
       <el-card class="box-card" >
         <div slot="header" class="clearfix">
-          <span class="el-icon-document">{{ selectProcessInstance.name }}</span>
+          <span class="el-icon-document">申请信息【{{ selectProcessInstance.name }}】</span>
           <el-button style="float: right;" type="primary" @click="selectProcessInstance = undefined">选择其它流程</el-button>
         </div>
         <el-col :span="16" :offset="6">
@@ -58,10 +58,11 @@ import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import {getForm} from "@/api/bpm/form";
 import {decodeFields} from "@/utils/formGenerator";
 import Parser from '@/components/parser/Parser'
-import {createProcessInstance} from "@/api/bpm/processInstance";
+import {createProcessInstance, getMyProcessInstancePage} from "@/api/bpm/processInstance";
 
+// 流程实例的发起
 export default {
-  name: "processDefinition",
+  name: "ProcessInstanceCreate",
   components: {
     Parser
   },
@@ -109,28 +110,25 @@ export default {
     },
     /** 处理选择流程的按钮操作 **/
     handleSelect(row) {
-      // 如果无表单，则无法发起流程
-      if (!row.formId) {
-        this.$message.error('该流程未绑定表单，无法发起流程！请重新选择你要发起的流程');
-        return;
-      }
       // 设置选择的流程
       this.selectProcessInstance = row;
 
-      // 加载对应的表单
-      getForm(row.formId).then(response => {
-        // 设置值
-        const data = response.data
+      // 流程表单
+      if (row.formId) {
+        // 设置对应的表单
         this.detailForm = {
-          ...JSON.parse(data.conf),
-          fields: decodeFields(data.fields)
+          ...JSON.parse(row.formConf),
+          fields: decodeFields(row.formFields)
         }
-      });
 
-      // 加载流程图
-      getProcessDefinitionBpmnXML(row.id).then(response => {
-        this.bpmnXML = response.data
-      })
+        // 加载流程图
+        getProcessDefinitionBpmnXML(row.id).then(response => {
+          this.bpmnXML = response.data
+        })
+      } else if (row.formCustomCreatePath) {
+        this.$router.push({ path: row.formCustomCreatePath});
+        // 这里暂时无需加载流程图，因为跳出到另外个 Tab；
+      }
     },
     /** 提交按钮 */
     submitForm(params) {
diff --git a/yudao-admin-ui/src/views/bpm/processInstance/detail.vue b/yudao-admin-ui/src/views/bpm/processInstance/detail.vue
new file mode 100644
index 00000000..1365e57c
--- /dev/null
+++ b/yudao-admin-ui/src/views/bpm/processInstance/detail.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="app-container">
+    <!-- 第一步，通过流程定义的列表，选择对应的流程 -->
+    <div v-if="!selectProcessInstance">
+      <el-table v-loading="loading" :data="list">
+        <el-table-column label="流程名称" align="center" prop="name" width="200">
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleBpmnDetail(scope.row)">
+              <span>{{ scope.row.name }}</span>
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程分类" align="center" prop="category" width="100">
+          <template slot-scope="scope">
+            <span>{{ getDictDataLabel(DICT_TYPE.BPM_MODEL_CATEGORY, scope.row.category) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程版本" align="center" prop="processDefinition.version" width="80">
+          <template slot-scope="scope">
+            <el-tag size="medium" v-if="scope.row">v{{ scope.row.version }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程描述" align="center" prop="description" width="300" show-overflow-tooltip />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" icon="el-icon-plus" @click="handleSelect(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 第二步，填写表单，进行流程的提交 -->
+    <div v-else>
+      <el-card class="box-card" >
+        <div slot="header" class="clearfix">
+          <span class="el-icon-document">申请信息【{{ selectProcessInstance.name }}】</span>
+          <el-button style="float: right;" type="primary" @click="selectProcessInstance = undefined">选择其它流程</el-button>
+        </div>
+        <el-col :span="16" :offset="6">
+          <div>
+            <parser :key="new Date().getTime()" :form-conf="detailForm" @submit="submitForm" />
+          </div>
+        </el-col>
+      </el-card>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span class="el-icon-picture-outline">流程图</span>
+        </div>
+        <my-process-viewer key="designer" v-model="bpmnXML" v-bind="bpmnControlForm" />
+      </el-card>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {getProcessDefinitionBpmnXML, getProcessDefinitionList} from "@/api/bpm/definition";
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import {getForm} from "@/api/bpm/form";
+import {decodeFields} from "@/utils/formGenerator";
+import Parser from '@/components/parser/Parser'
+import {createProcessInstance, getMyProcessInstancePage} from "@/api/bpm/processInstance";
+
+// 流程实例的详情页，可用于审批
+export default {
+  name: "ProcessInstanceDetail",
+  components: {
+    Parser
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+
+      // 流程表单详情
+      detailForm: {
+        fields: []
+      },
+
+      // BPMN 数据
+      bpmnXML: null,
+      bpmnControlForm: {
+        prefix: "activiti"
+      },
+
+      // 流程表单
+      selectProcessInstance: undefined, // 选择的流程实例
+
+      // 数据字典
+      categoryDictDatas: getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY),
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询流程定义列表 */
+    getList() {
+      this.loading = true;
+      getProcessDefinitionList({
+        suspensionState: 1
+      }).then(response => {
+          this.list = response.data
+          this.loading = false
+        }
+      );
+    },
+    /** 处理选择流程的按钮操作 **/
+    handleSelect(row) {
+      // 设置选择的流程
+      this.selectProcessInstance = row;
+
+      // 流程表单
+      if (row.formId) {
+        // 设置对应的表单
+        this.detailForm = {
+          ...JSON.parse(row.formConf),
+          fields: decodeFields(row.formFields)
+        }
+
+        // 加载流程图
+        getProcessDefinitionBpmnXML(row.id).then(response => {
+          this.bpmnXML = response.data
+        })
+      } else if (row.formCustomCreatePath) {
+        this.$router.push({ path: row.formCustomCreatePath});
+        // 这里暂时无需加载流程图，因为跳出到另外个 Tab；
+      }
+    },
+    /** 提交按钮 */
+    submitForm(params) {
+      if (!params) {
+        return;
+      }
+      // 设置表单禁用
+      const conf = params.conf;
+      conf.disabled = true; // 表单禁用
+      conf.formBtns = false; // 按钮隐藏
+
+      // 提交表单，创建流程
+      const variables = params.values;
+      createProcessInstance({
+        processDefinitionId: this.selectProcessInstance.id,
+        variables: variables
+      }).then(response => {
+        this.msgSuccess("发起流程成功");
+        // 关闭当前窗口
+        this.$store.dispatch("tagsView/delView", this.$route);
+        this.$router.go(-1);
+      }).catch(() => {
+        conf.disabled = false; // 表单开启
+        conf.formBtns = true; // 按钮展示
+      })
+    },
+  }
+};
+</script>
+
+<style lang="scss">
+.my-process-designer {
+  height: calc(100vh - 200px);
+}
+
+.box-card {
+  width: 100%;
+  margin-bottom: 20px;
+}
+</style>
diff --git a/yudao-admin-ui/src/views/bpm/processInstance/index.vue b/yudao-admin-ui/src/views/bpm/processInstance/index.vue
index a339ffdb..851ffec0 100644
--- a/yudao-admin-ui/src/views/bpm/processInstance/index.vue
+++ b/yudao-admin-ui/src/views/bpm/processInstance/index.vue
@@ -129,7 +129,7 @@ import {
 import {deleteErrorCode} from "@/api/system/errorCode";
 
 export default {
-  name: "ProcessInstanceExt",
+  name: "ProcessInstance",
   components: {
   },
   data() {