新增项目流转退回按钮，修改项目预算未保存直接提交数据错误的bug

oa-back/ruoyi-admin/src/main/resources/application.yml

@@ -97,7 +97,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 240
 
 # MyBatis配置
 mybatis:

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowInstanceController.java

@@ -48,7 +48,7 @@ public class FlowInstanceController {
     }
 
     @ApiOperation(value = "根据流程实例id获取子流程id列表")
-    @PostMapping(value = "/listSubProcInstId")
+    @GetMapping(value = "/listSubProcInstId")
     public AjaxResult listSubProcInstId(@ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId) {
         List<HistoricProcessInstance> subProcInstIdList = flowInstanceService.listSubProcInstId(instanceId);
         return AjaxResult.success(subProcInstIdList);

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

@@ -13,10 +13,7 @@ import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * <p>工作流流程实例管理<p>
@@ -67,12 +64,13 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
     public List<HistoricProcessInstance> listSubProcInstId(String instanceId) {
         List<HistoricProcessInstance> historicProcessInstance =
                 historyService.createHistoricProcessInstanceQuery().superProcessInstanceId(instanceId).list();
+        List<HistoricProcessInstance> historicProcessInstanceList = new ArrayList<>(historicProcessInstance);
         for (HistoricProcessInstance processInstance : historicProcessInstance) {
-            if (processInstance.getProcessDefinitionId().contains("tech_plan")) {
-                historicProcessInstance.addAll(historyService.createHistoricProcessInstanceQuery().superProcessInstanceId(processInstance.getId()).list());
+            if (processInstance.getProcessDefinitionId() != null && processInstance.getProcessDefinitionId().contains("tech_plan")) {
+                historicProcessInstanceList.addAll(historyService.createHistoricProcessInstanceQuery().superProcessInstanceId(processInstance.getId()).list());
             }
         }
-        return historicProcessInstance;
+        return historicProcessInstanceList;
     }
 
     /**

oa-ui/src/api/flowable/finished.js

@@ -1,11 +1,10 @@
 /*
  * @Author: wrh
  * @Date: 2024-01-03 08:55:37
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-12 15:41:26
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-22 16:03:17
  */
 import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
 
 // 查询已办任务列表
 export function finishedList(query) {
@@ -93,3 +92,12 @@ export function exportDeployment(query) {
     params: query
   })
 }
+
+// 通过流程实例id查询子流程id
+export function listSubProcInstId(query) {
+  return request({
+    url: '/flowable/instance/listSubProcInstId',
+    method: 'get',
+    params: query
+  })
+}

oa-ui/src/api/flowable/process.js

@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
 
 // 我的发起的流程
 export function myProcessList(query) {

oa-ui/src/api/flowable/todo.js

@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
 
 // 查询待办任务列表
 export function todoList(query) {
@@ -157,4 +156,4 @@ export function findReCommitTask(data){
     method: 'post',
     data: data
   })
-}
+}

oa-ui/src/utils/cancelSubProcess.js

@@ -0,0 +1,49 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-01-22 16:58:56
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-23 11:32:05
+ */
+import { listBudget, addBudget, updateBudget, delBudget } from "@/api/oa/budget/budget.js";
+import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
+import { listTechnicalPlan, getTechnicalPlan, delTechnicalPlan, addTechnicalPlan, updateTechnicalPlan } from "@/api/oa/technical/technicalPlan";
+import { listSafe, getSafe, delSafe, addSafe, updateSafe } from "@/api/oa/safe/safe";
+import { listSubProcInstId, delDeployment } from "@/api/flowable/finished"
+import { deleteResources } from "@/utils/deleteResource";
+
+// 取消项目预算、技术方案、技术交底、安全交底流程，并且删除数据
+export async function cancelSubProcess(ids, projectId) {
+  try {
+    const [resSafe, resBudget, resTechnical, resTechnicalPlan] = await Promise.all([
+      listSafe({ pageSize: 100, projectId }),
+      listBudget({ pageSize: 100, projectId }),
+      listTechnical({ pageSize: 100, projectId }),
+      listTechnicalPlan({ pageSize: 100, projectId })
+    ]);
+ 
+    const safeIds = extractIds(resSafe.rows,'safeId');
+    const budgetIds = extractIds(resBudget.rows,'budgetId');
+    const technicalIds = extractIds(resTechnical.rows,'technicalId');
+    const technicalPlanIds = extractIds(resTechnicalPlan.rows,'technicalPlanId');
+ 
+    await deleteResourcesByIds('项目预算', budgetIds);
+    await deleteResourcesByIds('安全交底', safeIds);
+    await deleteResourcesByIds('技术方案', technicalIds);
+    await deleteResourcesByIds('技术交底', technicalPlanIds);
+
+    await delDeployment(ids);
+ 
+    return { code: 200 };
+  } catch (error) {
+    console.error('Error canceling subprocess:', error);
+    throw { code: 500, message: error.message || 'An unknown error occurred' };
+  }
+}
+ 
+function extractIds(rows,name) {
+  return rows ? rows.map(item => item[name] /* 假设每个对象都有一个名为'id'的属性 */) : [];
+}
+ 
+async function deleteResourcesByIds(type, ids) {
+  await Promise.all(ids.map(id => deleteResources(type, id)));
+}

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-09 13:52:58
+ * @LastEditTime: 2025-01-22 16:45:18
  */
 import request from '@/utils/request'
 
@@ -120,6 +120,34 @@ const apiEndpoints = [
       '/oa/wage/batch/:id'
     ]
   },
+  {
+    procDefName: '项目预算',
+    apiUrl: [
+      '/oa/budget/:id',
+      '/oa/budgetSettle/:id',
+      '/oa/budgetCar/:id',
+      '/oa/budgetDevice/:id',
+      '/oa/budgetStaff/:id',
+    ]
+  },
+  {
+    procDefName: '技术方案',
+    apiUrl: [
+      '/oa/technical/:id',
+    ]
+  },
+  {
+    procDefName: '技术交底',
+    apiUrl: [
+      '/oa/technicalPlan/:id',
+    ]
+  },
+  {
+    procDefName: '安全交底',
+    apiUrl: [
+      '/oa/safe/:id',
+    ]
+  },
 ]
 
 // 编写一个方法来处理删除请求，并同时发送所有API请求  

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-22 13:42:37
+ * @LastEditTime: 2025-01-23 09:10:56
 -->
 <template>
   <div class="app-container">
@@ -25,7 +25,7 @@
               <el-descriptions-item label="承担部门" label-class-name="my-label">{{
                 chooseProject.undertakingDeptName
               }}</el-descriptions-item>
-              <el-descriptions-item label="发起人" label-class-name="my-label">{{ chooseProject.projectLeaderUser
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser
                 ? chooseProject.projectLeaderUser.nickName : ''
                 }}</el-descriptions-item>
               <el-descriptions-item label="技术负责人" label-class-name="my-label">{{

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-16 10:16:27
+ * @LastEditTime: 2025-01-23 14:02:18
 -->
 <template>
   <div class="app-container">
@@ -39,7 +39,7 @@
     <!-- 其他成本 -->
     <other-table ref="otherRef" @otherCost="getOtherCost" :budgetForm="budgetForm"></other-table>
     <!-- 预算备注 -->
-    <el-form :model="budgetForm"  style="padding: 20px 100px 0">
+    <el-form :model="budgetForm" style="padding: 20px 100px 0">
       <el-form-item label="预算表单备注" label-width="100px">
         <el-input type="textarea" v-model="budgetForm.remark" placeholder="请输入预算备注" :rows="4"></el-input>
       </el-form-item>
@@ -172,7 +172,7 @@ export default {
     },
     // 提交下一个流程
     async submitNextFlow() {
-      if(this.taskName == '预算编制'){
+      if (this.taskName == '预算编制') {
         this.preserve();
       }
       const params = { taskId: this.taskForm.taskId };
@@ -277,22 +277,26 @@ export default {
       this.$set(this.budgetForm, 'businessExpense', val.businessExpense);
     },
     getFixCost() {
-      let total =
-        Number(this.budgetForm.staffCost) +
-        Number(this.budgetForm.carCost) +
-        Number(this.budgetForm.deviceCost);
-      this.budgetForm.fixCost = isNaN(total.toFixed(2)) ? null : total.toFixed(2);
+      const staffCost = this.safeNumber(this.budgetForm.staffCost);
+      const carCost = this.safeNumber(this.budgetForm.carCost);
+      const deviceCost = this.safeNumber(this.budgetForm.deviceCost);
+      const total = staffCost + carCost + deviceCost;
+      this.budgetForm.fixCost = total.toFixed(2);
+    },
+    safeNumber(value) {
+      const num = Number(value);
+      return isNaN(num) ? 0 : num;
     },
     // 获取直接成本
     getDirectExpense() {
-      let sum =
-        Number(this.budgetForm.settleExpense) +
-        Number(this.budgetForm.outExpense) +
-        Number(this.budgetForm.rentExpense) +
-        Number(this.budgetForm.taxExpense) +
-        Number(this.budgetForm.businessExpense) +
-        Number(this.budgetForm.otherExpense);
-      this.budgetForm.directExpense = isNaN(sum.toFixed(2)) ? null : sum.toFixed(2);
+      const settleExpense = this.safeNumber(this.budgetForm.settleExpense);
+      const outExpense = this.safeNumber(this.budgetForm.outExpense);
+      const rentExpense = this.safeNumber(this.budgetForm.rentExpense);
+      const taxExpense = this.safeNumber(this.budgetForm.taxExpense);
+      const businessExpense = this.safeNumber(this.budgetForm.businessExpense);
+      const otherExpense = this.safeNumber(this.budgetForm.otherExpense);
+      const sum = settleExpense + outExpense + rentExpense + taxExpense + businessExpense + otherExpense;
+      this.budgetForm.directExpense = sum.toFixed(2);
     },
     getTotalBudget() {
       this.budgetForm.totalBudget = (Number(this.budgetForm.fixCost) + Number(this.budgetForm.directExpense)).toFixed(2);

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-12-11 17:21:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-12 13:52:17
+ * @LastEditTime: 2025-01-23 14:05:03
 -->
 <template>
   <div>
@@ -102,11 +102,20 @@ export default {
     }
   },
   created() {
-    
+
   },
   methods: {
     initTable(val) {
       this.form = val;
+      this.form.outExpense == undefined ? this.form.outExpense = 0 : this.form.outExpense
+      this.form.rentExpense == undefined ? this.form.rentExpense = 0 : this.form.rentExpense
+      this.form.otherExpense == undefined ? this.form.otherExpense = 0 : this.form.otherExpense
+      this.form.taxExpense == undefined ? this.form.taxExpense = 0 : this.form.taxExpense
+      this.form.businessExpense == undefined ? this.form.businessExpense = 0 : this.form.businessExpense
+    },
+    safeNumber(value) {
+      const num = Number(value);
+      return isNaN(num) ? 0 : num;
     },
     computedDirectExpense() {
       this.$emit('otherCost', this.form)

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

@@ -114,8 +114,6 @@ export default {
       this.form.staffCost = staffCost
     },
     getChooseUser(val) {
-      console.log(val);
-
       for (let v of val) {
         if (v.deptId === 115) {
           v.salary = { salary: 7898.75 }

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-15 11:29:57
+ * @LastEditTime: 2025-01-23 09:22:36
 -->
 <template>
   <div class="app-container">
@@ -1051,19 +1051,27 @@ export default {
         Promise.all([
           delContractWork(this.form.contractId),
           delContractPayment(this.form.contractId)
-        ]).then(([workRes, paymentRes]) => {
+        ]).then(async ([workRes, paymentRes]) => {
           // 添加工作信息
-          const workPromises = this.workList.map(async work => {
+          // const workPromises = this.workList.map(async work => {
+          //   work.contractId = this.form.contractId;
+          //   return await addContractWork(work);
+          // });
+          for (const work of this.workList) {
             work.contractId = this.form.contractId;
-            return await addContractWork(work);
-          });
+            await addContractWork(work);
+          }
           // 添加支付信息
-          const paymentPromises = this.paymentList.map(async payment => {
+          // const paymentPromises = this.paymentList.map(async payment => {
+          //   payment.contractId = this.form.contractId;
+          //   return await addContractPayment(payment);
+          // });
+          for (const payment of this.paymentList) {
             payment.contractId = this.form.contractId;
-            return await addContractPayment(payment);
-          });
+            await addContractPayment(payment);
+          }
           // 等待所有添加操作完成
-          return Promise.all([...workPromises, ...paymentPromises]);
+          return Promise.all();
         }).then(() => {
           // this.$modal.msgSuccess("计划工作量和回款计划添加成功");
         }).catch(error => {

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

@@ -1,43 +1,23 @@
 <!--
  * @Author: ysh
- * @Date: 2024-03-19 09:24:06
+ * @Date: 2024-06-21 18:51:54
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-08 10:12:31
+ * @LastEditTime: 2025-01-23 14:05:22
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align: center;">项目安排</h2>
     <el-form ref="arrangeForm" :model="form" :rules="rules" label-width="120px" :disabled="disabled">
-      <!-- <el-row :gutter="20">
-        <el-col :span="12" :xs="24">
-          <el-form-item label="承担部门：" prop="deptId">
-            <el-select v-model="form.deptId" multiple clearable style="width:100%" @change="getDeptLeader">
-              <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
-                v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" :xs="24">
-          <el-form-item label="部门负责人：" prop="deptLeader">
-            <el-select v-model="form.deptLeader" multiple clearable style="width:100%">
-              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
-                :value="item.userId">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row> -->
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="项目负责人：" prop="projectLeader">
             <el-select v-model="peopleForm.deptId" @change="handleChangeDept" clearable style="width:60%">
-              <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName"
+              <el-option v-for="item, index in peopleForm.deptList" :key="'d' + index" :label="item.deptName"
                 :value="item.deptId" v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
               </el-option>
             </el-select>
             <el-select v-model="form.projectLeader" placeholder="请选择项目负责人" clearable style="width:40%">
-              <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName"
+              <el-option v-for="item, index in peopleForm.userList" :key="'l' + index" :label="item.nickName"
                 :value="item.userId" />
             </el-select>
           </el-form-item>
@@ -45,40 +25,16 @@
         <el-col :span="12" :xs="24">
           <el-form-item label="现场负责人：" prop="siteLeader">
             <el-select v-model="form.siteLeader" filterable clearable style="width:100%">
-              <el-option v-for="item in peopleForm.allDeptUserList" :key="item.userId" :label="item.nickName"
+              <el-option v-for="item, index in peopleForm.allDeptUserList" :key="'s' + index" :label="item.nickName"
                 :value="item.userId" v-if="item.nickName != 'admin'">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="12" :xs="24">
-          <el-form-item label="组织交底日期：" prop="organizeTime">
-            <el-date-picker style="width: 100%;" v-model="form.organizeTime" value-format="yyyy-MM-dd" type="date"
-              placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" :xs="24">
-          <el-form-item label="组织交底文档：" prop="organizeDocument">
-            <div v-if="form.organizeDocument" class="upload-list">
-              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.organizeDocument}`)">
-                {{ getFileName(form.organizeDocument) }}
-              </el-link>
-              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.organizeDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-download">下载文件</span>
-              </el-link>
-            </div>
-            <FileUpload v-if="taskName == '项目安排'" ref="orz" :limit="1" :filePathName="'组织交底文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setOrganizeDocument">
-            </FileUpload>
-          </el-form-item>
-        </el-col>
-      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer" style="text-align: center;">
+      <el-button type="danger" @click="$emit('returnBack')" :disabled="disabled">退 回</el-button>
       <el-button type="warning" @click="save" :disabled="disabled">保 存</el-button>
       <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">提 交</el-button>
     </div>
@@ -91,6 +47,8 @@ import { listUser } from '@/api/system/user'
 import { getUsersDeptLeaderByDept, getDeptLeadersByDeptId, getUsersManageLeaderByDept } from '@/api/system/post'
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listProject, getProject, addProject, updateProject, delProject, submitProject, modifyProject } from "@/api/oa/project/project";
+import { listSubProcInstId, delDeployment } from "@/api/flowable/finished"
+import { cancelSubProcess } from '@/utils/cancelSubProcess';
 export default {
   props: {
     disabled: {
@@ -251,7 +209,20 @@ export default {
         }
       })
     },
-    confirmPlanForm() {
+    async confirmPlanForm() {
+      let resProcInstId = await listSubProcInstId({ instanceId: this.taskForm.procInsId });
+      let ids = resProcInstId.data.map(item => item.id);
+      if (ids.length > 0) {
+        cancelSubProcess(ids, this.taskForm.formId).then(res => {
+          if (res.code == 200) {
+            this.sendConfirm();
+          }
+        })
+      } else {
+        this.sendConfirm();
+      }
+    },
+    sendConfirm() {
       this.$confirm('项目安排之后会自动发起预算编制、技术方案、安全交底三个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -282,7 +253,6 @@ export default {
           }
         })
       })
-
     },
     cancel() {
       this.form = {}

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-07-08 16:16:27
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-29 10:40:31
+ * @LastEditTime: 2025-01-22 17:01:42
 -->
 <template>
   <div class="app-container">
@@ -68,9 +68,11 @@
     </el-form>
 
     <div slot="footer" class="dialog-footer" style="text-align: center;">
+      <el-button type="danger" @click="$emit('returnBack')" :disabled="disabled">退 回</el-button>
       <el-button type="warning" @click="save" :disabled="disabled">保 存</el-button>
       <el-button type="primary" @click="confirm" :disabled="disabled">提 交</el-button>
     </div>
+
   </div>
 </template>
 
@@ -109,7 +111,6 @@ export default {
           remark: "",
         },
       ],
-
     }
   },
   created() {
@@ -193,6 +194,7 @@ export default {
     getDeptLeader(val) {
       let deptId = Number(val[0])
       getUsersDeptLeaderByDept({ deptId: Number(deptId) }).then(res => {
+        this.taskForm.variables = {}
         this.$set(this.taskForm.variables, "approval", res.data.userId);
       })
     }

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-09-24 10:31:28
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-22 14:55:32
 -->
 <template>
   <div class="app-container">
@@ -18,9 +18,10 @@
       <el-form-item label="审核时间：">
         {{ form.jyApprovalTime }}
       </el-form-item>
-      <el-form-item>
-        <p style="text-align:center;"><el-button type="primary" @click="confirm">确认审核</el-button></p>
-      </el-form-item>
+      <el-row class="text-center">
+        <el-button type="danger" @click="$emit('returnBack')" :disabled="disabled">退 回</el-button>
+        <el-button type="primary" @click="confirm">确认审核</el-button>
+      </el-row>
     </el-form>
   </div>
 </template>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:54
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-22 10:58:59
+ * @LastEditTime: 2025-01-23 14:20:57
 -->
 <template>
   <div>
@@ -118,6 +118,7 @@
         <settle-data :taskForm="taskForm" :taskName="taskName"></settle-data>
       </div>
       <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="danger" @click="$emit('returnBack')" :disabled="disabled">退 回</el-button>
         <el-button @click="preserve()" :disabled="disabled" type="warning">保 存</el-button>
         <el-button type="primary" @click="submitNextFlow()" :disabled="disabled">项目结束</el-button>
       </div>

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

@@ -2,32 +2,38 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-11 16:28:20
+ * @LastEditTime: 2025-01-22 14:29:46
 -->
 
 <template>
   <div class="project-wrapper">
+    <div class="mt20 mb20" v-if="showAlter">
+      <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+        <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+      </el-alert>
+    </div>
     <el-row :gutter="20">
-      <el-col :xs="24":md="18">
+      <el-col :xs="24" :md="18">
         <el-tabs tabPosition="left" type="card" class="tabs-border" v-model="activeName">
           <el-tab-pane label="项目登记" name="项目登记">
             <addproject :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目登记'" @goBack="goBack">
             </addproject>
           </el-tab-pane>
           <el-tab-pane label="核定工作" name="核定工作">
-            <assess-work :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '核定工作'" @goBack="goBack"></assess-work>
+            <assess-work :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '核定工作'"
+              @goBack="goBack" @returnBack="returnOpen = true"></assess-work>
           </el-tab-pane>
           <el-tab-pane label="项目安排" name="项目安排">
-            <arrangeProject :taskForm="taskForm" :taskName="'项目安排'" :disabled="taskName != '项目安排'" @goBack="goBack">
+            <arrangeProject :taskForm="taskForm" :taskName="'项目安排'" :disabled="taskName != '项目安排'" @goBack="goBack" @returnBack="returnOpen = true">
             </arrangeProject>
           </el-tab-pane>
           <el-tab-pane label="经营审核" name="经营审核">
             <business-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '经营审核'"
-              @goBack="goBack"></business-review>
+              @goBack="goBack" @returnBack="returnOpen = true"></business-review>
           </el-tab-pane>
           <el-tab-pane label="分管审核" name="分管审核">
             <manage-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '分管审核'"
-              @goBack="goBack"></manage-review>
+              @goBack="goBack" @returnBack="returnOpen = true"></manage-review>
           </el-tab-pane>
           <!-- <el-tab-pane label="生产确认" name="生产确认">
             <sc-confirm :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '生产确认'"
@@ -35,7 +41,7 @@
           </el-tab-pane> -->
           <el-tab-pane label="项目生产" name="项目生产">
             <in-progress :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目生产'"
-              @goBack="goBack"></in-progress>
+              @goBack="goBack" @returnBack="returnOpen = true"></in-progress>
           </el-tab-pane>
           <el-tab-pane label="项目预算" name="项目预算">
             <budget-tab :taskForm="taskForm" @goBack="goBack"></budget-tab>
@@ -60,6 +66,9 @@
         </el-card>
       </el-col>
     </el-row>
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" @goBack="$emit('goBack')" @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
   </div>
 </template>
 
@@ -80,6 +89,8 @@ import planTab from './planTab.vue'
 import SafeTab from './safeTab.vue'
 import technicalTab from './technicalTab.vue'
 import AssessWork from './assessWork.vue'
+import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
+import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
 export default {
   props: {
     taskName: {
@@ -89,7 +100,10 @@ export default {
       type: Object,
     }
   },
-  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab, technicalTab, AssessWork },
+  components: {
+    addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab, technicalTab, AssessWork, ReturnComment,
+    ReturnBtn
+  },
   data() {
     return {
       activeName: '项目登记',
@@ -129,6 +143,8 @@ export default {
         remark: ''
       }],
       flowData: {},
+      showAlter: true,
+      returnOpen:false,
     }
   },
   created() {
@@ -250,7 +266,10 @@ export default {
     },
     goBack() {
       this.$emit('goBack')
-    }
+    },
+    isReturn(val) {
+      this.showAlter = val
+    },
   },
 }
 </script>

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-09-30 09:23:49
+ * @LastEditTime: 2025-01-22 15:03:06
 -->
 <template>
   <div class="app-container">
@@ -34,9 +34,10 @@
       <el-form-item label="审核时间：">
         {{ form.manageApprovalTime }}
       </el-form-item>
-      <el-form-item>
-        <p style="text-align:center;"><el-button type="primary" @click="confirm">确认审核</el-button></p>
-      </el-form-item>
+      <el-row class="text-center">
+        <el-button type="danger" @click="$emit('returnBack')" :disabled="disabled">退 回</el-button>
+        <el-button type="primary" @click="confirm">确认审核</el-button>
+      </el-row>
     </el-form>
 
     <el-dialog title="安全交底记录表" :visible.sync="openSafe" width="1000px" append-to-body>

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

@@ -49,7 +49,7 @@
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
       <el-table-column label="项目名称" align="center" prop="project.projectName" />
       <el-table-column label="备注说明" align="center" :show-overflow-tooltip="true" width="150" prop="submitSituation" />
-      <el-table-column label="项目负责人" align="center" prop="leaderUser.nickName" />
+      <el-table-column label="发起人" align="center" prop="leaderUser.nickName" />
       <!-- <el-table-column label="生产部门检查员" align="center" prop="produceUser.nickName" /> -->
       <!-- <el-table-column label="质量检查员" align="center" prop="qualityUser.nickName" /> -->
       <el-table-column label="技术质量与安全部意见" align="center" :show-overflow-tooltip="true" width="150" prop="deptComment" />

oa-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8086`,
+        target: `http://localhost:8080`,
         // target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {