修改流程为，启动时就传入formId

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -107,7 +107,7 @@ public class CmcProjectController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcProject cmcProject = new CmcProject();
-        cmcProject.setProjectId(formDataJson.getString("formId"));
+        cmcProject.setProjectId(formDataJson.getString("projectId"));
         cmcProject.setProjectName(formDataJson.getString("projectName"));
         cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
         cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java

@@ -1,12 +1,12 @@
 package com.ruoyi.flowable.service.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.flowable.common.enums.FlowComment;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.FlowProcDefDto;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
@@ -19,15 +19,12 @@ import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.repository.ProcessDefinitionQuery;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.image.impl.DefaultProcessDiagramGenerator;
-import org.flowable.task.api.Task;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -199,6 +196,9 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
             SysUser sysUser = SecurityUtils.getLoginUser().getUser();
             identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
             variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
+            Map<String, Object> map = variables;
+            JSONObject jsonObject = JSONObject.parse(JSONObject.toJSONString(map));
+            variables.put("formId", jsonObject.getJSONObject("variables").getString("formId"));
             ProcessInstance startInstance = runtimeService.startProcessInstanceById(procDefId, variables);
             // 流程发起时 跳过发起人节点
 //            SysUser sysUser = SecurityUtils.getLoginUser().getUser();

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectWorkMapper.xml

@@ -47,8 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">unit,</if>
             <if test="workload != null">workload,</if>
             <if test="deadline != null">deadline,</if>
-            <if test="finishTime != null">remark,</if>
-            <if test="remark != null">finish_time,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workId != null">#{workId},</if>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-03 17:05:19
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-07 13:55:49
 -->
 
 <template>
@@ -38,7 +38,7 @@
       <el-form-item label="联系电话：" prop="telephone">
         <el-input v-model="addForm.telephone"></el-input>
       </el-form-item>
-      <el-form-item label="项目概况：" prop="projectRegistrant">
+      <el-form-item label="项目概况：" prop="workList">
         <table border="1">
           <tr>
             <td style="width:250px;">工作内容</td>
@@ -77,10 +77,11 @@
 
         <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
       </el-form-item>
-      <el-form-item label="项目登记人：" prop="projectRegistrant">
-        <el-input v-model="addForm.projectRegistrant"></el-input>
+      <el-form-item label="项目登记人：" prop="projectRegistrantName">
+        <el-tag>{{ addForm.projectRegistrantName }}</el-tag>
+        <!-- <el-input v-model="addForm.projectRegistrant"></el-input> -->
       </el-form-item>
-      <el-form-item label="备注：" prop="projectRegistrant">
+      <el-form-item label="备注：" prop="remark">
         <el-input v-model="addForm.remark" type="textarea" rows="3"></el-input>
       </el-form-item>
 
@@ -95,7 +96,8 @@
 </template>
 
 <script>
-import { listProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
+import { mapGetters } from "vuex";
+import { listProject, addProject, updateProject, delProject,submitProject } from "@/api/oa/project/project";
 import { getUser } from '@/api/system/user'
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
@@ -110,6 +112,9 @@ export default {
       required: true
     }
   },
+  computed: {
+    ...mapGetters(["userId","name"]),
+  },
   data() {
     return {
       // 查询参数
@@ -125,7 +130,10 @@ export default {
       total: 0,
       loading: true,
       modifyOpen: false,
-      addForm: {},
+      addForm: {
+        projectRegistrant:'',
+        projectRegistrantName:''
+      },
       rules: {
         projectNumber: [{ required: true, message: '请输入项目编号', trigger: 'blur' }],
         projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
@@ -144,7 +152,12 @@ export default {
     }
   },
   created() {
+    this.addForm.projectRegistrant = this.userId
+    this.addForm.projectRegistrantName = this.name
     this.getList();
+  },
+  mounted() {
+    
   },
   methods: {
     // 查询项目列表
@@ -167,7 +180,9 @@ export default {
     confirmAddForm() {
       this.addForm.projectId = this.taskForm.formId;
       this.addForm.workList = this.workList;
-      addProject(this.addForm).then(response => {
+      let forms = new FormData();
+      forms.append('form',JSON.stringify(this.addForm));
+      submitProject(forms).then(response => {
         this.$modal.msgSuccess("新增成功");
         this.getList();
       });

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

@@ -1,13 +1,13 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-03 16:53:59
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-07 11:02:16
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align: center;">项目安排</h2>
-    <el-form :model="form" :rules="rules" label-width="100px" :disable="disable">
+    <el-form :model="form" :rules="rules" label-width="100px">
       <el-form-item label="承担部门：" prop="undertakingDept">
         <el-select v-model="form.deptId" multiple clearable style="width:500px" @change="getDeptLeader">
           <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
@@ -73,10 +73,6 @@ import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 export default {
   props: {
-    disable: {
-      type: Boolean,
-      require: true
-    },
     taskForm: {
       type: Object,
       required: true

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

@@ -1,28 +1,28 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-02 14:56:03
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-07 11:10:57
 -->
 
 <template>
   <div class="project-wrapper">
 
     <el-tabs tabPosition="left" type="card" class="tabs-border" v-model="activeName">
-      <el-tab-pane label="项目登记">
-        <addproject :taskForm = "taskForm" :disable="taskName != '项目登记'"></addproject>
+      <el-tab-pane label="项目登记" name="项目登记" :disabled="taskName != '项目登记'">
+        <addproject :taskForm="taskForm"></addproject>
       </el-tab-pane>
-      <el-tab-pane label="项目安排">
-        <arrangeProject :taskForm = "taskForm" :disable="taskName != '项目安排'"></arrangeProject>
+      <el-tab-pane label="项目安排" name="项目安排" :disabled="taskName != '项目安排'">
+        <!-- <arrangeProject :taskForm ="taskForm"></arrangeProject> -->
       </el-tab-pane>
-      <el-tab-pane label="技术交底"></el-tab-pane>
-      <el-tab-pane label="安全交底"></el-tab-pane>
-      <el-tab-pane label="经营审核"></el-tab-pane>
-      <el-tab-pane label="分管审核"></el-tab-pane>
-      <el-tab-pane label="生产确认"></el-tab-pane>
-      <el-tab-pane label="项目生产"></el-tab-pane>
-      <el-tab-pane label="质量检查"></el-tab-pane>
-      <el-tab-pane label="成果归档"></el-tab-pane>
+      <el-tab-pane label="技术交底" name="技术交底" :disabled="taskName != '技术交底'"></el-tab-pane>
+      <el-tab-pane label="安全交底" name="安全交底" :disabled="taskName != '安全交底'"></el-tab-pane>
+      <el-tab-pane label="经营审核" name="经营审核" :disabled="taskName != '经营审核'"></el-tab-pane>
+      <el-tab-pane label="分管审核" name="分管审核" :disabled="taskName != '分管审核'"></el-tab-pane>
+      <el-tab-pane label="生产确认" name="生产确认" :disabled="taskName != '生产确认'"></el-tab-pane>
+      <el-tab-pane label="项目生产" name="项目生产" :disabled="taskName != '项目生产'"></el-tab-pane>
+      <el-tab-pane label="质量检查" name="质量检查" :disabled="taskName != '质量检查'"></el-tab-pane>
+      <el-tab-pane label="成果归档" name="成果归档" :disabled="taskName != '成果归档'"></el-tab-pane>
     </el-tabs>
 
 
@@ -50,7 +50,7 @@ export default {
   },
   data() {
     return {
-      activeName: taskName,
+      activeName:'项目登记',
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -89,8 +89,10 @@ export default {
     }
   },
   created() {
+    // this.activeName = this.taskName;
     this.getList();
     this.getDeptList();
+    // console.log(this.activeName);
   },
   methods: {
     // 查询项目列表

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

@@ -269,7 +269,8 @@ export default {
     /**  发起流程申请 */
     handleStartProcess(row) {
       // if (row.category == "assess" || row.category == "car" || ) {
-      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: {} }).then(res => {
+        let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: {formId:formId} }).then(res => {
         let data = res.data;
         if (data.dataType === 'dynamic') {
           if (data.type === 'assignee') { // 指定人员
@@ -294,7 +295,7 @@ export default {
           formData.disabled = true;
           formData.formBtns = false;
           debugger
-          formData.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+          formData.formId = formId
           if (row.id) {
             variables.variables = formData;
             // 启动流程并将表单数据加入流程变量

oa-ui/src/views/oa/budget/components/budgetForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-03 17:17:48
+ * @LastEditTime: 2024-04-07 09:48:26
 -->
 <template>
   <div>
@@ -108,7 +108,7 @@
       </tr>
       <tr>
         <td colspan="6" class="head">总成本=（固定成本+直接成本）*120%</td>
-        <td>{{ totalBudget }}</td>
+        <td>{{ budgetForm.totalBudget }}</td>
       </tr>
       <!-- <tr>
         <td class="head">编制人</td>
@@ -160,7 +160,9 @@ export default {
         console.log(res);
         this.budgetForm = res.rows[0];
       });
+      list
     },
+  
   },
 };
 </script>

oa-ui/src/views/oa/budget/index.vue

@@ -2,13 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-21 17:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-03 14:51:37
--->
-<!--
- * @Author: wrh
- * @Date: 2024-03-25 17:38:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-03 14:41:00
+ * @LastEditTime: 2024-04-07 09:34:27
 -->
 <template>
   <div class="app-container">