修改发起流程对话框

修改技术交底、安全交底

oa-ui/src/assets/icons/svg/file.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M8.5 11.5v-1h7v1zm0-4v-1h7v1zm-2.5 7h7.5q.61 0 1.12.264q.509.265.876.744L18 18.758V4.615q0-.269-.173-.442T17.385 4H6.615q-.269 0-.442.173T6 4.615zm.615 5.5h11.07l-2.975-3.883q-.227-.296-.536-.456q-.309-.161-.674-.161H6v3.885q0 .269.173.442t.442.173m10.77 1H6.615q-.69 0-1.152-.462Q5 20.075 5 19.385V4.615q0-.69.463-1.152Q5.925 3 6.615 3h10.77q.69 0 1.152.463q.463.462.463 1.152v14.77q0 .69-.462 1.152q-.463.463-1.153.463M6 20V4zm0-4.5v-1z"/></svg>

oa-ui/src/assets/icons/svg/folder.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M4 20q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h6l2 2h8q.825 0 1.413.588T22 8H11.175l-2-2H4v12l2.4-8h17.1l-2.575 8.575q-.2.65-.737 1.038T19 20zm2.1-2H19l1.8-6H7.9zm0 0l1.8-6zM4 8V6z"/></svg>

oa-ui/src/assets/icons/svg/folder_close.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M4 20q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h6l2 2h8q.825 0 1.413.588T22 8v10q0 .825-.587 1.413T20 20zm0-2h16V8h-8.825l-2-2H4zm0 0V6z"/></svg>

oa-ui/src/store/modules/projectProcess.js

@@ -1,7 +1,10 @@
 const projectProcess = {
   state: {
     underDeptId: [],
-    underLeaderId: []
+    underLeaderId: [],
+    projectNumber: '',
+    projectName: '',
+    project: {}
   },
   mutations: {
     SET_UNDERDEPTID: (state, underDeptId) => {
@@ -9,7 +12,16 @@ const projectProcess = {
     },
     SET_UNDERLEADERID: (state, underLeaderId) => {
       state.underLeaderId = underLeaderId
-    }
+    },
+    SET_PROJECTNUMBER: (state, projectNumber) => {
+      state.projectNumber = projectNumber
+    },
+    SET_PROJECTNAME: (state, projectName) => {
+      state.projectName = projectName
+    },
+    SET_PROJECT: (state, project) => {
+      state.project = project
+    },
   }
 }
 export default projectProcess

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-17 15:21:14
+ * @LastEditTime: 2024-04-18 14:01:23
 -->
 <template>
   <div class="main">
@@ -117,9 +117,9 @@
       </tr>
       <tr>
         <td class="head">编制人</td>
-        <td colspan="2">{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName :'' }}</td>
-        <td class="head">审核人</td>
-        <td colspan="3">{{ name }}</td>
+        <td colspan="5">{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName :'' }}</td>
+        <!-- <td class="head">审核人</td> -->
+        <!-- <td colspan="3">{{ name }}</td> -->
       </tr>
     </table>
   </div>
@@ -216,7 +216,7 @@ export default {
 
 <style lang="scss" scoped>
 .main {
-  width: 1200px;
+  width: 100%;
   margin: 0 auto;
   text-align: center;
 }

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-16 17:01:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-18 11:45:54
 -->
 <template>
   <div class="app-container">
@@ -137,6 +137,9 @@ export default {
         } else {
           this.$set(this.form, 'deptId', [])
         }
+        this.$store.commit('SET_PROJECTNUMBER',this.form.projectNumber)
+        this.$store.commit('SET_PROJECTNAME',this.form.projectName)
+        this.$store.commit('SET_PROJECT',this.form)
       })
     },
     getUserList() {

oa-ui/src/views/flowable/form/projectProcess/budgetTab.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-empty description="预算未编制，等待项目负责人编制" v-if="!haveBudget"></el-empty>
+    <div v-if="haveBudget">
+      <!-- <h3 class="text-center">{{ title }}</h3> -->
+      <div>
+        <budget-info :taskForm="taskForm"></budget-info>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listBudget } from "@/api/oa/budget/budget";
+import { listBudgetCar, getBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice, getBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle, getBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff, getBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { getProjectWork } from "@/api/oa/project/projectWork";
+import BudgetInfo from "../budget/budgetInfo.vue";
+export default {
+  components: {
+    BudgetInfo,
+  },
+  props: {
+    taskForm: Object,
+    require: true,
+  },
+  computed: {
+    projectNumber() {
+      return this.$store.state.projectProcess.projectNumber;
+    },
+    projectName() {
+      return this.$store.state.projectProcess.projectName;
+    },
+  },
+  data() {
+    return {
+      haveBudget: false,
+      title: "",
+      form: {},
+      loading: true,
+      workList: [],
+      budgetId:''
+    };
+  },
+  mounted() {
+    this.initBudget();
+    setTimeout(() => {
+      this.title = "【" + this.projectNumber + "-" + this.projectName + "】项目预算";
+      this.loading = false;
+    }, 500);
+  },
+  methods: {
+    initBudget() {
+      let projectId = this.taskForm.formId;
+      listBudget({ projectId }).then(res => {
+        console.log(res);
+        if (res.total != 0) {
+          this.haveBudget = true;
+          this.budgetId = res.rows[0].budgetId;
+          getProjectWork(projectId).then(res => {
+            if (res.data) {
+              this.workList = res.data;
+            }
+            getBudgetSettle(this.budgetId).then(res => {
+
+              console.log(res);
+            });
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/form/projectProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-15 09:32:33
+ * @LastEditTime: 2024-04-19 17:39:47
 -->
 
 <template>
@@ -17,13 +17,13 @@
             <arrangeProject :taskForm="taskForm" :disabled="taskName != '项目安排'" @goBack="goBack"></arrangeProject>
           </el-tab-pane>
           <el-tab-pane label="项目预算" name="项目预算">
-
+            <budget-tab :taskForm="taskForm"  @goBack="goBack"></budget-tab>
           </el-tab-pane>
           <el-tab-pane label="安全交底" name="安全交底">
-
-          </el-tab-pane>
+            <safe-tab :taskForm="taskForm"  @goBack="goBack"></safe-tab>
+          </el-tab-pane :taskForm="taskForm"  @goBack="goBack">
           <el-tab-pane label="技术交底" name="技术交底">
-
+            <technical-tab :taskForm="taskForm" :taskName="taskName"  @goBack="goBack"></technical-tab>
           </el-tab-pane>
           <el-tab-pane label="经营审核" name="经营审核">
             <business-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '经营审核'"
@@ -70,6 +70,9 @@ import { flowXmlAndNode } from "@/api/flowable/definition";
 import ManageReview from './manageReview.vue'
 import ScConfirm from './scConfirm.vue'
 import InProgress from './inProgress.vue'
+import BudgetTab from './budgetTab.vue'
+import TechnicalTab from './technicalTab.vue'
+import SafeTab from './safeTab.vue'
 export default {
   props: {
     taskName: {
@@ -79,7 +82,7 @@ export default {
       type: Object,
     }
   },
-  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress },
+  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, TechnicalTab, SafeTab },
   data() {
     return {
       activeName: '项目登记',

oa-ui/src/views/flowable/form/projectProcess/manageReview.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-12 10:11:22
+ * @LastEditTime: 2024-04-18 11:02:05
 -->
 <template>
   <div class="app-container">
@@ -69,7 +69,6 @@ export default {
   },
   watch: {
     underDeptId(newVal, oldVal) {
-      console.log(newVal);
       this.getDeptLeader(newVal)
     }
   },

oa-ui/src/views/flowable/form/projectProcess/safeTab.vue

@@ -0,0 +1,127 @@
+<template>
+  <div class="app-container">
+    <el-empty description="未进行安全交底" v-if="isEmpty"></el-empty>
+    <div v-if="!isEmpty">
+      <h3 class="text-center">{{ form.projectNumber + '-' + form.projectName + ' 安全交底' }}</h3>
+      <el-form ref="safeForm" :model="form" :rules="rules" label-width="125px" disabled>
+        <el-form-item label="项目编号：" prop="projectNumber">
+          {{ form.projectNumber }}
+        </el-form-item>
+        <el-form-item label="项目名称：" prop="projectName">
+          {{ form.projectName }}
+        </el-form-item>
+        <el-form-item label="接受交底人" prop="disclosureAccepter">
+          <el-select v-model="form.disclosureAccepter" filterable clearable style="width:220px">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="环境管理要求" prop="environmentComment">
+          <el-input v-model="form.environmentComment" placeholder="请输入环境管理要求" type="textarea"
+            :autosize="{ minRows: 8 }" />
+        </el-form-item>
+        <el-form-item label="安全生产与职业健康要求" prop="outsideComment">
+          <el-input v-model="form.outsideComment" placeholder="请输入安全生产与职业健康要求" type="textarea"
+            :autosize="{ minRows: 8 }" />
+        </el-form-item>
+        <el-form-item label="信息安全管理要求" prop="insideComment">
+          <el-input v-model="form.insideComment" placeholder="请输入信息安全管理要求" type="textarea" :autosize="{ minRows: 8 }" />
+        </el-form-item>
+        <el-form-item label="安全交底意见" prop="disclosureComment">
+          <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-form-item label="安全交底人" prop="disclosurer">
+          <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : form.user.nickName }}</span>
+        </el-form-item>
+        <el-form-item label="安全交底时间" prop="disclosureTime">
+          <el-date-picker clearable v-model="form.disclosureTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="接受交底意见" prop="disclosureComment">
+          <el-input :disabled="true" placeholder="按要求进行作业" />
+        </el-form-item>
+        <el-form-item label="接受交底时间" prop="acceptTime">
+          <el-date-picker clearable v-model="form.acceptTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listSafe, getSafe, delSafe, addSafe, updateSafe } from "@/api/oa/safe/safe";
+import { listUser } from '@/api/system/user';
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+    projectNumber() {
+      return this.$store.state.projectProcess.projectNumber;
+    },
+    projectName() {
+      return this.$store.state.projectProcess.projectName;
+    },
+  },
+  watch: {
+    projectNumber(newval) {
+      this.$set(this.form, "projectNumber", newval);
+    },
+    projectName(newval) {
+      this.$set(this.form, "projectName", newval);
+    }
+  },
+  data() {
+    return {
+      isEmpty: true,
+      form: {},
+      rules: {},
+      userList: [],
+    }
+  },
+  mounted() {
+    this.initForm();
+    this.getUserList();
+  },
+  methods: {
+    /** 查询cmc技术交底列表 */
+    initForm() {
+      getSafe(this.taskForm.formId).then((res) => {
+        if (res.data) {
+          this.isEmpty = false;
+          this.form = res.data;
+          this.$set(this.form, "projectNumber", this.projectNumber);
+          this.$set(this.form, "projectName", this.projectName);
+        }
+      });
+    },
+    // 查询用户列表
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then((res) => {
+        this.userList = res.rows;
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+</style>

oa-ui/src/views/flowable/form/projectProcess/technicalTab.vue

@@ -0,0 +1,190 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-19 15:32:00
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-19 17:33:30
+-->
+<template>
+  <div class="app-container">
+    <el-empty description="技术方案未编制" v-if="!haveTechnical"></el-empty>
+    <div v-if="haveTechnical">
+      <h3 class="text-center">{{ form.projectNumber + '-' + form.projectName + ' 技术交底' }}</h3>
+      <el-form ref="technicalForm" :model="form" :rules="rules" label-width="125px" disabled>
+        <el-form-item label="项目编号：" prop="projectNumber">
+          {{ form.projectNumber }}
+        </el-form-item>
+        <el-form-item label="项目名称：" prop="projectName">
+          {{ form.projectName }}
+        </el-form-item>
+        <el-form-item label="技术负责人" prop="technicalDirector">
+          <el-select v-model="form.technicalDirector" filterable clearable style="width: 220px">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+              v-if="item.nickName != 'admin'">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="技术设计人" prop="technicalDesigner">
+          <el-select v-model="form.technicalDesigner" filterable clearable style="width:220px">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+              v-if="item.nickName != 'admin'">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="质量检查员" prop="qualityInspector">
+          <el-select v-model="form.qualityInspector" filterable multiple clearable style="width:220px">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+              v-if="item.nickName != 'admin'">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="技术安排意见" prop="planComment">
+          <el-input type="textarea" v-model="form.planComment" placeholder="请输入技术安排意见" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="technicalPlanner">
+              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ form.technicalTime ? form.technicalTime : technicalTime }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="技术方案" prop="technicalDocument">
+          <el-input v-model="form.technicalDocument" placeholder="请输入技术方案" />
+        </el-form-item>
+        <el-form-item label="方案说明" prop="designDescription">
+          <el-input type="textarea" v-model="form.designDescription" placeholder="请输入方案说明" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="designUser">
+              <span class="auditor"> {{ form.designUser ? form.designUser.nickName : designUser }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ form.technicalUploadTime ? form.technicalUploadTime : technicalUploadTime }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="技术部审核意见" prop="technicalComment">
+          <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="technicalPlanner">
+              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ form.techApprovalTime }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="总工程师审核意见" prop="manageComment">
+          <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="manager">
+              <span class="auditor"> {{ form.managerUser }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ form.manageApprovalTime  }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import technicalForm from "../technicalForm.vue";
+import { listUser } from "@/api/system/user";
+import {
+  listTechnical,
+  getTechnical,
+  delTechnical,
+  addTechnical,
+  updateTechnical,
+} from "@/api/oa/technical/technical";
+export default {
+  components: { technicalForm },
+  props: {
+    taskForm: {
+      type: Object,
+      require: true,
+    },
+  },
+  computed: {
+    projectNumber() {
+      return this.$store.state.projectProcess.projectNumber;
+    },
+    projectName() {
+      return this.$store.state.projectProcess.projectName;
+    },
+  },
+  watch:{
+    projectNumber(newval){
+      this.$set(this.form, "projectNumber", newval);
+    },
+    projectName(newval){
+      this.$set(this.form, "projectName", newval);
+    }
+  },
+  data() {
+    return {
+      haveTechnical: false,
+      form: {},
+      rules: {},
+      userList: [],
+    };
+  },
+  mounted() {
+    this.initForm();
+    this.getUserList();
+  },
+  methods: {
+    /** 查询cmc技术交底列表 */
+    initForm() {
+      getTechnical(this.taskForm.formId).then((res) => {
+        console.log(res);
+        if (res.data) {
+          this.haveTechnical = true;
+          this.form = res.data;
+          this.$set(this.form, "projectNumber", this.projectNumber);
+          this.$set(this.form, "projectName", this.projectName);
+        }
+      });
+    },
+    // 查询用户列表
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then((res) => {
+        this.userList = res.rows;
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+</style>

oa-ui/src/views/flowable/form/technicalForm.vue

@@ -454,8 +454,21 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
 .auditor {
   font-family: '华文行楷';
   font-size: 20px;
-}</style>
+}
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+</style>

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-01-03 09:23:11
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-19 15:08:13
+-->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
@@ -19,7 +25,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['system:deployment:add']">发起申请</el-button>
+          v-hasPermi="['system:deployment:add']">发起流程</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
@@ -71,8 +77,9 @@
       @pagination="getList" />
 
     <!-- 发起流程 -->
-    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
-      <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
+      <progress-tree :definitionList="definitionList" @confirm="handleStartProcess"></progress-tree>
+      <!-- <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="queryProcessParams.name" placeholder="请输入名称" clearable size="small"
             @keyup.enter.native="handleQuery" />
@@ -81,25 +88,25 @@
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleProcessQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetProcessQuery">重置</el-button>
         </el-form-item>
-      </el-form>
-      <el-table v-loading="processLoading" fit :data="definitionList" border>
+      </el-form> -->
+      <!-- <el-table v-loading="processLoading" fit :data="definitionList" border>
         <el-table-column label="流程名称" align="center" prop="name" />
-        <!-- <el-table-column label="流程版本" align="center">
+        <el-table-column label="流程版本" align="center">
           <template slot-scope="scope">
             <el-tag size="medium">v{{ scope.row.version }}</el-tag>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column label="流程分类" align="center" prop="category" />
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
 
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit-outline"
-              @click="handleStartProcess(scope.row)">发起申请</el-button>
+              @click="handleStartProcess(scope.row)">发起流程</el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination v-show="processTotal > 0" :total="processTotal" :page.sync="queryProcessParams.pageNum"
-        :limit.sync="queryProcessParams.pageSize" @pagination="listDefinition" />
+        :limit.sync="queryProcessParams.pageSize" @pagination="listDefinition" /> -->
     </el-dialog>
     <el-dialog title="流程进度" :visible.sync="detailsOpen" append-to-body width="600px">
       <el-scrollbar style="height: 600px;">
@@ -125,10 +132,12 @@ import { getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { Snowflake } from '@/utils/snowFlake.js'
 import RowDetail from './send/rowDetail.vue'
+import ProgressTree from './progressTree.vue';
 export default {
   name: "Deploy",
   components: {
-    RowDetail
+    RowDetail,
+    ProgressTree
   },
   data() {
     return {
@@ -173,7 +182,7 @@ export default {
       // 查询参数
       queryProcessParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 9999,
         name: null,
         category: null,
         key: null,
@@ -256,7 +265,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true;
-      this.title = "发起申请";
+      this.title = "发起流程";
       this.listDefinition();
     },
     listDefinition() {

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

@@ -0,0 +1,110 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-18 15:14:45
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-19 15:01:36
+-->
+<template>
+  <div>
+    <el-tree
+      class="filter-tree"
+      icon-class="el-icon-caret-right"
+      :data="treeData"
+      :props="defaultProps"
+      @node-click="handleNodeClick"
+      default-expand-all
+      highlight-current
+      ref="tree"
+    >
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <!-- <svg-icon icon-class="folder" class="svgIcon" style="margin-right:5px;" /> -->
+        <svg-icon v-if="!data.children" icon-class="file" class="svgIcon" />
+        <svg-icon v-else-if="node.expanded" icon-class="folder" class="svgIcon" />
+        <svg-icon v-else icon-class="folder_close" class="svgIcon" />
+        <span class="fontSize14" :title="node.label || '-'">{{ node.label }}</span>
+      </span>
+    </el-tree>
+    <el-divider></el-divider>
+    <div class="text-center">
+      <el-button type="primary" @click="confirm">确定</el-button>
+      <el-button>取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    definitionList: {
+      type: Array,
+      require: true,
+    },
+  },
+  watch: {
+    definitionList(newval, oldval) {
+      console.log(newval);
+      this.initTree();
+    },
+  },
+  data() {
+    return {
+      treeData: [],
+      defaultProps: {
+        children: "children",
+        label: "name",
+      },
+      clickNode:{}
+    };
+  },
+  mounted() {},
+  methods: {
+    initTree() {
+      this.treeData = [
+        {
+          name: "项目类",
+          children: [],
+        },
+        {
+          name: "财务类",
+          children: [],
+        },
+        {
+          name: "办公类",
+          children: [],
+        },
+        {
+          name: "考核类",
+          children: [],
+        },
+      ];
+      for (let i of this.definitionList) {
+        if (i.category == "project" || i.category == "contract") {
+          debugger;
+          if (i.name != "安全交底" && i.name != "技术交底" && i.name != "项目预算") {
+            this.treeData[0].children.push(i);
+          }
+        } else if (i.category == "borrow") {
+          this.treeData[1].children.push(i);
+        } else if (i.category == "car" || i.category == "device") {
+          this.treeData[2].children.push(i);
+        } else if (i.category == "assess") {
+          this.treeData[3].children.push(i);
+        }
+      }
+    },
+    handleNodeClick(data) {
+      console.log(data);
+      this.clickNode = data
+    },
+    confirm(){
+      this.$emit('confirm',this.clickNode)
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.svgIcon {
+  margin-right: 5px;
+}
+</style>