From 643355f110f017a0b9181eb139e10c2df03c9442 Mon Sep 17 00:00:00 2001
From: bob <bob.liu.happyelements.com>
Date: Tue, 3 Jan 2023 11:05:39 +0800
Subject: [PATCH] feat(oa-project-flow) add oa-project-flow

---
 ruoyi-ui/src/api/flowable/definition.js       |  8 ++++
 ruoyi-ui/src/api/system/project.js            |  6 +++
 .../src/views/flowable/definition/index.vue   |  2 +-
 .../src/views/flowable/oa-project-flow.vue    | 32 +++++++++++++--
 ruoyi-ui/src/views/index.vue                  | 14 -------
 ruoyi-ui/src/views/system/project/index.vue   | 41 ++++++++++---------
 6 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/ruoyi-ui/src/api/flowable/definition.js b/ruoyi-ui/src/api/flowable/definition.js
index d2243df..e9e6c5a 100644
--- a/ruoyi-ui/src/api/flowable/definition.js
+++ b/ruoyi-ui/src/api/flowable/definition.js
@@ -86,6 +86,14 @@ export function saveXml(data) {
   })
 }
 
+// 获取最新流程id
+export function getLatestIdByKey(procKey) {
+  return request({
+    url: '/flowable/definition/getLatestIdByKey/' + procKey,
+    method: 'get'
+  });
+}
+
 // 新增流程定义
 export function addDeployment(data) {
   return request({
diff --git a/ruoyi-ui/src/api/system/project.js b/ruoyi-ui/src/api/system/project.js
index 3573d28..2198236 100644
--- a/ruoyi-ui/src/api/system/project.js
+++ b/ruoyi-ui/src/api/system/project.js
@@ -8,6 +8,12 @@ export function listProject(query) {
     params: query
   })
 }
+export function optionProject() {
+  return request({
+    url: '/system/project/option',
+    method: 'get'
+  })
+}
 
 // 查询项目详细
 export function getProject(projectId) {
diff --git a/ruoyi-ui/src/views/flowable/definition/index.vue b/ruoyi-ui/src/views/flowable/definition/index.vue
index 55c2d6c..a64459c 100644
--- a/ruoyi-ui/src/views/flowable/definition/index.vue
+++ b/ruoyi-ui/src/views/flowable/definition/index.vue
@@ -404,7 +404,7 @@ export default {
       })
     },
     /** 启动流程 */
-    handleDefinitionStart(row){
+    handleDefinitionStart(){
       definitionStart(row.id).then(res =>{
         this.msgSuccess(res.msg);
       })
diff --git a/ruoyi-ui/src/views/flowable/oa-project-flow.vue b/ruoyi-ui/src/views/flowable/oa-project-flow.vue
index 6af294c..dd66e16 100644
--- a/ruoyi-ui/src/views/flowable/oa-project-flow.vue
+++ b/ruoyi-ui/src/views/flowable/oa-project-flow.vue
@@ -12,8 +12,8 @@
             <el-option
               v-for="(item,index) in projectList"
               :key="index"
-              :label="item.name"
-              :value="item.id">
+              :label="item.label"
+              :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
@@ -52,7 +52,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="startFlow">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -64,6 +64,8 @@
 import {listForm, getForm, delForm, addForm, updateForm, exportForm} from "@/api/flowable/form";
 import Editor from '@/components/Editor';
 import Parser from '@/components/parser/Parser'
+import {optionProject} from "@/api/system/project";
+import {definitionStart, getLatestIdByKey} from "@/api/flowable/definition";
 
 export default {
   name: "Form",
@@ -110,11 +112,12 @@ export default {
       }],
       // 表单参数
       form: {
-        projectId: 0,
+        projectId: undefined,
         workRecord: '',
         issue: '',
         solution: '',
       },
+      oaProjectFlowId: '',
       projectList: [],
       // 表单校验
       rules: {}
@@ -123,7 +126,28 @@ export default {
   methods: {
     init() {
       this.open = true
+      this.optionList()
+      this.getLatestIdByKey()
     },
+    /** 启动流程 */
+    startFlow(){
+      definitionStart(this.oaProjectFlowId).then(res =>{
+        this.msgSuccess(res.msg);
+      })
+    },    /** 获取最新流程id */
+    getLatestIdByKey(){
+      getLatestIdByKey("oa_project_flow").then(res => {
+        this.oaProjectFlowId = res.data;
+      });
+    },
+   /** 查询项目列表 */
+  optionList() {
+    this.loading = true;
+    optionProject().then(response => {
+      this.projectList = response.data;
+      this.loading = false;
+    });
+  },
     /** 查询流程表单列表 */
     getList() {
       this.loading = true;
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index fc76bed..6ef18ca 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -14,25 +14,11 @@
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="12" :lg="14" style="padding-left: 20px">
         <el-card class="update-log">
-          <div class="block">
-            <h2 class="demonstration">人活着就是为了樱岛麻衣 (≧▽≦) </h2>
-            <el-image style="width: 100%" :fit="contain" src="https://oscimg.oschina.net/oscnet/up-eb83b8d00104b97842d19dbadeec90fbb54.JPEG"/>
-          </div>
         </el-card>
       </el-col>
 
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
         <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>更新日志</span>
-          </div>
-          <el-collapse accordion>
-            <el-collapse-item title="v1.0.0 - 2021-04-07">
-              <ol>
-                <li>单流程完善</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
         </el-card>
       </el-col>
 
diff --git a/ruoyi-ui/src/views/system/project/index.vue b/ruoyi-ui/src/views/system/project/index.vue
index 0dc82a6..91e21bf 100644
--- a/ruoyi-ui/src/views/system/project/index.vue
+++ b/ruoyi-ui/src/views/system/project/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="项目名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -123,7 +123,7 @@
 
     <!-- 添加或修改项目对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="项目名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入项目名称" />
         </el-form-item>
@@ -146,9 +146,6 @@
                           placeholder="选择项目结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -159,7 +156,15 @@
 </template>
 
 <script>
-import { listProject, getProject, delProject, addProject, updateProject, exportProject } from "@/api/system/project";
+import {
+  listProject,
+  getProject,
+  delProject,
+  addProject,
+  updateProject,
+  exportProject,
+  optionProject
+} from "@/api/system/project";
 
 export default {
   name: "Project",
@@ -200,24 +205,12 @@ export default {
       rules: {
         name: [
           { required: true, message: "项目名称不能为空", trigger: "blur" }
-        ],
-        startDate: [
-          { required: true, message: "项目开始时间不能为空", trigger: "blur" }
-        ],
-        delFlag: [
-          { required: true, message: "删除标志不能为空", trigger: "blur" }
-        ],
-        updateTime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" }
         ]
       }
     };
   },
-  created() {
-    this.getList();
+  activated() {
+    this.optionList();
   },
   methods: {
     /** 查询项目列表 */
@@ -228,6 +221,14 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+    },  /** 查询项目列表 */
+    optionList() {
+      this.loading = true;
+      optionProject().then(response => {
+        this.projectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     // 取消按钮
     cancel() {