update handbook and project apply

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java

@@ -73,7 +73,12 @@ public class WfProcessController extends BaseController {
         return processService.selectPageHandbookList(processQuery, pageQuery);
     }
 
-
+    /**
+     * 获得我发起的流程的详细信息的列表, pageQuery中可以指定标题名和负责人名字字段，如果能够匹配则
+     * 返回这些信息，如果无法匹配返回为空。
+     * @author zhanli
+     * @since  2024-07-22
+     */
     @SaCheckPermission("workflow:process:ownList")
     @GetMapping(value = "/ownInfoList")
     public TableDataInfo<WfTaskInfoVo> ownProcessInfoList(ProcessQuery processQuery, PageQuery pageQuery) {
@@ -204,7 +209,7 @@ public class WfProcessController extends BaseController {
      *
      * @param definitionId 流程定义id
      * @param deployId     流程部署id
-     * @param procInsId    这个参数可选
+     * @param procInsId    这个参数可选, 如果流程的实例Id存在，那么就会把数值变量信息也返回
      */
     @SaCheckPermission("workflow:process:start")
     @GetMapping("/getProcessForm")
@@ -215,7 +220,7 @@ public class WfProcessController extends BaseController {
     }
 
     /**
-     * 根据流程定义id启动流程实例
+     * 根据流程定义id启动流程实例, 实际上启动流程只需要流程的定义Id和传递的参数就行
      *
      * @param processDefId 流程定义id
      * @param variables 变量集合,json对象
@@ -244,6 +249,13 @@ public class WfProcessController extends BaseController {
         processService.deleteProcessByIds(instanceIds);
         return R.ok();
     }
+    @SaCheckPermission("workflow:process:start")
+    @PostMapping("/updateHistory/{processInsId}")
+    public R<Void> updateHistory(@PathVariable(value = "processInsId") String processInsId, @RequestBody Map<String, Object> variables) {
+        // 删除的时候先要获取流程的实体Id
+        processService.editProcessByIds(processInsId, variables);
+        return R.ok();
+    }
 
     /**
      * 读取xml文件
@@ -264,7 +276,11 @@ public class WfProcessController extends BaseController {
     public R detail(String procInsId, String taskId) {
         return R.ok(processService.queryProcessDetail(procInsId, taskId));
     }
-
+    /**
+     * zqjia: 批量查询流程实例详情
+     *
+     * @param procInsIds 流程实例ID列表
+     */
     @PostMapping("/details")
     public TableDataInfo<WfDetailVo>  details(@RequestBody List<String> procInsIds) {
         List<WfDetailVo> processDetails = new ArrayList<>();

ruoyi-admin/src/main/resources/logback-plus.xml

@@ -13,6 +13,7 @@
         </encoder>
     </appender>
 
+
     <!-- 控制台输出 -->
     <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.path}/sys-console.log</file>

ruoyi-flowable/src/main/java/com/ruoyi/flowable/factory/FlowServiceFactory.java

@@ -16,12 +16,19 @@ import javax.annotation.Resource;
 @Getter
 public class FlowServiceFactory {
 
+    /**
+     * 提供了管理与控制部署(deployments)与流程定义(process definitions)的操作
+     */
     @Resource
     protected RepositoryService repositoryService;
 
     @Resource
     protected RuntimeService runtimeService;
 
+    /**
+     * 用于管理（创建，更新，删除，查询……）组与用户,Flowable实际上在运行时并不做任
+     * 何用户检查。例如任务可以分派给任何用户，而引擎并不会验证系统中是否存在该用户
+     */
     @Resource
     protected IdentityService identityService;
 
@@ -30,10 +37,20 @@ public class FlowServiceFactory {
 
     @Resource
     protected FormService formService;
-
+    /**
+     * 暴露Flowable引擎收集的所有历史数据。当执行流程时，引擎会保存许多数据（可配置），
+     * 例如流程实例启动时间、谁在执行哪个任务、完成任务花费的事件、每个流程实例的执行路
+     * 径，等等。这个服务主要提供查询这些数据的能力。
+     */
     @Resource
     protected HistoryService historyService;
 
+    /**
+     * 暴露通常在用Flowable编写用户应用时不需要使用。它可以读取数据库表与表原始数据的信
+     * 息，也提供了对作业(job)的查询与管理操作。Flowable中很多地方都使用作业，例如定时
+     * 器(timer)，异步操作(asynchronous continuation)，延时暂停/激活(delayed
+     * suspension/activation)等等
+     */
     @Resource
     protected ManagementService managementService;
 

ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/TestTaskListener.java

@@ -0,0 +1,14 @@
+package com.ruoyi.flowable.listener;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+
+public class TestTaskListener implements ExecutionListener {
+    /**
+     * 注入字段（名称与流程设计时字段名称一致）
+     */
+    // private FixedValue field;
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.out.println("执行任务监听器...");
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfProcessService.java

@@ -125,4 +125,6 @@ public interface IWfProcessService {
     TableDataInfo<WfTaskInfoVo> selectPageOwnProcessInfoList(ProcessQuery processQuery, PageQuery pageQuery);
 
     String startProcessByDefId_(String processDefId, Map<String, Object> variables);
+
+    void editProcessByIds(String procInsId, Map<String, Object> variables);
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java

@@ -42,10 +42,17 @@ import lombok.RequiredArgsConstructor;
 import org.flowable.bpmn.constants.BpmnXMLConstants;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.*;
+import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.interceptor.CommandContext;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.ProcessEngine;
+import org.flowable.engine.ProcessEngineConfiguration;
 import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.history.HistoricActivityInstanceQuery;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.history.HistoricProcessInstanceQuery;
+import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
+import org.flowable.engine.impl.persistence.entity.HistoricProcessInstanceEntity;
 import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.repository.ProcessDefinitionQuery;
@@ -199,6 +206,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
             taskVo.setFinishTime(hisIns.getEndTime());
             taskVo.setProcInsId(hisIns.getId());
 
+
             // 计算耗时
             if (Objects.nonNull(hisIns.getEndTime())) {
                 taskVo.setDuration(DateUtils.getDatePoor(hisIns.getEndTime(), hisIns.getStartTime()));
@@ -708,6 +716,82 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
         historyService.bulkDeleteHistoricProcessInstances(ids);
     }
 
+    public void editProcessByIds(String procInsId, Map<String, Object> variables) {
+        // 更改前先获得历史信息
+        HistoricProcessInstance historicProcIns = historyService.createHistoricProcessInstanceQuery()
+            .processInstanceId(procInsId)
+            .includeProcessVariables()
+            .singleResult();
+
+        // ---------------------------------- 新建流程 ------------------------------------- //
+        // 从历史实体中获取流程定义
+        String procDefId = historicProcIns.getProcessDefinitionId();
+        ProcessDefinition procDef = repositoryService.createProcessDefinitionQuery()
+            .processDefinitionId(procDefId).singleResult();
+
+        // 检查流程定义是否正常
+        if (ObjectUtil.isNotNull(procDef) && procDef.isSuspended()) {
+            throw new ServiceException("流程已被挂起，请先激活流程");
+        }
+
+        // 设置流程发起人Id到流程中
+        String userIdStr = TaskUtils.getUserId();
+        identityService.setAuthenticatedUserId(userIdStr);
+        variables.put(BpmnXMLConstants.ATTRIBUTE_EVENT_START_INITIATOR, userIdStr);
+
+        // 设置流程状态为完成
+        variables.put(ProcessConstants.PROCESS_STATUS_KEY, ProcessStatus.COMPLETED.getStatus());
+        // 根据流程的定义发起流程实例
+        ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDef.getId(), variables);
+        // 第一个用户任务为发起人，则自动完成任务
+        wfTaskService.startFirstTask(processInstance, variables);
+
+
+        // 直接修改数据库的方法
+//        processEngine.getProcessEngineConfiguration().getDataSource();
+//        // 获取数据库连接
+//        DataSource dataSource = processEngineConfiguration.getDataSource();
+//        try (Connection connection = dataSource.getConnection();
+//             Statement statement = connection.createStatement()) {
+//
+//            // 更新历史流程实例的名称
+//            String sql = "UPDATE ACT_HI_PROCINST SET NAME_ = 'newName' WHERE ID_ = 'processInstanceId'";
+//            statement.executeUpdate(sql);
+//
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+
+//        HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
+//            .processInstanceId("processInstanceId")
+//            .singleResult();
+//        ProcessEngineConfiguration processEngineConfiguration = ProcessEngineConfiguration
+//            .createProcessEngineConfigurationFromResourceDefault();
+//        // 将查询结果转换为实体类，以便进行修改
+//        if (historicProcessInstance instanceof HistoricProcessInstanceEntity) {
+//            HistoricProcessInstanceEntity processInstanceEntity = (HistoricProcessInstanceEntity) historicProcessInstance;
+//
+//            // 修改流程实例名称
+//            processInstanceEntity.setName("newProcessName");
+//
+//            // 保存修改
+//            processEngineConfiguration.getCommandExecutor().execute(new Command<Void>() {
+//                @Override
+//                public Void execute(CommandContext commandContext) {
+//
+//                    return null;
+//                }
+//            });
+//        }
+
+
+        // -------------------------------- 删除历史流程 ---------------------------------- //
+        // 历史流程实例不能编辑只能删除，因此编辑=删除+新建
+        historyService.deleteHistoricProcessInstance(procInsId);
+    }
+
+
+
     /**
      * 读取xml文件
      * @param processDefId 流程定义ID
@@ -910,6 +994,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
     @Deprecated
     private void buildStartFormData(HistoricProcessInstance historicProcIns, Process process, String deployId, List<FormConf> procFormList) {
         procFormList = procFormList == null ? new ArrayList<>() : procFormList;
+
         HistoricActivityInstance startInstance = historyService.createHistoricActivityInstanceQuery()
             .processInstanceId(historicProcIns.getId())
             .activityId(historicProcIns.getStartActivityId())

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java

@@ -84,9 +84,17 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ
                 // 获取模型信息
                 String localScopeValue = ModelUtils.getUserTaskAttributeValue(bpmnModel, task.getTaskDefinitionKey(), ProcessConstants.PROCESS_FORM_LOCAL_SCOPE);
                 boolean localScope = Convert.toBool(localScopeValue, false);
-                taskService.complete(taskBo.getTaskId(), taskBo.getVariables(), localScope);
+                Map<String, Object> mapTmp = taskBo.getVariables();
+                mapTmp.put("review", "1");
+                if (!StringUtils.isNotBlank(taskBo.getNextUserIds())) {
+                    taskService.complete(taskBo.getTaskId(), mapTmp, localScope);
+                }
             } else {
-                taskService.complete(taskBo.getTaskId());
+                Map<String, Object> mapTmp = new HashMap<>();
+                mapTmp.put("review", "1");
+                if (!StringUtils.isNotBlank(taskBo.getNextUserIds())) {
+                    taskService.complete(taskBo.getTaskId(), mapTmp);
+                }
             }
         }
         // 设置任务节点名称
@@ -330,6 +338,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ
         taskService.setOwner(bo.getTaskId(), TaskUtils.getUserId());
         // 执行委派
         taskService.delegateTask(bo.getTaskId(), bo.getUserId());
+
         // 设置任务节点名称
         bo.setTaskName(task.getName());
         // 处理抄送用户

ruoyi-ui/src/api/scientific/application.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询项目申报列表
+export function listApplication(query) {
+  return request({
+    url: '/scientific/application/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询项目申报详细
+export function getApplication(projectId) {
+  return request({
+    url: '/scientific/application/' + projectId,
+    method: 'get'
+  })
+}
+
+// 新增项目申报
+export function addApplication(data) {
+  return request({
+    url: '/scientific/application',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改项目申报
+export function updateApplication(data) {
+  return request({
+    url: '/scientific/application',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除项目申报
+export function delApplication(projectId) {
+  return request({
+    url: '/scientific/application/' + projectId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/scientific/handbook.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询项目申报v2列表
+export function listHandbook(query) {
+  return request({
+    url: '/scientific/handbook/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询项目申报v2详细
+export function getHandbook(handbookId) {
+  return request({
+    url: '/scientific/handbook/' + handbookId,
+    method: 'get'
+  })
+}
+
+// 新增项目申报v2
+export function addHandbook(data) {
+  return request({
+    url: '/scientific/handbook',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改项目申报v2
+export function updateHandbook(data) {
+  return request({
+    url: '/scientific/handbook',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除项目申报v2
+export function delHandbook(handbookId) {
+  return request({
+    url: '/scientific/handbook/' + handbookId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/workflow/process.js

@@ -35,6 +35,14 @@ export function startProcess_(processDefId, data) {
   })
 }
 
+export function updateProcess(processInsId, data) {
+  return request({
+    url: '/workflow/process/updateHistory/' + processInsId,
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除流程实例
 export function delProcess(ids) {
   return request({

ruoyi-ui/src/router/index.js

@@ -187,11 +187,25 @@ export const dynamicRoutes = [
         name: 'WorkStart',
         meta: { title: '发起流程', icon: '' }
       },
+      // logzhan:这里注册项目信息更新模块
+      {
+        path: 'update/:deployId([\\w|\\-]+)',
+        component: () => import('@/views/workflow/work/update'),
+        name: 'WorkUpdate',
+        meta: { title: '更新信息', icon: '' }
+      },
       {
         path: 'detail/:procInsId([\\w|\\-]+)',
         component: () => import('@/views/workflow/work/detail'),
         name: 'WorkDetail',
         meta: { title: '流程详情', activeMenu: '/work/own' }
+      },
+      // logzhan:这里用于项目的信息变更如预算追加、更换负责人等等
+      {
+        path: 'proj_update/:deployId([\\w|\\-]+)',
+        component: () => import('@/views/workflow/work/proj_update'),
+        name: 'ProjectInfoUpdate',
+        meta: { title: '项目信息变更', icon: ''}
       }
     ]
   },
@@ -209,9 +223,23 @@ export const dynamicRoutes = [
       },
       {
         path: 'handbookProjectQuery/:handbookId([\\w|\\-]+)',
-        component: () => import('@/views/scientific/handbookProject_query'),
+        component: () => import('@/views/scientific/project/index'),
         name: 'handbookProjectQuery',
-        meta: { title: '已申报项目' }
+        meta: { title: '指南项目' }
+        // meta: { title: '已申报项目', activeMenu: '/work/own' }
+      },
+      {
+        path: 'handbookList',
+        component: () => import('@/views/scientific/handbook/index'),
+        name: 'handbookList',
+        meta: { title: '申报指南' }
+        // meta: { title: '已申报项目', activeMenu: '/work/own' }
+      },
+      {
+        path: 'handbook/detail/:handbookProcId([\\w|\\-]+)',
+        component: () => import('@/views/scientific/handbook/detail'),
+        name: 'handbookDetail',
+        meta: { title: '申报计划' }
         // meta: { title: '已申报项目', activeMenu: '/work/own' }
       }
     ]

ruoyi-ui/src/views/project/application/declare.vue

@@ -0,0 +1,524 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="projectStatus">
+        <el-input
+          v-model="queryParams.projectStatus"
+          placeholder="请输入状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申报开始日期" prop="projectAppStTime" label-width="140px">
+        <el-date-picker clearable
+          v-model="queryParams.projectAppStTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申报开始日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="申报结束日期" prop="projectAppEndTime" label-width="140px">
+        <el-date-picker clearable
+          v-model="queryParams.projectAppEndTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申报结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="项目负责人" prop="projectLeader" label-width="140px">
+        <el-input
+          v-model="queryParams.projectLeader"
+          placeholder="请输入项目负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="项目预算(万)" prop="projectBudget" label-width="100px">
+        <el-input
+          v-model="queryParams.projectBudget"
+          placeholder="请输入项目预算(万)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目负责人联系电话" prop="projectLeaderPhone" label-width="140px">
+        <el-input
+          v-model="queryParams.projectLeaderPhone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <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="['scientific:application:add']"
+        >项目填写</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['scientific:application:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['scientific:application:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['scientific:application:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="applicationList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" type="index" width="50"></el-table-column>
+      <!-- <el-table-column label="项目ID" align="center" prop="projectId" v-if="true" width="180"/> -->
+      <el-table-column label="项目名称" align="center" :min-width="280">
+        <template slot-scope="scope">
+          <el-tag size="medium">{{ scope.row.projectName }}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="项目负责人" align="center" prop="projectLeader" width="100"/>
+      <el-table-column label="申报状态" align="center" width="100px" :min-width="100">
+        <template slot-scope="scope">
+          <el-tag size="medium" :type="getTagType(scope.row.projectDeclareStatus)">
+            {{ formatProjectDeclareStatus(scope.row.projectDeclareStatus) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      
+      <el-table-column label="申报开始日期" align="center" prop="projectAppStTime" :min-width="140" width="140">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.projectAppStTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申报结束日期" align="center" prop="projectAppEndTime" width="140">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.projectAppEndTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      
+      <el-table-column label="项目预算(万)" align="center" prop="projectBudget" :min-width="180" width="180"/>
+      <el-table-column label="负责人电话" align="center" prop="projectLeaderPhone" :min-width="150" width="150"/>
+      <el-table-column label="操作" align="center" :min-width="280" width="280">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-top"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:application:remove']"
+          >申报项目</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['scientific:application:edit']"
+          >信息修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdateBudget(scope.row)"
+            v-hasPermi="['scientific:application:edit']"
+          >预算追加</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['scientific:application:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改项目申报对话框, 采用open字段控制是否 -->
+    <!-- 这是提交或者详细信息的表单显示框  -->
+    <!-- 这个表单的名字为form:
+         在form.projectName这种方式配置参数 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px" >
+        <el-form-item label="项目名称" prop="projectName" >
+          <el-input v-model="form.projectName" placeholder="请输入项目名称" :style="{ width: '400px' }"/>
+        </el-form-item>
+        <el-form-item label="项目负责人" prop="projectLeader">
+          <el-input v-model="form.projectLeader" placeholder="请输入项目负责人" :style="{ width: '100px'}"/>
+        </el-form-item>
+        <el-form-item label="状态" prop="projectStatus" >
+          <el-input v-model="form.projectStatus" placeholder="请输入状态" :style="{ width: '50px' }"/>
+        </el-form-item>
+        <el-form-item label="申报开始日期" prop="projectAppStTime" >
+          <el-date-picker clearable
+            v-model="form.projectAppStTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择申报开始日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="申报结束日期" prop="projectAppEndTime">
+          <el-date-picker clearable
+            v-model="form.projectAppEndTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择申报结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="项目预算(万)" prop="projectBudget">
+          <el-input v-model="form.projectBudget" placeholder="请输入项目预算(万)" :style="{ width: '100px'}"/>
+        </el-form-item>
+        <el-form-item label="项目负责人电话" prop="projectLeaderPhone">
+          <el-input v-model="form.projectLeaderPhone" placeholder="请输入项目负责人联系电话" :style="{ width: '140px'}" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listApplication, getApplication, delApplication, addApplication, updateApplication } from "@/api/scientific/application";
+import { listProcess} from "@/api/workflow/process";
+export default {
+  name: "Application",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目申报表格数据
+      applicationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectName: undefined,
+        projectStatus: undefined,
+        projectAppProcId: undefined,
+        projectAppStaus: undefined,
+        projectAppStTime: undefined,
+        projectAppEndTime: undefined,
+        projectLeader: undefined,
+        projectBudget: undefined,
+        projectLeaderPhone: undefined,
+      },
+      queryProcParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: undefined,
+        processName: "项目预算追加表",
+        category: "001"
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        projectId: [
+          { required: true, message: "项目ID不能为空", trigger: "blur" }
+        ],
+        projectName: [
+          { required: true, message: "项目名称不能为空", trigger: "blur" }
+        ],
+        projectStatus: [
+          { required: true, message: "状态不能为空", trigger: "blur" }
+        ],
+        projectAppStTime: [
+          { required: true, message: "申报开始日期不能为空", trigger: "blur" }
+        ],
+        projectAppEndTime: [
+          { required: true, message: "申报结束日期不能为空", trigger: "blur" }
+        ],
+        projectLeader: [
+          { required: true, message: "项目负责人不能为空", trigger: "blur" }
+        ],
+        projectBudget: [
+          { required: true, message: "项目预算(万)不能为空", trigger: "blur" }
+        ],
+        projectLeaderPhone: [
+          { required: true, message: "项目负责人联系电话不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  // logzhan : 当我们跳转到其他路由页面，例如预算变更的时候，再次回来时
+  // 需要用这个函数刷新列表，否则列表将处于刷新状态不显示信息
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
+  methods: {
+    /** 查询项目申报列表 */
+    getList() {
+      this.loading = true;
+      listApplication(this.queryParams).then(response => {
+        this.applicationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        projectId: undefined,
+        projectName: undefined,
+        projectStatus: undefined,
+        projectAppProcId: undefined,
+        projectAppStaus: undefined,
+        projectAppStTime: undefined,
+        projectAppEndTime: undefined,
+        projectLeader: undefined,
+        projectBudget: undefined,
+        projectLeaderPhone: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.projectId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加项目申报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const projectId = row.projectId || this.ids
+      getApplication(projectId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目申报";
+        console.log(this.form)
+      });
+    },
+    /**
+     * 根据填写的项目信息进行申报 
+     */
+    declareProject(row){
+
+    },
+    /** 修改按钮操作 */
+    handleUpdateBudget(row) {
+      this.loading = true;
+      this.reset();
+      const upProjectId = row.projectId || this.ids
+
+      // 查询项目经费追加流程
+      listProcess(this.queryProcParams).then(response => {
+        this.processParams = response.rows[0];
+        this.deploymentId = this.processParams.deploymentId;
+        this.definitionId = this.processParams.definitionId;
+        // 流程名称暂时没有太大作用
+        // this.processName = this.processParams.processName;
+        this.$router.push({
+          path: `/workflow/process/proj_update/${this.deploymentId}?definitionId=${this.definitionId}`,
+          query: {
+            projectId: upProjectId
+          }
+        });
+      })
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      // $refs["form"].validate(valid => 验证表单是否有效
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          // 判断是修改还是新增
+          if (this.form.projectId != null) {
+            console.log(this.form)
+            updateApplication(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              // 提交成功后刷新列表
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            
+            addApplication(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const projectIds = row.projectId || this.ids;
+      this.$modal.confirm('是否确认删除项目申报编号为"' + projectIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delApplication(projectIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('scientific/application/export', {
+        ...this.queryParams
+      }, `application_${new Date().getTime()}.xlsx`)
+    },
+    /**
+     * 把项目状态的code转换未文字: 0 : 未立项  1: 审核中  2: 已立项 
+     * @param   {number|string} cellValue - 原始数值
+     * @returns {string} 转换后的字符串
+     * @author  zhanli
+     */
+    formatProjectAppStatus(cellValue) {
+      switch (cellValue) {
+        case '0':
+          return "未立项";
+        case '1':
+          return "审核中";
+        case '2':
+          return "已立项";
+        default:
+          return "未知状态";
+      }
+    },
+    /**
+     * 把项目状态的申报code转换为文字: 0 : 未申报  1: 审核中  2: 已申报  
+     * @param   {number|string} cellValue - 原始数值
+     * @returns {string} 转换后的字符串
+     * @author  zhanli
+     */
+    formatProjectDeclareStatus(cellValue) {
+      switch (cellValue) {
+        case '0':
+          return "草稿";
+        case '1':
+          return "审核中";
+        case '2':
+          return "申报通过";
+        default:
+          return "未知状态";
+      }
+    },
+    getTagType(status) {
+      switch (status) {
+        case '2':
+          // 显示绿色 审核通过绿色
+          return 'success';
+        case '1':
+          // 审核中 显示黄色
+          return 'warning';
+        case '0':
+          // 未申报, 灰色
+          return 'primary';
+        case '4':
+          // 其他状态 灰色
+          return 'info';
+        default:
+          return '';
+      }
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/project/application/index.vue

@@ -73,8 +73,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['project:application:add']"
+          v-hasPermi="['scientific:application:add']"
-        >新增</el-button>
+        >项目填写</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -84,7 +84,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['project:application:edit']"
+          v-hasPermi="['scientific:application:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -95,7 +95,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['project:application:remove']"
+          v-hasPermi="['scientific:application:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -105,7 +105,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['project:application:export']"
+          v-hasPermi="['scientific:application:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -113,9 +113,26 @@
 
     <el-table v-loading="loading" :data="applicationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="项目ID" align="center" prop="projectId" v-if="true" width="180"/>
+      <el-table-column label="序号" type="index" width="50"></el-table-column>
-      <el-table-column label="项目名称" align="center" prop="projectName" :min-width="280"/>
+      <!-- <el-table-column label="项目ID" align="center" prop="projectId" v-if="true" width="180"/> -->
-      <el-table-column label="状态" align="center" prop="projectStatus" width="60"/>
+      <el-table-column label="项目名称" align="center" :min-width="280">
+        <template slot-scope="scope">
+          <el-tag size="medium">{{ scope.row.projectName }}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="项目负责人" align="center" prop="projectLeader" width="100"/>
+      <el-table-column label="申报状态" align="center" width="100px" :min-width="100">
+        <template slot-scope="scope">
+          <el-tag size="medium">{{ formatProjectDeclareStatus(scope.row.projectDeclareStatus) }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="立项状态" align="center" width="100px" :min-width="100">
+        <template slot-scope="scope">
+          <el-tag size="medium">{{ formatProjectAppStatus(scope.row.projectAppStaus) }}</el-tag>
+        </template>
+      </el-table-column>
+      
       <el-table-column label="申报开始日期" align="center" prop="projectAppStTime" :min-width="140" width="140">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.projectAppStTime, '{y}-{m}-{d}') }}</span>
@@ -126,33 +143,39 @@
           <span>{{ parseTime(scope.row.projectAppEndTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="项目负责人" align="center" prop="projectLeader" width="100"/>
+      
       <el-table-column label="项目预算(万)" align="center" prop="projectBudget" :min-width="180" width="180"/>
-      <el-table-column label="项目负责人联系电话" align="center" prop="projectLeaderPhone" :min-width="220" width="220"/>
+      <el-table-column label="负责人电话" align="center" prop="projectLeaderPhone" :min-width="150" width="150"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :min-width="180" width="180">
+      <el-table-column label="操作" align="center" :min-width="280" width="280">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-top"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:application:remove']"
+          >申请立项</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['project:application:edit']"
+            v-hasPermi="['scientific:application:edit']"
-          >修改</el-button>
+          >信息修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdateBudget(scope.row)"
+            v-hasPermi="['scientific:application:edit']"
+          >预算追加</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['project:application:remove']"
+            v-hasPermi="['scientific:application:remove']"
           >删除</el-button>
-
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-video-play"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['project:application:remove']"
-          >申报</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -165,12 +188,18 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改项目申报对话框 -->
+    <!-- 添加或修改项目申报对话框, 采用open字段控制是否 -->
+    <!-- 这是提交或者详细信息的表单显示框  -->
+    <!-- 这个表单的名字为form:
+         在form.projectName这种方式配置参数 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px" >
         <el-form-item label="项目名称" prop="projectName" >
           <el-input v-model="form.projectName" placeholder="请输入项目名称" :style="{ width: '400px' }"/>
         </el-form-item>
+        <el-form-item label="项目负责人" prop="projectLeader">
+          <el-input v-model="form.projectLeader" placeholder="请输入项目负责人" :style="{ width: '100px'}"/>
+        </el-form-item>
         <el-form-item label="状态" prop="projectStatus" >
           <el-input v-model="form.projectStatus" placeholder="请输入状态" :style="{ width: '50px' }"/>
         </el-form-item>
@@ -190,9 +219,6 @@
             placeholder="请选择申报结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="项目负责人" prop="projectLeader">
-          <el-input v-model="form.projectLeader" placeholder="请输入项目负责人" :style="{ width: '100px'}"/>
-        </el-form-item>
         <el-form-item label="项目预算(万)" prop="projectBudget">
           <el-input v-model="form.projectBudget" placeholder="请输入项目预算(万)" :style="{ width: '100px'}"/>
         </el-form-item>
@@ -209,8 +235,8 @@
 </template>
 
 <script>
-import { listApplication, getApplication, delApplication, addApplication, updateApplication } from "@/api/project/application";
+import { listApplication, getApplication, delApplication, addApplication, updateApplication } from "@/api/scientific/application";
-
+import { listProcess} from "@/api/workflow/process";
 export default {
   name: "Application",
   data() {
@@ -241,11 +267,20 @@ export default {
         pageSize: 10,
         projectName: undefined,
         projectStatus: undefined,
+        projectAppProcId: undefined,
+        projectAppStaus: undefined,
         projectAppStTime: undefined,
         projectAppEndTime: undefined,
         projectLeader: undefined,
         projectBudget: undefined,
-        projectLeaderPhone: undefined
+        projectLeaderPhone: undefined,
+      },
+      queryProcParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: undefined,
+        processName: "项目预算追加表",
+        category: "001"
       },
       // 表单参数
       form: {},
@@ -274,13 +309,20 @@ export default {
         ],
         projectLeaderPhone: [
           { required: true, message: "项目负责人联系电话不能为空", trigger: "blur" }
-        ]
+        ],
       }
     };
   },
   created() {
     this.getList();
   },
+  // logzhan : 当我们跳转到其他路由页面，例如预算变更的时候，再次回来时
+  // 需要用这个函数刷新列表，否则列表将处于刷新状态不显示信息
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
   methods: {
     /** 查询项目申报列表 */
     getList() {
@@ -302,6 +344,8 @@ export default {
         projectId: undefined,
         projectName: undefined,
         projectStatus: undefined,
+        projectAppProcId: undefined,
+        projectAppStaus: undefined,
         projectAppStTime: undefined,
         projectAppEndTime: undefined,
         projectLeader: undefined,
@@ -342,22 +386,58 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改项目申报";
+        console.log(this.form)
       });
     },
+    /** 修改按钮操作 */
+    handleUpdateBudget(row) {
+      this.loading = true;
+      this.reset();
+      const upProjectId = row.projectId || this.ids
+
+      // 注释参考代码：用于后续代码修改的参考
+      // getApplication(projectId).then(response => {
+      //   this.loading = false;
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改项目申报";
+      // });
+
+      // 查询项目经费追加流程
+      listProcess(this.queryProcParams).then(response => {
+        this.processParams = response.rows[0];
+        this.deploymentId = this.processParams.deploymentId;
+        this.definitionId = this.processParams.definitionId;
+        // 流程名称暂时没有太大作用
+        // this.processName = this.processParams.processName;
+        this.$router.push({
+          path: `/workflow/process/proj_update/${this.deploymentId}?definitionId=${this.definitionId}`,
+          query: {
+            projectId: upProjectId
+          }
+        });
+      })
+    },
+
     /** 提交按钮 */
     submitForm() {
+      // $refs["form"].validate(valid => 验证表单是否有效
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          // 判断是修改还是新增
           if (this.form.projectId != null) {
+            console.log(this.form)
             updateApplication(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              // 提交成功后刷新列表
               this.getList();
             }).finally(() => {
               this.buttonLoading = false;
             });
           } else {
+            
             addApplication(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -386,9 +466,45 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('project/application/export', {
+      this.download('scientific/application/export', {
         ...this.queryParams
       }, `application_${new Date().getTime()}.xlsx`)
+    },
+    /**
+     * 把项目状态的code转换未文字: 0 : 未立项  1: 审核中  2: 已立项 
+     * @param   {number|string} cellValue - 原始数值
+     * @returns {string} 转换后的字符串
+     * @author  zhanli
+     */
+    formatProjectAppStatus(cellValue) {
+      switch (cellValue) {
+        case '0':
+          return "未立项";
+        case '1':
+          return "审核中";
+        case '2':
+          return "已立项";
+        default:
+          return "未知状态";
+      }
+    },
+    /**
+     * 把项目状态的申报code转换为文字: 0 : 未申报  1: 审核中  2: 已申报  
+     * @param   {number|string} cellValue - 原始数值
+     * @returns {string} 转换后的字符串
+     * @author  zhanli
+     */
+    formatProjectDeclareStatus(cellValue) {
+      switch (cellValue) {
+        case '0':
+          return "未申报";
+        case '1':
+          return "审核中";
+        case '2':
+          return "申报通过";
+        default:
+          return "未知状态";
+      }
     }
   }
 };

ruoyi-ui/src/views/scientific/handbook/detail.vue

@@ -0,0 +1,476 @@
+<template>
+  <div class="app-container">
+    <el-tabs tab-position="top" :value="processed === true ? 'approval' : 'form'">
+
+
+      <el-tab-pane label="表单信息" name="form">
+        <div v-if="formOpen">
+          <el-card class="box-card" shadow="never" v-for="(formInfo, index) in processFormList" :key="index">
+            <div slot="header" class="clearfix">
+<!--              <span>{{ formInfo.title }}</span>-->
+              <span> 计划详情 </span>
+            </div>
+
+            <!--流程处理表单模块-->
+            <el-col :span="20" :offset="2">
+              <parser :form-conf="formInfo"/>
+            </el-col>
+          </el-card>
+        </div>
+      </el-tab-pane >
+
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import { detailProcess } from '@/api/workflow/process'
+import Parser from '@/utils/generator/parser'
+import { complete, delegate, transfer, rejectTask, returnList, returnTask } from '@/api/workflow/task'
+import { selectUser, deptTreeSelect } from '@/api/system/user'
+import ProcessViewer from '@/components/ProcessViewer'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import Treeselect from '@riophae/vue-treeselect'
+
+export default {
+  name: "WorkDetail",
+  components: {
+    ProcessViewer,
+    Parser,
+    Treeselect
+  },
+  props: {},
+  computed: {
+    commentType() {
+      return val => {
+        switch (val) {
+          case '1': return '通过'
+          case '2': return '退回'
+          case '3': return '驳回'
+          case '4': return '委派'
+          case '5': return '转办'
+          case '6': return '终止'
+          case '7': return '撤回'
+        }
+      }
+    },
+    approveTypeTag() {
+      return val => {
+        switch (val) {
+          case '1': return 'success'
+          case '2': return 'warning'
+          case '3': return 'danger'
+          case '4': return 'primary'
+          case '5': return 'success'
+          case '6': return 'danger'
+          case '7': return 'info'
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 205 + 'px;',
+      // 模型xml数据
+      loadIndex: 0,
+      xmlData: undefined,
+      finishedInfo: {
+        finishedSequenceFlowSet: [],
+        finishedTaskSet: [],
+        unfinishedTaskSet: [],
+        rejectedTaskSet: []
+      },
+      historyProcNodeList: [],
+      // 部门名称
+      deptName: undefined,
+      // 部门树选项
+      deptOptions: undefined,
+      userLoading: false,
+      // 用户表格数据
+      userList: null,
+      deptProps: {
+        children: "children",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: undefined
+      },
+      total: 0,
+      // 遮罩层
+      loading: true,
+      taskForm:{
+        comment:"", // 意见内容
+        procInsId: "", // 流程实例编号
+        taskId: "" ,// 流程任务编号
+        copyUserIds: "", // 抄送人Id
+        vars: "",
+        targetKey:""
+      },
+      rules: {
+        comment: [{ required: true, message: '请输入审批意见', trigger: 'blur' }],
+      },
+      currentUserId: null,
+      variables: [], // 流程变量数据
+      taskFormOpen: false,
+      taskFormData: {}, // 流程变量数据
+      processFormList: [], // 流程变量数据
+      formOpen: false, // 是否加载流程变量数据
+      returnTaskList: [],  // 回退列表数据
+      processed: false,
+      returnTitle: null,
+      returnOpen: false,
+      rejectOpen: false,
+      rejectTitle: null,
+      userData: {
+        title: '',
+        type: '',
+        open: false,
+      },
+      copyUser: [],
+      nextUser: [],
+      userMultipleSelection: [],
+      userDialogTitle: '',
+      userOpen: false
+    };
+  },
+  created() {
+    this.initData();
+  },
+  methods: {
+    initData() {
+      this.taskForm.procInsId = this.$route.params && this.$route.params.handbookProcId;
+      this.taskForm.taskId  = this.$route.query && this.$route.query.taskId;
+      this.processed = this.$route.query && eval(this.$route.query.processed || false);
+
+      // 流程任务重获取变量表单
+      this.getProcessDetails(this.taskForm.procInsId, this.taskForm.taskId);
+      this.loadIndex = this.taskForm.procInsId;
+    },
+    /** 查询部门下拉树结构 */
+    getTreeSelect() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** 查询用户列表 */
+    getList() {
+      this.userLoading = true;
+      selectUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.toggleSelection(this.userMultipleSelection);
+        this.userLoading = false;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.getList();
+    },
+    setIcon(val) {
+      if (val) {
+        return "el-icon-check";
+      } else {
+        return "el-icon-time";
+      }
+    },
+    setColor(val) {
+      if (val) {
+        return "#2bc418";
+      } else {
+        return "#b3bdbb";
+      }
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.userMultipleSelection = selection
+    },
+    toggleSelection(selection) {
+      if (selection && selection.length > 0) {
+        this.$nextTick(()=> {
+          selection.forEach(item => {
+            let row = this.userList.find(k => k.userId === item.userId);
+            this.$refs.userTable.toggleRowSelection(row);
+          })
+        })
+      } else {
+        this.$nextTick(() => {
+          this.$refs.userTable.clearSelection();
+        });
+      }
+    },
+    // 关闭标签
+    handleClose(type, tag) {
+      let userObj = this.userMultipleSelection.find(item => item.userId === tag.id);
+      this.userMultipleSelection.splice(this.userMultipleSelection.indexOf(userObj), 1);
+      if (type === 'copy') {
+        this.copyUser = this.userMultipleSelection;
+        // 设置抄送人ID
+        if (this.copyUser && this.copyUser.length > 0) {
+          const val = this.copyUser.map(item => item.id);
+          this.taskForm.copyUserIds = val instanceof Array ? val.join(',') : val;
+        } else {
+          this.taskForm.copyUserIds = '';
+        }
+      } else if (type === 'next') {
+        this.nextUser = this.userMultipleSelection;
+        // 设置抄送人ID
+        if (this.nextUser && this.nextUser.length > 0) {
+          const val = this.nextUser.map(item => item.id);
+          this.taskForm.nextUserIds = val instanceof Array ? val.join(',') : val;
+        } else {
+          this.taskForm.nextUserIds = '';
+        }
+      }
+    },
+    /** 流程变量赋值 */
+    handleCheckChange(val) {
+      if (val instanceof Array) {
+        this.taskForm.values = {
+          "approval": val.join(',')
+        }
+      } else {
+        this.taskForm.values = {
+          "approval": val
+        }
+      }
+    },
+    getProcessDetails(procInsId, taskId) {
+      const params = {procInsId: procInsId, taskId: taskId}
+      detailProcess(params).then(res => {
+        const data = res.data;
+        this.xmlData = data.bpmnXml;
+        this.processFormList = data.processFormList;
+        this.taskFormOpen = data.existTaskForm;
+        if (this.taskFormOpen) {
+          this.taskFormData = data.taskFormData;
+        }
+        this.historyProcNodeList = data.historyProcNodeList;
+        this.finishedInfo = data.flowViewer;
+        this.formOpen = true;
+      })
+    },
+    onSelectCopyUsers() {
+      this.userMultipleSelection = this.copyUser;
+      this.onSelectUsers('添加抄送人', 'copy')
+    },
+    onSelectNextUsers() {
+      this.userMultipleSelection = this.nextUser;
+      this.onSelectUsers('指定审批人', 'next')
+    },
+    onSelectUsers(title, type) {
+      this.userData.title = title;
+      this.userData.type = type;
+      this.getTreeSelect();
+      this.getList()
+      this.userData.open = true;
+    },
+    /** 通过任务 */
+    handleComplete() {
+      // 校验表单
+      const taskFormRef = this.$refs.taskFormParser;
+      const isExistTaskForm = taskFormRef !== undefined;
+      // 若无任务表单，则 taskFormPromise 为 true，即不需要校验
+      const taskFormPromise = !isExistTaskForm ? true : new Promise((resolve, reject) => {
+        taskFormRef.$refs[taskFormRef.formConfCopy.formRef].validate(valid => {
+          valid ? resolve() : reject()
+        })
+      });
+      const approvalPromise = new Promise((resolve, reject) => {
+        this.$refs['taskForm'].validate(valid => {
+          valid ? resolve() : reject()
+        })
+      });
+      Promise.all([taskFormPromise, approvalPromise]).then(() => {
+        if (isExistTaskForm) {
+          this.taskForm.variables = taskFormRef[taskFormRef.formConfCopy.formModel]
+        }
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.goBack();
+        });
+      })
+    },
+    /** 委派任务 */
+    handleDelegate() {
+      this.$refs["taskForm"].validate(valid => {
+        if (valid) {
+          this.userData.type = 'delegate';
+          this.userData.title = '委派任务'
+          this.userData.open = true;
+          this.getTreeSelect();
+        }
+      })
+    },
+    /** 转办任务 */
+    handleTransfer(){
+      this.$refs["taskForm"].validate(valid => {
+        if (valid) {
+          this.userData.type = 'transfer';
+          this.userData.title = '转办任务';
+          this.userData.open = true;
+          this.getTreeSelect();
+        }
+      })
+    },
+    /** 拒绝任务 */
+    handleReject() {
+      this.$refs["taskForm"].validate(valid => {
+        if (valid) {
+          const _this = this;
+          this.$modal.confirm('拒绝审批单流程会终止，是否继续？').then(function() {
+            return rejectTask(_this.taskForm);
+          }).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            this.goBack();
+          });
+        }
+      });
+    },
+    changeCurrentUser(val) {
+      this.currentUserId = val.userId
+    },
+    /** 返回页面 */
+    goBack() {
+      // 关闭当前标签页并返回上个页面
+      this.$tab.closePage(this.$route)
+      this.$router.back()
+    },
+    /** 接收子组件传的值 */
+    getData(data) {
+      if (data) {
+        const variables = [];
+        data.fields.forEach(item => {
+          let variableData = {};
+          variableData.label = item.__config__.label
+          // 表单值为多个选项时
+          if (item.__config__.defaultValue instanceof Array) {
+            const array = [];
+            item.__config__.defaultValue.forEach(val => {
+              array.push(val)
+            })
+            variableData.val = array;
+          } else {
+            variableData.val = item.__config__.defaultValue
+          }
+          variables.push(variableData)
+        })
+        this.variables = variables;
+      }
+    },
+    submitUserData() {
+      let type = this.userData.type;
+      if (type === 'copy' || type === 'next') {
+        if (!this.userMultipleSelection || this.userMultipleSelection.length <= 0) {
+          this.$modal.msgError("请选择用户");
+          return false;
+        }
+        let userIds = this.userMultipleSelection.map(k => k.userId);
+        if (type === 'copy') {
+          // 设置抄送人ID信息
+          this.copyUser = this.userMultipleSelection;
+          this.taskForm.copyUserIds = userIds instanceof Array ? userIds.join(',') : userIds;
+        } else if (type === 'next') {
+          // 设置下一级审批人ID信息
+          this.nextUser = this.userMultipleSelection;
+          this.taskForm.nextUserIds = userIds instanceof Array ? userIds.join(',') : userIds;
+        }
+        this.userData.open = false;
+      } else {
+        if (!this.taskForm.comment) {
+          this.$modal.msgError("请输入审批意见");
+          return false;
+        }
+        if (!this.currentUserId) {
+          this.$modal.msgError("请选择用户");
+          return false;
+        }
+        this.taskForm.userId = this.currentUserId;
+        if (type === 'delegate') {
+          delegate(this.taskForm).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            this.goBack();
+          });
+        }
+        if (type === 'transfer') {
+          transfer(this.taskForm).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            this.goBack();
+          });
+        }
+      }
+
+    },
+    /** 可退回任务列表 */
+    handleReturn() {
+      this.$refs['taskForm'].validate(valid => {
+        if (valid) {
+          this.returnTitle = "退回流程";
+          returnList(this.taskForm).then(res => {
+            this.returnTaskList = res.data;
+            this.taskForm.values = null;
+            this.returnOpen = true;
+          })
+        }
+      });
+
+    },
+    /** 提交退回任务 */
+    submitReturn() {
+      this.$refs["taskForm"].validate(valid => {
+        if (valid) {
+          if (!this.taskForm.targetKey) {
+            this.$modal.msgError("请选择退回节点！");
+          }
+          returnTask(this.taskForm).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            this.goBack()
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+}
+.clearfix:after {
+  clear: both
+}
+
+.box-card {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+
+.el-row {
+  margin-bottom: 20px;
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+.el-col {
+  border-radius: 4px;
+}
+
+.button-new-tag {
+  margin-left: 10px;
+}
+</style>

ruoyi-ui/src/views/scientific/handbook/index.vue

@@ -0,0 +1,534 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="申报计划名称" prop="handbookName" label-width="100px" >
+        <el-input
+          v-model="queryParams.handbookName"
+          placeholder="请输入申报计划名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申报计划级别" prop="handbookLevel" label-width="100px">
+        <el-input
+          v-model="queryParams.handbookLevel"
+          placeholder="请输入申报计划级别"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申报开始日期" prop="projectAppStTime" label-width="100px">
+        <el-date-picker clearable
+          v-model="queryParams.projectAppStTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申报开始日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="申报结束日期" prop="projectAppEndTime" label-width="100px">
+        <el-date-picker clearable
+          v-model="queryParams.projectAppEndTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申报结束日期">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <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="['scientific:handbook:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['scientific:handbook:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['scientific:handbook:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['scientific:handbook:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="handbookList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" type="index" width="50"></el-table-column>
+      <el-table-column label="申报计划名称" align="center" prop="handbookName" :min-width="100"/>
+      <el-table-column label="申报计划级别" align="center" width="100px" :min-width="100">
+        <template slot-scope="scope">
+          <el-tag size="medium" :type="getTagLevelType(scope.row.handbookLevel)">
+            {{ formatHandbookLevel(scope.row.handbookLevel) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column label="申报开始日期" align="center" prop="projectAppStTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.projectAppStTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申报结束日期" align="center" prop="projectAppEndTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.projectAppEndTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="已申报项目" align="center" prop="projectAppStTime" width="180">
+        <template slot-scope="scope">
+          <el-button plain
+            size="mini"
+            @click="listProjectInHandbook(scope.row.handbookId)"
+            v-hasPermi="['scientific:handbook:list']"
+          >{{ scope.row.nProject }}</el-button>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="申报状态" align="center" width="100px" :min-width="100">
+        <template slot-scope="scope">
+          <el-tag size="medium" :type="getTagType(isCurrentDateInRange(scope.row.projectAppStTime, scope.row.projectAppEndTime))">
+            {{ isCurrentDateInRange(scope.row.projectAppStTime, scope.row.projectAppEndTime) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            icon="el-icon-top"
+            size="mini"
+            @click="handbookDetail(scope.row)"
+            v-hasPermi="['scientific:handbook:list']"
+          >查看计划</el-button>
+
+          <el-button
+            type="primary"
+            icon="el-icon-top"
+            size="mini"
+            @click="projectApply(scope.row)"
+            :disabled="isCurrentDateInRange(scope.row.projectAppStTime, scope.row.projectAppEndTime) !== '申报中'"
+            v-hasPermi="['scientific:handbook:list']"
+          >进入申报</el-button>
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改项目申报v2对话框 -->
+    <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-item label="申报信息名称" prop="handbookName">
+          <el-input v-model="form.handbookName" placeholder="请输入申报信息名称" />
+        </el-form-item>
+        <el-form-item label="项目立项流程实例Id" prop="handbookProcId">
+          <el-input v-model="form.handbookProcId" placeholder="请输入项目立项流程实例Id" />
+        </el-form-item>
+        <el-form-item label="项目指南级别(0市级 1区级 3省级 4国家级)" prop="handbookLevel">
+          <el-input v-model="form.handbookLevel" placeholder="请输入项目指南级别(0市级 1区级 3省级 4国家级)" />
+        </el-form-item>
+        <el-form-item label="申报开始日期" prop="projectAppStTime">
+          <el-date-picker clearable
+            v-model="form.projectAppStTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择申报开始日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="申报结束日期" prop="projectAppEndTime">
+          <el-date-picker clearable
+            v-model="form.projectAppEndTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择申报结束日期">
+          </el-date-picker>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listHandbook, getHandbook, delHandbook, addHandbook, updateHandbook } from "@/api/scientific/handbook";
+import { listProcess } from '@/api/workflow/process'
+import { listApplication } from '@/api/scientific/application'
+
+export default {
+  name: "Handbook",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目申报v2表格数据
+      handbookList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        handbookName: undefined,
+        handbookProcId: undefined,
+        handbookStatus: "3",
+        handbookType: undefined,
+        handbookLevel: undefined,
+        declareStatus: undefined,
+        projectAppStTime: undefined,
+        projectAppEndTime: undefined,
+        handbookLeader: undefined,
+        projectLeaderPhone: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        handbookId: [
+          { required: true, message: "项目ID不能为空", trigger: "blur" }
+        ],
+        handbookName: [
+          { required: true, message: "申报信息名称不能为空", trigger: "blur" }
+        ],
+        handbookProcId: [
+          { required: true, message: "项目立项流程实例Id不能为空", trigger: "blur" }
+        ],
+        handbookLevel: [
+          { required: true, message: "项目指南级别(0市级 1区级 3省级 4国家级)不能为空", trigger: "blur" }
+        ],
+        declareStatus: [
+          { required: true, message: "申报状态(0 停止申报 1 申报中)不能为空", trigger: "change" }
+        ],
+        projectAppStTime: [
+          { required: true, message: "申报开始日期不能为空", trigger: "blur" }
+        ],
+        projectAppEndTime: [
+          { required: true, message: "申报结束日期不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询项目申报v2列表 */
+    getList() {
+      this.loading = true;
+      listHandbook(this.queryParams).then(response => {
+        this.handbookList = response.rows;
+        this.total = response.total;
+        // 使用Promise.all来处理异步操作
+        const promises = this.handbookList.map(item => {
+          const queryParams = {
+            pageNum: 1,
+              pageSize: 10,
+              projectHandbookId: item.handbookId,
+          };
+          listApplication(queryParams).then(res => {
+            // zqjia:后续考虑是否保存整个res的信息
+            this.$set(item, "nProject", res.total);
+          });
+        });
+
+        Promise.all(promises).then(() => {
+          // 所有异步操作完成后，更新loading状态
+          this.loading = false;
+        });
+      });
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        handbookId: undefined,
+        handbookName: undefined,
+        handbookProcId: undefined,
+        handbookStatus: undefined,
+        handbookType: undefined,
+        handbookLevel: undefined,
+        declareStatus: undefined,
+        projectAppStTime: undefined,
+        projectAppEndTime: undefined,
+        handbookLeader: undefined,
+        projectLeaderPhone: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.handbookId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加项目申报v2";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const handbookId = row.handbookId || this.ids
+      getHandbook(handbookId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目申报v2";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.handbookId != null) {
+            updateHandbook(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addHandbook(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const handbookIds = row.handbookId || this.ids;
+      this.$modal.confirm('是否确认删除项目申报v2编号为"' + handbookIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delHandbook(handbookIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('scientific/handbook/export', {
+        ...this.queryParams
+      }, `handbook_${new Date().getTime()}.xlsx`)
+    },
+        /**
+     * 把项目状态的申报code转换为文字: 0 : 未申报  1: 审核中  2: 已申报
+     * @param   {number|string} cellValue - 原始数值
+     * @returns {string} 转换后的字符串
+     * @author  zhanli
+     */
+
+    formatHandbookLevel(cellValue) {
+      switch (cellValue) {
+        case '1':
+          return "国家级";
+        case '2':
+          return "省级";
+        case '3':
+          return "市级";
+        case '4':
+          return "院级";
+        default:
+          return "未知";
+      }
+    },
+    getTagType(status) {
+      switch (status) {
+        case '已结束':
+          // 显示红色 停止申报
+          return 'danger';
+        case '申报中':
+          // 审核中 显示绿色
+          return 'success';
+        case '未开始':
+          // 未申报, 灰色
+          return 'info';
+        default:
+          return '';
+      }
+    },
+    getTagLevelType(status) {
+      switch (status) {
+        case '2':
+          // 省级 蓝色
+          return 'primary';
+        case '3':
+          // 市级 显示绿色
+          return 'success';
+        case '4':
+          // 院级, 灰色
+          return 'info';
+        case '1':
+          // 国家级 红色
+          return 'danger';
+        default:
+          return '';
+      }
+    },
+    isCurrentDateInRange(startDate, endDate) {
+      // 获取当前时间
+      const currentDate = new Date();
+
+      // 将字符串日期转换为Date对象
+      const start = new Date(startDate);
+      const end = new Date(endDate);
+
+      // 判断当前时间是否在范围内
+      if(currentDate >= start && currentDate <= end) {
+        return "申报中";
+      }
+      else {
+        if(currentDate < start) {
+          return "未开始";
+        }
+        else {
+          return "已结束";
+        }
+      }
+    },
+    projectApply(row) {
+      let queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: undefined,
+        processName: "项目申报",
+        category: "002"
+      };
+
+      // 跳转到项目申报
+      listProcess(queryParams).then(response => {
+        const apply = response.rows[0];
+        if(apply) {
+          this.$router.push({
+            name: 'ProjectApply',
+            params: {
+              deployId: apply.deploymentId,
+              definitionId: apply.definitionId,
+              row: row
+            }
+          })
+        }
+      });
+    },
+    listProjectInHandbook(handbookId) {
+      if (handbookId === undefined) {
+        handbookId = 1;
+      }
+      let queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        projectHandbookId: handbookId,
+      };
+      this.$router.push({
+        name: 'handbookProjectQuery',
+        params: {
+          handbookId: handbookId,
+          queryParams: queryParams,
+        }
+      })
+    },
+    handbookDetail(row) {
+      this.$router.push({
+        path: '/scientific/handbook/detail/' + row.handbookProcId,
+        query: {
+          processed: false
+        }
+      })
+    },
+  }
+};
+</script>

ruoyi-ui/src/views/scientific/handbook_apply.vue

@@ -15,10 +15,11 @@
 </template>
 
 <script>
-import { listProcess} from "@/api/workflow/process";
+import { listProcess, startProcess_ } from '@/api/workflow/process'
 import { listAllCategory } from '@/api/workflow/category'
 import { getProcessForm, startProcess } from '@/api/workflow/process'
 import Parser from '@/utils/generator/parser'
+import { addHandbook } from '@/api/scientific/handbook'
 
 export default {
   name: 'handbookApply',
@@ -65,7 +66,7 @@ export default {
         }).then(res => {
           if (res.data) {
             this.formData = res.data;
-            this.formOpen = true
+            this.formOpen = true;
           }
         })
       })
@@ -96,15 +97,63 @@ export default {
     submit(data) {
       if (data && this.definitionId) {
         // 启动流程并将表单数据加入流程变量
-        startProcess(this.definitionId, JSON.stringify(data.valData)).then(res => {
+        startProcess_(this.definitionId, JSON.stringify(data.valData)).then(res => {
-          this.$modal.msgSuccess(res.msg);
+          if (res.code !== 200) {
+            this.$modal.msgError("操作失败");
+            return;
+          }
+          let handbookData = data.valData;
+          handbookData.handbookProcId = res.msg;
+          // zqjia:默认刚录入指南时状态为审核中，但后端会改为未审核
+          handbookData.handbookStatus = 1;
+          // zqjia:现在表单里的日期选择没有精确到小时，所以需要处理日期格式，后续要去掉
+          const date1 = new Date(handbookData.projectAppStTime);
+          const date2 = new Date(handbookData.projectAppEndTime);
+          handbookData.projectAppStTime = this.formatDateTime(date1);
+          handbookData.projectAppEndTime = this.formatDateTime(date2);
+          const date3 = new Date(handbookData.reviewStTime);
+          const date4 = new Date(handbookData.reviewEndTime);
+          handbookData.reviewStTime = this.formatDateTime(date3);
+          handbookData.reviewEndTime = this.formatDateTime(date4);
+          // zqjia:解析handbookFile，不然无法存到数据库中
+          const files = handbookData.handbookFile;
+          if (files !== null) {
+            let formatedFiles = {};
+            files.forEach(file => {
+              if(file.response.code === 200 && file.ossId) {
+                formatedFiles[file.name] = file.ossId;
+              }
+            })
+            handbookData.handbookFile = JSON.stringify(formatedFiles);
+          }
+
+          addHandbook(JSON.stringify(handbookData)).then(resp => {
+            if (res.code !== 200) {
+              this.$modal.msgError("操作失败");
+              return;
+            }
+            this.$modal.msgSuccess(resp.msg);
             this.$tab.closeOpenPage({
-            path: '/work/own'
+              // zqjia:这个路径由菜单管理里设置的路由决定
+              path: '/scientific/handbookList'
             })
+          });
         })
       }
+    },
+    formatDateTime(date) {
+      const padZero = (num) => (num < 10 ? '0' + num : num);
+
+      const year = date.getFullYear();
+      const month = padZero(date.getMonth() + 1); // getMonth() 返回值的范围是 0-11，所以需要加 1
+      const day = padZero(date.getDate());
+      const hours = padZero(date.getHours());
+      const minutes = padZero(date.getMinutes());
+      const seconds = padZero(date.getSeconds());
+
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
     }
-  }
+}
 }
 </script>
 

ruoyi-ui/src/views/scientific/handbook_query.vue

@@ -73,11 +73,13 @@
 
     <el-table v-loading="loading" :data="showList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="指南名称" align="center">
+      <el-table-column label="序号" type="index" width="50"></el-table-column>
+      <el-table-column label="申报信息名称" align="center" width="280px" :min-width="280">
         <template slot-scope="scope">
-          {{ scope.row.handbookname }}
+          <el-tag size="medium">{{ scope.row.projectName }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="发布人" align="center" prop="directorName" />
       <el-table-column label="指南类别" align="center">
         <template slot-scope="scope">
           {{ scope.row.handbookclass }}
@@ -88,26 +90,38 @@
           {{ scope.row.handbooklevel }}
         </template>
       </el-table-column>
-      <el-table-column label="截至日期" align="center">
+      <el-table-column label="申报结束日期" align="center">
         <template slot-scope="scope">
           {{ scope.row.handbookdate }}
         </template>
       </el-table-column>
       <el-table-column label="指南文件" align="center">
         <template slot-scope="scope">
-          <el-button class="file" @click="handbookDownload(scope.row.handbookfile)">下载</el-button>
+          <el-button class="file"
+            type="text"
+            icon="el-icon-download"
+            @click="handbookDownload(scope.row.handbookfile)"
+          >下载</el-button>
         </template>
       </el-table-column>
 
       <el-table-column label="项目申报" align="center">
         <template slot-scope="scope">
-          <el-button class="file" @click="projectApply(scope.row)">项目申报</el-button>
+          <el-button class="file" 
+            type="text"
+            icon="el-icon-top"
+            @click="projectApply(scope.row)"
+          >进入申报</el-button>
         </template>
       </el-table-column>
 
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
-          <el-button class="file" @click="listProject(scope.row)">已申报项目</el-button>
+          <el-button class="file" 
+            type="text"
+            icon="el-icon-folder-checked"
+            @click="listProject(scope.row)"
+          >已申报项目</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -245,6 +259,7 @@ export default {
       return new Promise((resolve,reject)=>{
         this.showList = [];
         this.loading = true;
+        // 先列出所有的指南流程
         listHandbook(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.handbookList = response.rows;
           this.total = response.total;
@@ -268,9 +283,9 @@ export default {
           res.rows.forEach(row => {
             let processForm = row.processFormList[0];
             let formData = [];
-            this.initFormData(processForm.fields, formData);
+            // 从原始表单中筛选解析的数据显示
+            this.parseFormData(processForm.fields, formData);
             formData["procInsId"] = row.procInsId;
-
             this.showList.push(formData);
           })
         })
@@ -281,9 +296,11 @@ export default {
     getCategoryList() {
       listAllCategory().then(response => this.categoryOptions = response.data)
     },
-
+    /**
-
+     * 从原始的流程表单中解析字段数据
-    initFormData(componentList, formData) {
+     * @author zqjia
+     */
+    parseFormData(componentList, formData) {
       componentList.forEach(cur => {
         this.buildOptionMethod(cur)
         const config = cur.__config__;
@@ -294,14 +311,11 @@ export default {
           else {
             formData[cur.__vModel__] = config.defaultValue;
           }
-
         }
-
         if (config.children) {
-          this.initFormData(config.children, formData);
+          this.parseFormData(config.children, formData);
         }
       })
-
     },
 
     // 特殊处理的 Option

ruoyi-ui/src/views/scientific/handbook_query_bak.vue

@@ -1,472 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="流程标识" prop="processKey">
-        <el-input
-          v-model="queryParams.processKey"
-          placeholder="请输入流程标识"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流程名称" prop="processName">
-        <el-input
-          v-model="queryParams.processName"
-          placeholder="请输入流程名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流程分类" prop="category">
-        <el-select v-model="queryParams.category" clearable placeholder="请选择" size="small">
-          <el-option
-            v-for="item in categoryOptions"
-            :key="item.categoryId"
-            :label="item.categoryName"
-            :value="item.code">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="提交时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          v-hasPermi="['workflow:process:ownExport']"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- <el-table v-loading="loading" :data="handbookList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>
-      <el-table-column label="指南名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程类别" align="center" prop="category" :formatter="categoryFormat" />
-      <el-table-column label="流程版本" align="center" width="80px">
-        <template slot-scope="scope">
-          <el-tag size="medium" >v{{ scope.row.procDefVersion }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前节点" align="center" prop="taskName"/>
-      <el-table-column label="提交时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="流程状态" align="center" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.wf_process_status" :value="scope.row.processStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="耗时" align="center" prop="duration" width="180"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-tickets"
-            @click="handleFlowRecord(scope.row)"
-            v-hasPermi="['workflow:process:query']"
-          >详情</el-button>
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-if="scope.row.finishTime"
-            v-hasPermi="['workflow:process:remove']"
-          >删除</el-button>
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-circle-close"
-            @click="handleStop(scope.row)"
-            v-hasPermi="['workflow:process:cancel']"
-          >取消</el-button>
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-refresh-right"
-            v-hasPermi="['workflow:process:start']"
-            @click="handleAgain(scope.row)"
-          >重新发起</el-button>
-        </template>
-      </el-table-column>
-    </el-table> -->
-
-    <el-table v-loading="loading" :data="showList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50"></el-table-column>
-      <!-- <el-table-column label="指南名称" align="center">
-        <template slot-scope="scope">
-          {{ scope.row[0] }}
-        </template>
-      </el-table-column> -->
-
-      <el-table-column label="指南名称" align="center" width="180px" :min-width="180">
-        <template slot-scope="scope">
-          <el-tag size="medium">{{ scope.row[0] }}</el-tag>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="指南类别" align="center">
-        <template slot-scope="scope">
-          {{ scope.row[1] }}
-        </template>
-      </el-table-column>
-      <el-table-column label="指南级别" align="center">
-        <template slot-scope="scope">
-          {{ scope.row[2] }}
-        </template>
-      </el-table-column>
-      <el-table-column label="截至日期" align="center">
-        <template slot-scope="scope">
-          {{ scope.row[3] }}
-        </template>
-      </el-table-column>
-
-      <el-table-column label="指南文件" align="center">
-        <template slot-scope="scope">
-          <el-button class="file" @click="handbookDownload(scope.row[5])" style="color: #1890ff;">
-            <i class="el-icon-download"></i> {{ scope.row[4] }}
-          </el-button>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-tickets"
-            @click="handleFlowDetails(scope.row[5])"
-            v-hasPermi="['workflow:process:query']"
-          >详情</el-button>
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-if="scope.row.finishTime"
-            v-hasPermi="['workflow:process:remove']"
-          >删除</el-button>
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-circle-close"
-            @click="handleStop(scope.row)"
-            v-hasPermi="['workflow:process:cancel']"
-          >取消</el-button>
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-refresh-right"
-            v-hasPermi="['workflow:process:start']"
-            @click="handleAgain(scope.row)"
-          >重新发起</el-button>
-        </template>
-      </el-table-column>
-
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-  </div>
-</template>
-
-<script>
-import {stopProcess, delProcess, listHandbook, detailProcess} from '@/api/workflow/process';
-import { listAllCategory } from '@/api/workflow/category';
-import Parser from '@/utils/generator/parser'
-import {getToken} from "@/utils/auth";
-// import {deepClone} from "@/utils";
-
-export default {
-  name: "Own",
-  dicts: ['wf_process_status'],
-  components: {
-    Parser,
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      processLoading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      categoryOptions: [],
-      processTotal:0,
-      // 我发起的流程列表数据
-      handbookList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      src: "",
-      definitionList:[],
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        processKey: undefined,
-        processName: undefined,
-        category: "007"
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
-
-      processFormList: [], // 流程变量数据
-      showList: [],
-    };
-  },
-  created() {
-    this.getCategoryList();
-  },
-  beforeRouteEnter(to, from, next) {
-    next(vm => {
-      vm.getList()
-    })
-  },
-  methods: {
-    // 文件下载
-    handbookDownload(ossId) {
-      this.$download.oss(ossId)
-    },
-
-    // 流程任务重获取变量表单
-    getProcessDetails(procInsId, taskId) {
-      const params = {procInsId: procInsId, taskId: taskId}
-      detailProcess(params).then(res => {
-        const data = res.data;
-        const formList = data.processFormList;
-        formList.forEach(form => {
-          var dataShow = [];
-          const fields = form.fields;
-
-          // zqjia:fields对应的是提交表单的各项数据，不同的序号对应不同的类型，分开处理
-          for (var i = 0; i < fields.length; i++) {
-            const tmp = fields[i];
-            const slot = tmp.__slot__;
-            const config = tmp.__config__;
-            if (i === 4 && config.defaultValue) {
-              tmp['file-list'] = config.defaultValue;
-              tmp['headers'] = {
-                Authorization: "Bearer " + getToken(),
-              }
-
-              // tmp['on-success'] = (res, file, fileList) => {
-              //   if (res.code === 200 && fileList) {
-              //     config.defaultValue = fileList;
-              //     fileList.forEach(val =>{
-              //       val.url = val.response.data.url;
-              //       val.ossId = val.response.data.ossId;
-              //     })
-              //   }
-              // };
-
-              // zqjia:点击文件列表中文件的ossId，现在假设只有一个文件
-              dataShow.push(config.defaultValue[0].name);
-              dataShow.push(config.defaultValue[0].ossId);
-              dataShow.push(procInsId);
-            }
-            else {
-              if (slot !== undefined && slot.options !== undefined) {
-                dataShow.push(slot.options[config.defaultValue - 1].label);
-              }
-              else {
-                dataShow.push(config.defaultValue);
-              }
-            }
-          }
-          this.showList.push(dataShow);
-        });
-        // zqjia:存储了原始表单数据，暂时未用到
-        this.processFormList.push(data.processFormList);
-      })
-    },
-
-    /** 查询流程分类列表 */
-    getCategoryList() {
-      listAllCategory().then(response => this.categoryOptions = response.data)
-    },
-    /** 查询流程定义列表 */
-    getList() {
-      this.loading = true;
-      listHandbook(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.handbookList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        this.handbookList.forEach(handbook => {
-          this.getProcessDetails(handbook.procInsId, undefined);
-        });
-      });
-      // console.log(this.showList);
-      console.log(this.processFormList);
-    },
-
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        name: null,
-        category: null,
-        key: null,
-        tenantId: null,
-        deployTime: null,
-        derivedFrom: null,
-        derivedFromRoot: null,
-        parentDeploymentId: null,
-        engineVersion: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.procInsId);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    handleAgain(row) {
-      this.$router.push({
-        path: '/workflow/process/start/' + row.deployId,
-        query: {
-          definitionId: row.procDefId,
-          procInsId: row.procInsId
-        }
-      })
-    },
-    /**  取消流程申请 */
-    handleStop(row){
-      const params = {
-        procInsId: row.procInsId
-      }
-      stopProcess(params).then( res => {
-        this.$modal.msgSuccess(res.msg);
-        this.getList();
-      });
-    },
-    /** 流程流转记录 */
-    handleFlowRecord(row) {
-      this.$router.push({
-        path: '/workflow/process/detail/' + row.procInsId,
-        query: {
-          processed: false
-        }
-      })
-    },
-    handleFlowDetails(procInsId) {
-      this.$router.push({
-        path: '/workflow/process/detail/' + procInsId,
-        query: {
-          processed: false
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.procInsId || this.ids;
-      this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return delProcess(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('workflow/process/ownExport', {
-        ...this.queryParams
-      }, `wf_own_process_${new Date().getTime()}.xlsx`)
-    },
-    categoryFormat(row, column) {
-      return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
-    }
-  }
-};
-</script>
-
-<style scoped>
-.file {
-  border: none;
-  background: none;
-  /* 取消其他默认样式 */
-  box-shadow: none;
-  padding: 0;
-  margin: 0;
-}
-
-.file:hover {
-  background: none; /* 去掉鼠标悬停时的背景 */
-  /* 如果需要，可以添加其他hover效果 */
-}
-</style>
-

ruoyi-ui/src/views/scientific/project/index.vue

@@ -1,46 +1,64 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目id" prop="projectId">
+      <el-form-item label="项目名称" prop="projectName">
         <el-input
-          v-model="queryParams.projectId"
+          v-model="queryParams.projectName"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="指南id" prop="handbookId">
-        <el-input
-          v-model="queryParams.handbookId"
-          placeholder="请输入指南id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目类别" prop="category">
-        <el-input
-          v-model="queryParams.category"
-          placeholder="请输入项目类别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
           placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="项目创建时间" prop="createTime">
+      <el-form-item label="状态" prop="projectStatus">
+        <el-input
+          v-model="queryParams.projectStatus"
+          placeholder="请输入状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申报开始日期" prop="projectAppStTime" label-width="140px">
         <el-date-picker clearable
-          v-model="queryParams.createTime"
+                        v-model="queryParams.projectAppStTime"
                         type="date"
                         value-format="yyyy-MM-dd"
-          placeholder="请选择项目创建时间">
+                        placeholder="请选择申报开始日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="申报结束日期" prop="projectAppEndTime" label-width="140px">
+        <el-date-picker clearable
+                        v-model="queryParams.projectAppEndTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择申报结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="项目负责人" prop="projectLeader" label-width="140px">
+        <el-input
+          v-model="queryParams.projectLeader"
+          placeholder="请输入项目负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="项目预算(万)" prop="projectBudget" label-width="100px">
+        <el-input
+          v-model="queryParams.projectBudget"
+          placeholder="请输入项目预算(万)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目负责人联系电话" prop="projectLeaderPhone" label-width="140px">
+        <el-input
+          v-model="queryParams.projectLeaderPhone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -55,8 +73,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['scientific:project:add']"
+          v-hasPermi="['scientific:application:add']"
-        >新增</el-button>
+        >项目填写</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -66,7 +84,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['scientific:project:edit']"
+          v-hasPermi="['scientific:application:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -77,7 +95,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['scientific:project:remove']"
+          v-hasPermi="['scientific:application:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -87,39 +105,76 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['scientific:project:export']"
+          v-hasPermi="['scientific:application:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="applicationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
+      <el-table-column label="序号" type="index" width="50"></el-table-column>
-      <el-table-column label="项目id" align="center" prop="projectId" />
+      <!-- <el-table-column label="项目ID" align="center" prop="projectId" v-if="true" width="180"/> -->
-      <el-table-column label="指南id" align="center" prop="handbookId" />
+      <el-table-column label="项目名称" align="center" :min-width="280">
-      <el-table-column label="项目类别" align="center" prop="category" />
-      <el-table-column label="项目名称" align="center" prop="name" />
-      <el-table-column label="项目创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <el-tag size="medium">{{ scope.row.projectName }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
+      <el-table-column label="项目负责人" align="center" prop="projectLeader" width="100"/>
+      <el-table-column label="申报状态" align="center" width="100px" :min-width="100">
         <template slot-scope="scope">
+          <el-tag size="medium">{{ formatProjectDeclareStatus(scope.row.projectDeclareStatus) }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="立项状态" align="center" width="100px" :min-width="100">
+        <template slot-scope="scope">
+          <el-tag size="medium">{{ formatProjectAppStatus(scope.row.projectAppStaus) }}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="申报开始日期" align="center" prop="projectAppStTime" :min-width="140" width="140">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.projectAppStTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申报结束日期" align="center" prop="projectAppEndTime" width="140">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.projectAppEndTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="项目预算(万)" align="center" prop="projectBudget" :min-width="180" width="180"/>
+      <el-table-column label="负责人电话" align="center" prop="projectLeaderPhone" :min-width="150" width="150"/>
+      <el-table-column label="操作" align="center" :min-width="280" width="280">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-top"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:application:remove']"
+          >申请立项</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['scientific:project:edit']"
+            v-hasPermi="['scientific:application:edit']"
-          >修改</el-button>
+          >信息修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdateBudget(scope.row)"
+            v-hasPermi="['scientific:application:edit']"
+          >预算追加</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['scientific:project:remove']"
+            v-hasPermi="['scientific:application:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -133,29 +188,43 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改科研管理对话框 -->
+    <!-- 添加或修改项目申报对话框, 采用open字段控制是否 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <!-- 这是提交或者详细信息的表单显示框  -->
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <!-- 这个表单的名字为form:
-        <el-form-item label="项目id" prop="projectId">
+         在form.projectName这种方式配置参数 -->
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px" >
+        <el-form-item label="项目名称" prop="projectName" >
+          <el-input v-model="form.projectName" placeholder="请输入项目名称" :style="{ width: '400px' }"/>
         </el-form-item>
-        <el-form-item label="指南id" prop="handbookId">
+        <el-form-item label="项目负责人" prop="projectLeader">
-          <el-input v-model="form.handbookId" placeholder="请输入指南id" />
+          <el-input v-model="form.projectLeader" placeholder="请输入项目负责人" :style="{ width: '100px'}"/>
         </el-form-item>
-        <el-form-item label="项目类别" prop="category">
+        <el-form-item label="状态" prop="projectStatus" >
-          <el-input v-model="form.category" placeholder="请输入项目类别" />
+          <el-input v-model="form.projectStatus" placeholder="请输入状态" :style="{ width: '50px' }"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="name">
+        <el-form-item label="申报开始日期" prop="projectAppStTime" >
-          <el-input v-model="form.name" placeholder="请输入项目名称" />
-        </el-form-item>
-        <el-form-item label="项目创建时间" prop="createTime">
           <el-date-picker clearable
-            v-model="form.createTime"
+                          v-model="form.projectAppStTime"
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择项目创建时间">
+                          placeholder="请选择申报开始日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="申报结束日期" prop="projectAppEndTime">
+          <el-date-picker clearable
+                          v-model="form.projectAppEndTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="请选择申报结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="项目预算(万)" prop="projectBudget">
+          <el-input v-model="form.projectBudget" placeholder="请输入项目预算(万)" :style="{ width: '100px'}"/>
+        </el-form-item>
+        <el-form-item label="项目负责人电话" prop="projectLeaderPhone">
+          <el-input v-model="form.projectLeaderPhone" placeholder="请输入项目负责人联系电话" :style="{ width: '140px'}" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -166,10 +235,10 @@
 </template>
 
 <script>
-import { listProject, getProject, delProject, addProject, updateProject } from "@/api/scientific/project";
+import { listApplication, getApplication, delApplication, addApplication, updateApplication } from "@/api/scientific/application";
-
+import { listProcess} from "@/api/workflow/process";
 export default {
-  name: "Project",
+  name: "Application",
   data() {
     return {
       // 按钮loading
@@ -186,8 +255,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 科研管理表格数据
+      // 项目申报表格数据
-      projectList: [],
+      applicationList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -196,43 +265,71 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        projectId: undefined,
+        projectName: undefined,
-        handbookId: undefined,
+        projectStatus: undefined,
-        category: undefined,
+        projectAppProcId: undefined,
-        name: undefined,
+        projectAppStaus: undefined,
-        createTime: undefined
+        projectAppStTime: undefined,
+        projectAppEndTime: undefined,
+        projectLeader: undefined,
+        projectBudget: undefined,
+        projectLeaderPhone: undefined,
+      },
+      queryProcParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: undefined,
+        processName: "项目预算追加表",
+        category: "001"
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
         projectId: [
-          { required: true, message: "项目id不能为空", trigger: "blur" }
+          { required: true, message: "项目ID不能为空", trigger: "blur" }
         ],
-        handbookId: [
+        projectName: [
-          { required: true, message: "指南id不能为空", trigger: "blur" }
-        ],
-        category: [
-          { required: true, message: "项目类别不能为空", trigger: "blur" }
-        ],
-        name: [
           { required: true, message: "项目名称不能为空", trigger: "blur" }
         ],
+        projectStatus: [
+          { required: true, message: "状态不能为空", trigger: "blur" }
+        ],
+        projectAppStTime: [
+          { required: true, message: "申报开始日期不能为空", trigger: "blur" }
+        ],
+        projectAppEndTime: [
+          { required: true, message: "申报结束日期不能为空", trigger: "blur" }
+        ],
+        projectLeader: [
+          { required: true, message: "项目负责人不能为空", trigger: "blur" }
+        ],
+        projectBudget: [
+          { required: true, message: "项目预算(万)不能为空", trigger: "blur" }
+        ],
+        projectLeaderPhone: [
+          { required: true, message: "项目负责人联系电话不能为空", trigger: "blur" }
+        ],
       }
     };
   },
   created() {
     this.getList();
   },
+  // logzhan : 当我们跳转到其他路由页面，例如预算变更的时候，再次回来时
+  // 需要用这个函数刷新列表，否则列表将处于刷新状态不显示信息
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
   methods: {
-    /** 查询科研管理列表 */
+    /** 查询项目申报列表 */
     getList() {
       this.loading = true;
-      listProject(this.queryParams).then(response => {
+      this.queryParams = this.$route.params && this.$route.params.queryParams;
-        this.projectList = response.rows;
+      listApplication(this.queryParams).then(response => {
+        this.applicationList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -245,12 +342,16 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: undefined,
         projectId: undefined,
-        handbookId: undefined,
+        projectName: undefined,
-        category: undefined,
+        projectStatus: undefined,
-        name: undefined,
+        projectAppProcId: undefined,
-        createTime: undefined
+        projectAppStaus: undefined,
+        projectAppStTime: undefined,
+        projectAppEndTime: undefined,
+        projectLeader: undefined,
+        projectBudget: undefined,
+        projectLeaderPhone: undefined
       };
       this.resetForm("form");
     },
@@ -266,7 +367,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map(item => item.projectId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -274,35 +375,71 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加科研管理";
+      this.title = "添加项目申报";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.loading = true;
       this.reset();
-      const id = row.id || this.ids
+      const projectId = row.projectId || this.ids
-      getProject(id).then(response => {
+      getApplication(projectId).then(response => {
         this.loading = false;
         this.form = response.data;
         this.open = true;
-        this.title = "修改科研管理";
+        this.title = "修改项目申报";
+        console.log(this.form)
       });
     },
+    /** 修改按钮操作 */
+    handleUpdateBudget(row) {
+      this.loading = true;
+      this.reset();
+      const upProjectId = row.projectId || this.ids
+
+      // 注释参考代码：用于后续代码修改的参考
+      // getApplication(projectId).then(response => {
+      //   this.loading = false;
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改项目申报";
+      // });
+
+      // 查询项目经费追加流程
+      listProcess(this.queryProcParams).then(response => {
+        this.processParams = response.rows[0];
+        this.deploymentId = this.processParams.deploymentId;
+        this.definitionId = this.processParams.definitionId;
+        // 流程名称暂时没有太大作用
+        // this.processName = this.processParams.processName;
+        this.$router.push({
+          path: `/workflow/process/proj_update/${this.deploymentId}?definitionId=${this.definitionId}`,
+          query: {
+            projectId: upProjectId
+          }
+        });
+      })
+    },
+
     /** 提交按钮 */
     submitForm() {
+      // $refs["form"].validate(valid => 验证表单是否有效
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          if (this.form.id != null) {
+          // 判断是修改还是新增
-            updateProject(this.form).then(response => {
+          if (this.form.projectId != null) {
+            console.log(this.form)
+            updateApplication(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              // 提交成功后刷新列表
               this.getList();
             }).finally(() => {
               this.buttonLoading = false;
             });
           } else {
-            addProject(this.form).then(response => {
+
+            addApplication(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -315,10 +452,10 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const projectIds = row.projectId || this.ids;
-      this.$modal.confirm('是否确认删除科研管理编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除项目申报编号为"' + projectIds + '"的数据项？').then(() => {
         this.loading = true;
-        return delProject(ids);
+        return delApplication(projectIds);
       }).then(() => {
         this.loading = false;
         this.getList();
@@ -330,9 +467,45 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('scientific/project/export', {
+      this.download('scientific/application/export', {
         ...this.queryParams
-      }, `project_${new Date().getTime()}.xlsx`)
+      }, `application_${new Date().getTime()}.xlsx`)
+    },
+    /**
+     * 把项目状态的code转换未文字: 0 : 未立项  1: 审核中  2: 已立项
+     * @param   {number|string} cellValue - 原始数值
+     * @returns {string} 转换后的字符串
+     * @author  zhanli
+     */
+    formatProjectAppStatus(cellValue) {
+      switch (cellValue) {
+        case '0':
+          return "未立项";
+        case '1':
+          return "审核中";
+        case '2':
+          return "已立项";
+        default:
+          return "未知状态";
+      }
+    },
+    /**
+     * 把项目状态的申报code转换为文字: 0 : 未申报  1: 审核中  2: 已申报
+     * @param   {number|string} cellValue - 原始数值
+     * @returns {string} 转换后的字符串
+     * @author  zhanli
+     */
+    formatProjectDeclareStatus(cellValue) {
+      switch (cellValue) {
+        case '0':
+          return "未申报";
+        case '1':
+          return "审核中";
+        case '2':
+          return "申报通过";
+        default:
+          return "未知状态";
+      }
     }
   }
 };

ruoyi-ui/src/views/scientific/projectApply.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>{{ processName }}</span>
+        <span>{{ this.handbook.handbookName }}</span>
       </div>
 
       <el-col :span="18" :offset="3">
@@ -18,6 +18,7 @@
 import { getProcessForm, startProcess_ } from '@/api/workflow/process'
 import Parser from '@/utils/generator/parser'
 import {addProject} from "@/api/scientific/project";
+import { addApplication } from '@/api/scientific/application'
 
 export default {
   name: 'WorkStart',
@@ -28,11 +29,11 @@ export default {
     return {
       definitionId: null,
       deployId: null,
-      procInsId: null,
+
       formOpen: false,
       formData: {},
 
-      processName: null,
+      handbook: {},
     }
   },
   created() {
@@ -41,15 +42,13 @@ export default {
   methods: {
     initData() {
       this.deployId = this.$route.params && this.$route.params.deployId;
-      this.definitionId = this.$route.query && this.$route.query.definitionId;
+      this.definitionId = this.$route.params && this.$route.params.definitionId;
-      this.procInsId = this.$route.query && this.$route.query.procInsId;
+      this.handbook = this.$route.params && this.$route.params.row;
-      this.processName = this.$route.query && this.$route.query.processName;
-      this.handbookId = this.$route.query && this.$route.query.handbookId;
 
       getProcessForm({
         definitionId: this.definitionId,
         deployId: this.deployId,
-        procInsId: this.procInsId
+        procInsId: undefined,
       }).then(res => {
         if (res.data) {
           this.formData = res.data;
@@ -82,18 +81,28 @@ export default {
     submit(data) {
       if (data && this.definitionId) {
         // 启动流程并将表单数据加入流程变量
-        // console.log(data);
-        startProcess_(this.definitionId, JSON.stringify(data.valData)).then(res => {
-          let projectData = {};
-          projectData.handbookId = this.handbookId;
-          projectData.projectId = res.msg;
-          // zqjia:项目申报表单确定后这些信息要改
-          projectData.category = 1;
-          projectData.name = data.valData.field101;
-          projectData.createTime = "2024-07-15 23:28:17";
-          projectData.id = undefined;
         console.log(data);
-          addProject(projectData).then(response => {
+        startProcess_(this.definitionId, JSON.stringify(data.valData)).then(res => {
+          const ori_data = data.valData;
+          // zqjia:项目申报表单确定后这些信息要改
+          let projectData = {};
+          projectData.projectName = ori_data.projectName;
+          projectData.projectStatus = 0;
+          projectData.projectAppProcId = res.msg;
+          projectData.projectDeclareStatus = 1;
+          projectData.projectAppStTime = this.formatDateTime(new Date());
+          projectData.projectAppEndTime = this.formatDateTime(new Date());
+          projectData.projectLeader = "liye";
+          projectData.projectBudget = 11;
+          projectData.projectHandbookId = this.handbook.handbookId;
+          projectData.projectHandbookName = this.handbook.handbookName;
+          projectData.projectLeaderPhone = ori_data.projectLeaderPhone;
+          projectData.projectCategory = this.handbook.handbookLevel;
+          projectData.projectContent = ori_data.projectContent;
+
+          console.log(projectData);
+
+          addApplication(JSON.stringify(projectData)).then(response => {
             this.$modal.msgSuccess("申报完成");
           })
 
@@ -102,6 +111,19 @@ export default {
           })
         })
       }
+    },
+
+    formatDateTime(date) {
+      const padZero = (num) => (num < 10 ? '0' + num : num);
+
+      const year = date.getFullYear();
+      const month = padZero(date.getMonth() + 1); // getMonth() 返回值的范围是 0-11，所以需要加 1
+      const day = padZero(date.getDate());
+      const hours = padZero(date.getHours());
+      const minutes = padZero(date.getMinutes());
+      const seconds = padZero(date.getSeconds());
+
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
     }
   }
 }

ruoyi-ui/src/views/system/user/index.vue

@@ -140,8 +140,8 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户系统编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户名(登录账号)" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="姓名(昵称)" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">

ruoyi-ui/src/views/workflow/work/approval.vue

@@ -189,8 +189,8 @@ export default {
         processKey: undefined,
         processName: undefined,
         category: undefined,
-        detailTitleName: 'field101',
+        detailTitleName: 'projectName',
-        detailDirectorName: 'field102'
+        detailDirectorName: 'directorName'
       },
       // 表单参数
       form: {},
@@ -272,9 +272,8 @@ export default {
     },
 
     handleProcessStart(row) {
-      const deploymentId = 'b1531b69-3eae-11ef-97ad-106fd9c7c7b5'; // 假设 row 中的 deploymentId 是常量
+      const deploymentId = '0ab3017f-428d-11ef-99ce-106fd9c7c7b5'; // 假设 row 中的 deploymentId 是常量
-      const definitionId = 'Process_1720608606342:1:b161c16c-3eae-11ef-97ad-106fd9c7c7b5'; // 假设 row 中的 definitionId 是常量
+      const definitionId = 'Process_1720608606342:2:0afd50f2-428d-11ef-99ce-106fd9c7c7b5'; // 假设 row 中的 definitionId 是常量
-
       this.$router.push({
         path: `/workflow/process/start/${deploymentId}?definitionId=${definitionId}`,
       });

ruoyi-ui/src/views/workflow/work/my_proj.vue

@@ -254,7 +254,7 @@ export default {
     },
     handleAgain(row) {
       this.$router.push({
-        path: '/workflow/process/start/' + row.deployId,
+        path: '/workflow/process/update/' + row.deployId,
         query: {
           definitionId: row.procDefId,
           procInsId: row.procInsId

ruoyi-ui/src/views/workflow/work/own.vue

@@ -74,13 +74,13 @@
     <el-table v-loading="loading" :data="ownProcessList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50"></el-table-column>
-      <el-table-column label="项目申报名" align="center" width="280px" :min-width="280">
+      <el-table-column label="项目名称" align="center" width="280px" :min-width="280">
         <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.processTitle }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="项目负责人" align="center" prop="director"  width="140"/>
-      <el-table-column label="计划(基金)中文名称" align="center" width="200px">
+      <el-table-column label="审批类型" align="center" width="200px">
         <template slot-scope="scope">
           <el-tag size="medium" >{{ scope.row.procDefName }}</el-tag>
         </template>
@@ -181,8 +181,8 @@ export default {
         processKey: undefined,
         processName: undefined,
         category: undefined,
-        detailTitleName: 'field101',
+        detailTitleName: 'projectName',
-        detailDirectorName: 'field102'
+        detailDirectorName: 'directorName'
       },
       // 表单参数
       form: {},
@@ -208,10 +208,11 @@ export default {
     getList() {
       this.loading = true;
       listOwnInfoProcess(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.ownProcessList = response.rows.filter(item => item.category === '002');
+        this.ownProcessList = response.rows;
         //this.ownProcessList = response.rows;
         this.total = response.total;
         this.loading = false;
+        console.log(this.ownProcessList);
       });
     },
     // 取消按钮

ruoyi-ui/src/views/workflow/work/process.vue

@@ -73,31 +73,28 @@
 
     <el-table v-loading="loading" :data="ownProcessList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50"/>
+      <el-table-column label="序号" type="index" width="50"></el-table-column>
-      <el-table-column label="项目计划名" align="center" :min-width="260" width="auto">
+      <el-table-column label="项目申报名" align="center" width="280px" :min-width="280">
         <template slot-scope="scope">
-          <el-tag size="medium" >{{ scope.row.processTitle }}</el-tag>
+          <el-tag size="medium">{{ scope.row.processTitle }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="审核类型" align="center" prop="procDefName" :min-width="140" width="auto"/>
+      <el-table-column label="项目负责人" align="center" prop="director"  width="140"/>
-
+      <el-table-column label="计划(基金)中文名称" align="center" width="200px">
-      <el-table-column label="审批类别" align="center" prop="category" :formatter="categoryFormat" width="140"/>
+        <template slot-scope="scope">
-      <el-table-column label="提交时间" align="center" prop="createTime" width="180"/>
+          <el-tag size="medium" >{{ scope.row.procDefName }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批类别" align="center" prop="category" :formatter="categoryFormat" width="180"/>
+      <el-table-column label="提交时间" align="center" prop="createTime" :min-width="180"/>
       <el-table-column label="项目审核状态" align="center" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.wf_process_status" :value="scope.row.processStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="耗时" align="center" prop="duration" width="160"/>
+      <!-- <el-table-column label="耗时" align="center" prop="duration" width="180"/> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="280">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="mini"
-            icon="el-icon-top"
-            @click="handleProcessStart(scope.row)"
-            v-hasPermi="['workflow:process:query']"
-          >项目申报</el-button>
           <el-button
             type="text"
             size="mini"
@@ -105,6 +102,14 @@
             @click="handleFlowRecord(scope.row)"
             v-hasPermi="['workflow:process:query']"
           >详情</el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.finishTime"
+            v-hasPermi="['workflow:process:remove']"
+          >删除</el-button>
           <el-button
             type="text"
             size="mini"
@@ -175,11 +180,9 @@ export default {
         pageSize: 10,
         processKey: undefined,
         processName: undefined,
-        // 目录的筛选是通过目录code实现的
-        // category: "006"
         category: undefined,
-        detailTitleName: 'proj_plan_title',
+        detailTitleName: 'projectName',
-        detailDirectorName: undefined
+        detailDirectorName: 'directorName'
       },
       // 表单参数
       form: {},
@@ -205,7 +208,7 @@ export default {
     getList() {
       this.loading = true;
       listOwnInfoProcess(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.ownProcessList = response.rows.filter(item => item.category === '006');
+        this.ownProcessList = response.rows.filter(item => item.category === '002');
         //this.ownProcessList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -270,7 +273,6 @@ export default {
       });
     },
     /** 流程流转记录 */
-    // 这个地方相当于导航到了其他的页面获取详细信息
     handleFlowRecord(row) {
       this.$router.push({
         path: '/workflow/process/detail/' + row.procInsId,
@@ -279,15 +281,6 @@ export default {
         }
       })
     },
-    handleProcessStart(row) {
-      const deploymentId = '7d553e9a-3e02-11ef-a576-106fd9c7c7b5'; // 假设 row 中的 deploymentId 是常量
-      const definitionId = 'Process_1720536463039:1:7d67b52d-3e02-11ef-a576-106fd9c7c7b5'; // 假设 row 中的 definitionId 是常量
-
-      this.$router.push({
-        path: `/workflow/process/start/${deploymentId}?definitionId=${definitionId}`,
-      });
-    },
-
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.procInsId || this.ids;
@@ -308,8 +301,6 @@ export default {
         ...this.queryParams
       }, `wf_own_process_${new Date().getTime()}.xlsx`)
     },
-
-    // 因为流程信息返回的cateory是编码类型001这样，所以需要转换为其实际对应的含义
     categoryFormat(row, column) {
       return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
     }

ruoyi-ui/src/views/workflow/work/proj_update.vue

@@ -0,0 +1,145 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <!-- 这个地方显示表单的标题 -->
+        <span>{{ processName }}</span>
+      </div>
+      <!-- 这里定义栅格布局组件 -->
+      <el-col :span="18" :offset="3">
+        <div class="form-conf" v-if="formOpen">
+          <!-- parser是一个自定义的组件，:form-conf="formData" 将 formData 对象作为属性传递给 parser 组件 -->
+          <!-- 推测是通过getData获取数据, formData是表单的结构数据 -->
+          <!-- formData是这个组件初始化的时候从后端接口得到的表单外观结构 -->
+          <!-- formData是纯数据，getData是解析formData,这个函数默认是data作为参数 -->
+          <parser :key="new Date().getTime()" :form-conf="formData" @submit="submit" ref="parser" @getData="getData"/>
+        </div>
+      </el-col>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getProcessForm, startProcess } from '@/api/workflow/process'
+import Parser from '@/utils/generator/parser'
+import { getApplication} from "@/api/scientific/application";
+export default {
+  name: 'WorkStart',
+  components: {
+    Parser
+  },
+  data() {
+    return {
+      definitionId: null,
+      deployId: null,
+      procInsId: null,
+      // 项目信息主表的Id,用于获取项目的各种信息
+      projectId: null,
+      formOpen: false,
+      formData: {},
+      projectData: {},
+      processName: null,
+    }
+  },
+  created() {
+    this.initData();
+  },
+  methods: {
+    initData() {
+      // 发起地址请求的时候可以获得这个数据的信息
+      this.deployId = this.$route.params && this.$route.params.deployId;
+      this.definitionId = this.$route.query && this.$route.query.definitionId;
+      this.procInsId = this.$route.query && this.$route.query.procInsId;
+      // 从地址的传递参数获取项目的Id信息
+      this.projectId = this.$route.query && this.$route.query.projectId;
+      // 如果能够从路由获得流程名字就赋值，否则就默认名字
+      if(this.$route.query && this.$route.query.processName) {
+        this.processName = this.$route.query && this.$route.query.processName;
+      }
+      else {
+        this.processName = "更新流程";
+      }
+      console.log(this.projectId)
+      getApplication(this.projectId).then(response => {
+        this.projectData = response.data;
+        this.processName = this.projectData.projectName + "-修改项目申报";
+      });
+      // 获取流程的动态表单
+      getProcessForm({
+        definitionId: this.definitionId,
+        deployId: this.deployId,
+        procInsId: this.procInsId
+      }).then(res => {
+        if (res.data) {
+          // 赋值到表单
+          this.formData = res.data;
+          this.formOpen = true;
+          this.formData.fields.forEach(field => {
+            if (field.__vModel__ === "projectName") {
+              field.__config__.defaultValue = this.projectData.projectName;
+              field.readonly = true;
+            }
+            if (field.__vModel__ === "oldBudget") {
+              field.__config__.defaultValue = this.projectData.projectBudget + "万";
+              field.readonly = true;
+            }
+            if (field.__vModel__ === "directorName") {
+              field.__config__.defaultValue = this.projectData.projectLeader;
+              field.readonly = true;
+            }
+          });
+        }
+      })
+
+    },
+    /** 接收子组件传的值 */
+    getData(data) {
+      if (data) {
+        console.log("get data");
+        const variables = [];
+        data.fields.forEach(item => {
+          let variableData = {};
+          // 直接获得标签信息
+          variableData.label = item.__config__.label
+          // 表单值为多个选项时
+          if (item.__config__.defaultValue instanceof Array) {
+            const array = [];
+            item.__config__.defaultValue.forEach(val => {
+              array.push(val)
+            })
+            variableData.val = array;
+          } else {
+            // 如果是单个信息,直接得到defaultValue
+            variableData.val = item.__config__.defaultValue
+          }
+          variables.push(variableData)
+        })
+        this.variables = variables;
+      }
+    },
+    submit(data) {
+      if (data && this.definitionId) {
+        // 启动流程并将表单数据加入流程变量
+        data.valData.projectId = this.projectId;
+        console.log("submit");
+        console.log(data.valData);
+        
+        startProcess(this.definitionId, JSON.stringify(data.valData)).then(res => {
+          this.$modal.msgSuccess(res.msg);
+          this.$tab.closeOpenPage({
+            path: '/work/own'
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.form-conf {
+  margin: 15px auto;
+  width: 80%;
+  padding: 15px;
+}
+</style>

ruoyi-ui/src/views/workflow/work/update.vue

@@ -2,11 +2,16 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>{{ processName }}</span>
+        <!-- 这个地方显示表单的标题 -->
+        <span>{{ "processName" }}</span>
       </div>
-
+      <!-- 这里定义栅格布局组件 -->
       <el-col :span="18" :offset="3">
         <div class="form-conf" v-if="formOpen">
+          <!-- parser是一个自定义的组件，:form-conf="formData" 将 formData 对象作为属性传递给 parser 组件 -->
+          <!-- 推测是通过getData获取数据, formData是表单的结构数据 -->
+          <!-- formData是这个组件初始化的时候从后端接口得到的表单外观结构 -->
+          <!-- formData是纯数据，getData是解析formData,这个函数默认是data作为参数 -->
           <parser :key="new Date().getTime()" :form-conf="formData" @submit="submit" ref="parser" @getData="getData"/>
         </div>
       </el-col>
@@ -15,9 +20,7 @@
 </template>
 
 <script>
-import { listProcess} from "@/api/workflow/process";
+import { getProcessForm, updateProcess } from '@/api/workflow/process'
-import { listAllCategory } from '@/api/workflow/category'
-import { getProcessForm, startProcess } from '@/api/workflow/process'
 import Parser from '@/utils/generator/parser'
 
 export default {
@@ -32,19 +35,7 @@ export default {
       procInsId: null,
       formOpen: false,
       formData: {},
-
+      processName: null,
-      processName: '',
-      categoryOptions: [],
-      // 流程定义表格数据
-      processParams: null,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        processKey: undefined,
-        processName: "项目指南录入",
-        category: "007"
-      },
     }
   },
   created() {
@@ -52,31 +43,39 @@ export default {
   },
   methods: {
     initData() {
-      /** 查询流程定义列表 */
+      // 发起地址请求的时候可以获得这个数据的信息
-      listProcess(this.queryParams).then(response => {
+      this.deployId = this.$route.params && this.$route.params.deployId;
-        this.processParams = response.rows[0];
+      this.definitionId = this.$route.query && this.$route.query.definitionId;
-        this.processName = this.processParams.processName;
+      this.procInsId = this.$route.query && this.$route.query.procInsId;
-        this.definitionId = this.processParams.definitionId;
 
+      // 如果能够从路由获得流程名字就赋值，否则就默认名字
+      if(this.$route.query && this.$route.query.processName) {
+        this.processName = this.$route.query && this.$route.query.processName;
+      }
+      else {
+        this.processName = "更新流程";
+      }
+
+      // 获取流程的动态表单
       getProcessForm({
-          definitionId: this.processParams.definitionId,
+        definitionId: this.definitionId,
-          deployId: this.processParams.deploymentId,
+        deployId: this.deployId,
-          procInsId: undefined
+        procInsId: this.procInsId
       }).then(res => {
         if (res.data) {
+          // 赋值到表单
           this.formData = res.data;
-            this.formOpen = true
+          this.formOpen = true;
         }
       })
-      })
     },
-
     /** 接收子组件传的值 */
     getData(data) {
       if (data) {
         const variables = [];
         data.fields.forEach(item => {
           let variableData = {};
+          // 直接获得标签信息
           variableData.label = item.__config__.label
           // 表单值为多个选项时
           if (item.__config__.defaultValue instanceof Array) {
@@ -86,6 +85,7 @@ export default {
             })
             variableData.val = array;
           } else {
+            // 如果是单个信息,直接得到defaultValue
             variableData.val = item.__config__.defaultValue
           }
           variables.push(variableData)
@@ -96,7 +96,9 @@ export default {
     submit(data) {
       if (data && this.definitionId) {
         // 启动流程并将表单数据加入流程变量
-        startProcess(this.definitionId, JSON.stringify(data.valData)).then(res => {
+        console.log("submit");
+        console.log(data.valData);
+        updateProcess(this.procInsId, JSON.stringify(data.valData)).then(res => {
           this.$modal.msgSuccess(res.msg);
           this.$tab.closeOpenPage({
             path: '/work/own'

scientific/pom.xml

@@ -28,6 +28,11 @@
             <artifactId>ruoyi-sms</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-flowable</artifactId>
+        </dependency>
+
         <!-- 短信 用哪个导入哪个依赖 -->
 <!--        <dependency>-->
 <!--            <groupId>com.aliyun</groupId>-->

scientific/src/main/java/com/ruoyi/scientific/controller/ProjectApplicationController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.controller;
+package com.ruoyi.scientific.controller;
 
 import java.util.List;
 import java.util.Arrays;
@@ -20,21 +20,21 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.domain.vo.ProjectApplicationVo;
+import com.ruoyi.scientific.domain.vo.ProjectApplicationVo;
-import com.ruoyi.project.domain.bo.ProjectApplicationBo;
+import com.ruoyi.scientific.domain.bo.ProjectApplicationBo;
-import com.ruoyi.project.service.IProjectApplicationService;
+import com.ruoyi.scientific.service.IProjectApplicationService;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 项目申报
  *
  * @author ruoyi
- * @date 2024-06-14
+ * @date 2024-07-18
  */
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/project/application")
+@RequestMapping("/scientific/application")
 public class ProjectApplicationController extends BaseController {
 
     private final IProjectApplicationService iProjectApplicationService;
@@ -42,7 +42,7 @@ public class ProjectApplicationController extends BaseController {
     /**
      * 查询项目申报列表
      */
-    @SaCheckPermission("project:application:list")
+    @SaCheckPermission("scientific:application:list")
     @GetMapping("/list")
     public TableDataInfo<ProjectApplicationVo> list(ProjectApplicationBo bo, PageQuery pageQuery) {
         return iProjectApplicationService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class ProjectApplicationController extends BaseController {
     /**
      * 导出项目申报列表
      */
-    @SaCheckPermission("project:application:export")
+    @SaCheckPermission("scientific:application:export")
     @Log(title = "项目申报", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ProjectApplicationBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ProjectApplicationController extends BaseController {
      *
      * @param projectId 主键
      */
-    @SaCheckPermission("project:application:query")
+    @SaCheckPermission("scientific:application:query")
     @GetMapping("/{projectId}")
     public R<ProjectApplicationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long projectId) {
@@ -74,7 +74,7 @@ public class ProjectApplicationController extends BaseController {
     /**
      * 新增项目申报
      */
-    @SaCheckPermission("project:application:add")
+    @SaCheckPermission("scientific:application:add")
     @Log(title = "项目申报", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +85,7 @@ public class ProjectApplicationController extends BaseController {
     /**
      * 修改项目申报
      */
-    @SaCheckPermission("project:application:edit")
+    @SaCheckPermission("scientific:application:edit")
     @Log(title = "项目申报", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -93,12 +93,24 @@ public class ProjectApplicationController extends BaseController {
         return toAjax(iProjectApplicationService.updateByBo(bo));
     }
 
+
+    /**
+     * 修改项项目预算审批
+     */
+    @SaCheckPermission("scientific:application:edit")
+    @RepeatSubmit()
+    @PostMapping("/updateBudgetProc")
+    public R<Void> updateBudgetProc(@Validated(EditGroup.class) @RequestBody ProjectApplicationBo bo) {
+        return toAjax(iProjectApplicationService.updateBudgetProc(bo));
+    }
+
+
     /**
      * 删除项目申报
      *
      * @param projectIds 主键串
      */
-    @SaCheckPermission("project:application:remove")
+    @SaCheckPermission("scientific:application:remove")
     @Log(title = "项目申报", businessType = BusinessType.DELETE)
     @DeleteMapping("/{projectIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

scientific/src/main/java/com/ruoyi/scientific/controller/ProjectHandbookController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.scientific.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.scientific.domain.vo.ProjectHandbookVo;
+import com.ruoyi.scientific.domain.bo.ProjectHandbookBo;
+import com.ruoyi.scientific.service.IProjectHandbookService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目申报v2
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/scientific/handbook")
+public class ProjectHandbookController extends BaseController {
+
+    private final IProjectHandbookService iProjectHandbookService;
+
+    /**
+     * 查询项目申报v2列表
+     */
+    @SaCheckPermission("scientific:handbook:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProjectHandbookVo> list(ProjectHandbookBo bo, PageQuery pageQuery) {
+        return iProjectHandbookService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出项目申报v2列表
+     */
+    @SaCheckPermission("scientific:handbook:export")
+    @Log(title = "项目申报v2", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProjectHandbookBo bo, HttpServletResponse response) {
+        List<ProjectHandbookVo> list = iProjectHandbookService.queryList(bo);
+        ExcelUtil.exportExcel(list, "项目申报v2", ProjectHandbookVo.class, response);
+    }
+
+    /**
+     * 获取项目申报v2详细信息
+     *
+     * @param handbookId 主键
+     */
+    @SaCheckPermission("scientific:handbook:query")
+    @GetMapping("/{handbookId}")
+    public R<ProjectHandbookVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long handbookId) {
+        return R.ok(iProjectHandbookService.queryById(handbookId));
+    }
+
+    /**
+     * 新增项目申报v2
+     */
+    @SaCheckPermission("scientific:handbook:add")
+    @Log(title = "项目申报v2", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProjectHandbookBo bo) {
+        return toAjax(iProjectHandbookService.insertByBo(bo));
+    }
+
+    /**
+     * 修改项目申报v2
+     */
+    @SaCheckPermission("scientific:handbook:edit")
+    @Log(title = "项目申报v2", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProjectHandbookBo bo) {
+        return toAjax(iProjectHandbookService.updateByBo(bo));
+    }
+
+    /**
+     * 删除项目申报v2
+     *
+     * @param handbookIds 主键串
+     */
+    @SaCheckPermission("scientific:handbook:remove")
+    @Log(title = "项目申报v2", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{handbookIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] handbookIds) {
+        return toAjax(iProjectHandbookService.deleteWithValidByIds(Arrays.asList(handbookIds), true));
+    }
+}

scientific/src/main/java/com/ruoyi/scientific/domain/ProjectApplication.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.domain;
+package com.ruoyi.scientific.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 项目申报对象 project_application
  *
  * @author ruoyi
- * @date 2024-06-14
+ * @date 2024-07-18
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -37,6 +37,18 @@ public class ProjectApplication extends BaseEntity {
      * 状态（0正常 1停用）
      */
     private String projectStatus;
+    /**
+     * 项目立项流程实例Id
+     */
+    private String projectAppProcId;
+    /**
+     * 项目申报状态(0 未申报 2申报中 3已申报 4 申报失败)
+     */
+    private String projectDeclareStatus;
+    /**
+     * 项目立项状态(0未立项 2审核中 3已立项)
+     */
+    private String projectAppStaus;
     /**
      * 申报开始日期
      */
@@ -58,4 +70,24 @@ public class ProjectApplication extends BaseEntity {
      */
     private String projectLeaderPhone;
 
+    /**
+     * 项目关联指南ID
+     */
+    private Long projectHandbookId;
+
+    /**
+     * 项目关联指南名称
+     */
+    private String projectHandbookName;
+
+    /**
+     * 项目关类别(0纵向 1横向 2院级 )
+     */
+    private String projectCategory;
+
+    /**
+     * 项目表单内容
+     */
+    private String projectContent;
+
 }

scientific/src/main/java/com/ruoyi/scientific/domain/ProjectHandbook.java

@@ -0,0 +1,104 @@
+package com.ruoyi.scientific.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目申报v2对象 project_handbook
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("project_handbook")
+public class ProjectHandbook extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 项目ID
+     */
+    @TableId(value = "handbook_id")
+    private Long handbookId;
+    /**
+     * 申报信息名称
+     */
+    private String handbookName;
+    /**
+     * 项目立项流程实例Id
+     */
+    private String handbookProcId;
+    /**
+     * 项目审核状态(1审核中 2审核失败 3审核通过)
+     */
+    private String handbookStatus;
+
+    /**
+     * 项目指南级别(4院级 3市级 2省级 1国家级)
+     */
+    private String handbookLevel;
+
+    /**
+     * 申报指南文件
+     */
+    private String handbookFile;
+
+    /**
+     * 申报计划
+     */
+    private String handbookComment;
+
+    /**
+     * 申报开始日期
+     */
+    private Date projectAppStTime;
+    /**
+     * 申报结束日期
+     */
+    private Date projectAppEndTime;
+
+    /**
+     * 项目来源单位
+     */
+    private String projectSourceDepartment;
+
+    /**
+     * 项目分类(即申报计划类别)
+     */
+    private String projectCategory;
+
+    /**
+     * 项目子类
+     */
+    private String projectSubclass;
+
+    /**
+     * 评审名称
+     */
+    private String reviewName;
+
+    /**
+     * 评审开始时间
+     */
+    private Date reviewStTime;
+
+    /**
+     * 评审结束时间
+     */
+    private Date reviewEndTime;
+
+    /**
+     * 创建人名字
+     */
+    private String createName;
+
+}

scientific/src/main/java/com/ruoyi/scientific/domain/bo/ProjectApplicationBo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.domain.bo;
+package com.ruoyi.scientific.domain.bo;
 
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 项目申报业务对象 project_application
  *
  * @author ruoyi
- * @date 2024-06-14
+ * @date 2024-07-18
  */
 
 @Data
@@ -42,16 +42,32 @@ public class ProjectApplicationBo extends BaseEntity {
     @NotBlank(message = "状态（0正常 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String projectStatus;
 
+    /**
+     * 项目立项流程实例Id
+     */
+    private String projectAppProcId;
+
+    /**
+     * 项目立项状态(0未立项 2审核中 3已立项)
+     */
+    private String projectAppStaus;
+
+
+    /**
+     * 项目申报状态(0 未申报 2申报中 3已申报 4 申报失败)
+     */
+    private String projectDeclareStatus;
+
     /**
      * 申报开始日期
      */
-    @NotNull(message = "申报开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "项目开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date projectAppStTime;
 
     /**
      * 申报结束日期
      */
-    @NotNull(message = "申报结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "项目结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date projectAppEndTime;
 
     /**
@@ -69,8 +85,26 @@ public class ProjectApplicationBo extends BaseEntity {
     /**
      * 项目负责人联系电话
      */
-    @NotBlank(message = "项目负责人联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String projectLeaderPhone;
 
+    /**
+     * 项目关联指南ID
+     */
+    private Long projectHandbookId;
+
+    /**
+     * 项目关联指南名称
+     */
+    private String projectHandbookName;
+
+    /**
+     * 项目关类别(0纵向 1横向 2院级 )
+     */
+    private String projectCategory;
+
+    /**
+     * 项目表单内容
+     */
+    private String projectContent;
 
 }

scientific/src/main/java/com/ruoyi/scientific/domain/bo/ProjectBaseBo.java

@@ -0,0 +1,22 @@
+package com.ruoyi.scientific.domain.bo;
+
+public class ProjectBaseBo {
+    /**
+     *  项目未立项常量
+     */
+    public static String PROJECT_NO_INIT = "0";
+    /**
+     *  项目审核中
+     */
+    public static String PROJECT_REVIEWING = "1";
+
+    /**
+     *  项目已立项
+     */
+    public static String PROJECT_INIT = "2";
+
+    /**
+     *  项目未申报
+     */
+    public static String PROJECT_NO_DECLARE = "0";
+}

scientific/src/main/java/com/ruoyi/scientific/domain/bo/ProjectHandbookBo.java

@@ -0,0 +1,114 @@
+package com.ruoyi.scientific.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目申报v2业务对象 project_handbook
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectHandbookBo extends BaseEntity {
+
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "项目ID不能为空", groups = { EditGroup.class })
+    private Long handbookId;
+
+    /**
+     * 申报信息名称
+     */
+    @NotBlank(message = "申报信息名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String handbookName;
+
+    /**
+     * 指南录入流程实例Id
+     */
+    @NotBlank(message = "指南录入流程实例Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String handbookProcId;
+
+    /**
+     * 指南录入流程审核状态(1审核中 2审核失败 3审核通过)
+     */
+    @NotBlank(message = "指南录入流程审核状态", groups = { AddGroup.class, EditGroup.class })
+    private String handbookStatus;
+
+    /**
+     * 项目指南级别(4院级 3市级 2省级 1国家级)
+     */
+    @NotBlank(message = "项目指南级别(4院级 3市级 2省级 1国家级)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String handbookLevel;
+
+    /**
+     * 申报指南文件
+     */
+
+    private String handbookFile;
+
+    /**
+     * 备注
+     */
+    private String handbookComment;
+
+    /**
+     * 申报开始日期
+     */
+    @NotNull(message = "申报开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date projectAppStTime;
+
+    /**
+     * 申报结束日期
+     */
+    @NotNull(message = "申报结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date projectAppEndTime;
+
+    /**
+     * 项目来源单位
+     */
+    private String projectSourceDepartment;
+
+    /**
+     * 项目分类(即申报计划类别)
+     */
+    private String projectCategory;
+
+    /**
+     * 项目子类
+     */
+    private String projectSubclass;
+
+    /**
+     * 评审名称
+     */
+    private String reviewName;
+
+    /**
+     * 评审开始时间
+     */
+    private Date reviewStTime;
+
+    /**
+     * 评审结束时间
+     */
+    private Date reviewEndTime;
+
+    /**
+     * 创建人名字
+     */
+    private String createName;
+
+}

scientific/src/main/java/com/ruoyi/scientific/domain/bo/UpdateBudgetBo.java

@@ -0,0 +1,14 @@
+package com.ruoyi.scientific.domain.bo;
+import lombok.Data;
+
+@Data
+public class UpdateBudgetBo {
+    /**
+     * 项目ID,不能为空
+     */
+    private Long projectId;
+
+    private Long projectOldBudget;
+
+    private Long projectNewBudget;
+}

scientific/src/main/java/com/ruoyi/scientific/domain/vo/ProjectApplicationVo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.domain.vo;
+package com.ruoyi.scientific.domain.vo;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -42,6 +42,22 @@ public class ProjectApplicationVo {
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
     private String projectStatus;
 
+    /**
+     * 项目立项流程实例Id
+     */
+    private String projectAppProcId;
+
+    /**
+     * 项目立项状态(0未立项 2审核中 3已立项 4 立项失败)
+     */
+    private String projectAppStaus;
+
+
+    /**
+     * 项目申报状态(0 未申报 2申报中 3已申报 4 申报失败)
+     */
+    private String projectDeclareStatus;
+
     /**
      * 申报开始日期
      */

scientific/src/main/java/com/ruoyi/scientific/domain/vo/ProjectHandbookVo.java

@@ -0,0 +1,114 @@
+package com.ruoyi.scientific.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 项目申报v2视图对象 project_handbook
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ProjectHandbookVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID
+     */
+    @ExcelProperty(value = "项目ID")
+    private Long handbookId;
+
+    /**
+     * 申报信息名称
+     */
+    @ExcelProperty(value = "申报信息名称")
+    private String handbookName;
+
+    /**
+     * 项目立项流程实例Id
+     */
+    @ExcelProperty(value = "项目立项流程实例Id")
+    private String handbookProcId;
+
+    /**
+     * 项目审核状态(0未审核 1审核中 3审核通过)
+     */
+    @ExcelProperty(value = "项目审核状态(0未审核 1审核中 3审核通过)")
+    private String handbookStatus;
+
+    /**
+     * 项目指南级别(0市级 1区级 3省级 4国家级)
+     */
+    @ExcelProperty(value = "项目指南级别(0市级 1区级 3省级 4国家级)")
+    private String handbookLevel;
+
+    /**
+     * 申报指南文件
+     */
+    private String handbookFile;
+
+    /**
+     * 申报计划
+     */
+    private String handbookComment;
+
+    /**
+     * 申报开始日期
+     */
+    @ExcelProperty(value = "申报开始日期")
+    private Date projectAppStTime;
+
+    /**
+     * 申报结束日期
+     */
+    @ExcelProperty(value = "申报结束日期")
+    private Date projectAppEndTime;
+
+    /**
+     * 项目来源单位
+     */
+    private String projectSourceDepartment;
+
+    /**
+     * 项目分类(即申报计划类别)
+     */
+    private String projectCategory;
+
+    /**
+     * 项目子类
+     */
+    private String projectSubclass;
+
+    /**
+     * 评审名称
+     */
+    private String reviewName;
+
+    /**
+     * 评审开始时间
+     */
+    private Date reviewStTime;
+
+    /**
+     * 评审结束时间
+     */
+    private Date reviewEndTime;
+
+    /**
+     * 创建人名字
+     */
+    private String createName;
+
+
+}

scientific/src/main/java/com/ruoyi/scientific/listener/BudgetUpdateTaskListener.java

@@ -0,0 +1,37 @@
+package com.ruoyi.scientific.listener;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.scientific.service.IProjectApplicationService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+@Component
+public class BudgetUpdateTaskListener implements ExecutionListener {
+    /**
+     * 注入字段（名称与流程设计时字段名称一致）
+     */
+
+    private final IProjectApplicationService iProjectApplicationService =
+        SpringUtils.getBean(IProjectApplicationService.class);
+
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.out.println("科研模块：执行任务监听器...");
+
+        String projectIdStr = (String) execution.getVariable("projectId");
+        Long projectId = Long.parseLong(projectIdStr);
+
+        String projectBudget = (String) execution.getVariable("newBudget");
+        Long budget = Long.parseLong(projectBudget);
+
+        iProjectApplicationService.updateBudgetInfoById(projectId, budget);
+
+        System.out.println("科研模块：项目Id：" + projectIdStr);
+        System.out.println("科研模块：项目预算：" + projectBudget);
+        // 调用其他模块的服务完成数据库的更新操作
+        // Your Code
+    }
+}

scientific/src/main/java/com/ruoyi/scientific/listener/HandbookUpdateListener.java

@@ -0,0 +1,85 @@
+package com.ruoyi.scientific.listener;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.flowable.common.constant.ProcessConstants;
+import com.ruoyi.flowable.common.enums.ProcessStatus;
+import com.ruoyi.scientific.service.IProjectApplicationService;
+import com.ruoyi.scientific.service.IProjectHandbookService;
+import org.flowable.engine.RuntimeService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.variable.api.history.HistoricVariableInstance;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.flowable.engine.HistoryService;
+import com.ruoyi.scientific.domain.bo.ProjectHandbookBo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.scientific.domain.vo.ProjectHandbookVo;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Map;
+import java.util.HashMap;
+
+//@Component
+//public class HandbookUpdateListener implements ExecutionListener {
+//
+//    @Override
+//    public void notify(DelegateExecution execution) {
+//        System.out.println("当前活动名称: " + execution.getProcessInstanceBusinessStatus());
+//
+//        if ("end".equals(execution.getEventName())) {
+//            if (execution.isEnded()) {
+//                System.out.println("任务被终止: " + execution.getId());
+//            } else {
+//                System.out.println("任务正常完成: " + execution.getId());
+//            }
+//        }
+//    }
+//}
+
+@Component
+public class HandbookUpdateListener implements ExecutionListener {
+    /**
+     * 注入字段（名称与流程设计时字段名称一致）
+     */
+
+    private final IProjectHandbookService iProjectHandbookService =
+        SpringUtils.getBean(IProjectHandbookService.class);
+    private final HistoryService historyService =
+        SpringUtils.getBean(HistoryService.class);
+
+    private final RuntimeService runtimeService =
+        SpringUtils.getBean(RuntimeService.class);
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.out.println("科研模块：执行指南更新任务监听器...");
+
+        String handbookProcId = execution.getProcessInstanceId();
+        ProjectHandbookBo bo = new ProjectHandbookBo();
+        bo.setHandbookProcId(handbookProcId);
+        PageQuery pageQuery = new PageQuery();
+        TableDataInfo<ProjectHandbookVo> result = iProjectHandbookService.queryPageList(bo, pageQuery);
+        Long handbookId = result.getRows().get(0).getHandbookId();
+
+        // zqjia:获取在task complete时注入的review状态
+        String reviewStatus = (String) execution.getVariable("review");
+        // 获取流程状态
+        String status = (String) runtimeService.getVariable(handbookProcId, ProcessConstants.PROCESS_STATUS_KEY);
+
+        // zqjia: runtimeService获取是否terminated，判断注入review字段可以区分是complete还是cancel
+        // 退回有bug，暂时不知道会不会到这来
+        if("terminated".equals(status)) {
+            iProjectHandbookService.updateHandbookInfoById(handbookId, "2");
+        }
+        else {
+            if("1".equals(reviewStatus)) {
+                iProjectHandbookService.updateHandbookInfoById(handbookId, "3");
+            }
+            else {
+                iProjectHandbookService.updateHandbookInfoById(handbookId, "0");
+            }
+        }
+    }
+}

scientific/src/main/java/com/ruoyi/scientific/mapper/ProjectApplicationMapper.java

@@ -1,14 +1,14 @@
-package com.ruoyi.project.mapper;
+package com.ruoyi.scientific.mapper;
 
-import com.ruoyi.project.domain.ProjectApplication;
+import com.ruoyi.scientific.domain.ProjectApplication;
-import com.ruoyi.project.domain.vo.ProjectApplicationVo;
+import com.ruoyi.scientific.domain.vo.ProjectApplicationVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
 /**
  * 项目申报Mapper接口
  *
  * @author ruoyi
- * @date 2024-06-14
+ * @date 2024-07-18
  */
 public interface ProjectApplicationMapper extends BaseMapperPlus<ProjectApplicationMapper, ProjectApplication, ProjectApplicationVo> {
 

scientific/src/main/java/com/ruoyi/scientific/mapper/ProjectHandbookMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.scientific.mapper;
+
+import com.ruoyi.scientific.domain.ProjectHandbook;
+import com.ruoyi.scientific.domain.vo.ProjectHandbookVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 项目申报v2Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public interface ProjectHandbookMapper extends BaseMapperPlus<ProjectHandbookMapper, ProjectHandbook, ProjectHandbookVo> {
+
+}

scientific/src/main/java/com/ruoyi/scientific/service/IProjectApplicationService.java

@@ -1,8 +1,8 @@
-package com.ruoyi.project.service;
+package com.ruoyi.scientific.service;
 
-import com.ruoyi.project.domain.ProjectApplication;
+import com.ruoyi.scientific.domain.ProjectApplication;
-import com.ruoyi.project.domain.vo.ProjectApplicationVo;
+import com.ruoyi.scientific.domain.vo.ProjectApplicationVo;
-import com.ruoyi.project.domain.bo.ProjectApplicationBo;
+import com.ruoyi.scientific.domain.bo.ProjectApplicationBo;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 
@@ -12,8 +12,8 @@ import java.util.List;
 /**
  * 项目申报Service接口
  *
- * @author ruoyi
+ * @author zhanli
- * @date 2024-06-14
+ * @date 2024-07-18
  */
 public interface IProjectApplicationService {
 
@@ -42,8 +42,18 @@ public interface IProjectApplicationService {
      */
     Boolean updateByBo(ProjectApplicationBo bo);
 
+    /**
+     * 修改项目预算审批流程
+     */
+    Boolean updateBudgetProc(ProjectApplicationBo bo);
+
     /**
      * 校验并批量删除项目申报信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 更新项目Id更新预算信息
+     */
+    Boolean updateBudgetInfoById(Long projectId, Long newProjectBudget);
 }

scientific/src/main/java/com/ruoyi/scientific/service/IProjectHandbookService.java

@@ -0,0 +1,54 @@
+package com.ruoyi.scientific.service;
+
+import com.ruoyi.scientific.domain.ProjectHandbook;
+import com.ruoyi.scientific.domain.vo.ProjectHandbookVo;
+import com.ruoyi.scientific.domain.bo.ProjectHandbookBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 项目申报v2Service接口
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public interface IProjectHandbookService {
+
+    /**
+     * 查询项目申报v2
+     */
+    ProjectHandbookVo queryById(Long handbookId);
+
+    /**
+     * 查询项目申报v2列表
+     */
+    TableDataInfo<ProjectHandbookVo> queryPageList(ProjectHandbookBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询项目申报v2列表
+     */
+    List<ProjectHandbookVo> queryList(ProjectHandbookBo bo);
+
+    /**
+     * 新增项目申报v2
+     */
+    Boolean insertByBo(ProjectHandbookBo bo);
+
+    /**
+     * 修改项目申报v2
+     */
+    Boolean updateByBo(ProjectHandbookBo bo);
+
+    /**
+     * 校验并批量删除项目申报v2信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 更新指南的审核状态
+     */
+    Boolean updateHandbookInfoById(Long handbookId, String status);
+}

scientific/src/main/java/com/ruoyi/scientific/service/impl/ProjectApplicationServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.service.impl;
+package com.ruoyi.scientific.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.utils.StringUtils;
@@ -7,13 +7,15 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.scientific.domain.bo.ProjectBaseBo;
+import com.ruoyi.scientific.domain.bo.UpdateBudgetBo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.domain.bo.ProjectApplicationBo;
+import com.ruoyi.scientific.domain.bo.ProjectApplicationBo;
-import com.ruoyi.project.domain.vo.ProjectApplicationVo;
+import com.ruoyi.scientific.domain.vo.ProjectApplicationVo;
-import com.ruoyi.project.domain.ProjectApplication;
+import com.ruoyi.scientific.domain.ProjectApplication;
-import com.ruoyi.project.mapper.ProjectApplicationMapper;
+import com.ruoyi.scientific.mapper.ProjectApplicationMapper;
-import com.ruoyi.project.service.IProjectApplicationService;
+import com.ruoyi.scientific.service.IProjectApplicationService;
 
 import java.util.List;
 import java.util.Map;
@@ -23,7 +25,7 @@ import java.util.Collection;
  * 项目申报Service业务层处理
  *
  * @author ruoyi
- * @date 2024-06-14
+ * @date 2024-07-18
  */
 @RequiredArgsConstructor
 @Service
@@ -63,11 +65,17 @@ public class ProjectApplicationServiceImpl implements IProjectApplicationService
         LambdaQueryWrapper<ProjectApplication> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), ProjectApplication::getProjectName, bo.getProjectName());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectStatus()), ProjectApplication::getProjectStatus, bo.getProjectStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getProjectAppProcId()), ProjectApplication::getProjectAppProcId, bo.getProjectAppProcId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProjectAppStaus()), ProjectApplication::getProjectAppStaus, bo.getProjectAppStaus());
         lqw.eq(bo.getProjectAppStTime() != null, ProjectApplication::getProjectAppStTime, bo.getProjectAppStTime());
         lqw.eq(bo.getProjectAppEndTime() != null, ProjectApplication::getProjectAppEndTime, bo.getProjectAppEndTime());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectLeader()), ProjectApplication::getProjectLeader, bo.getProjectLeader());
         lqw.eq(bo.getProjectBudget() != null, ProjectApplication::getProjectBudget, bo.getProjectBudget());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectLeaderPhone()), ProjectApplication::getProjectLeaderPhone, bo.getProjectLeaderPhone());
+
+
+        // zqjia:自定义条件查询
+        lqw.eq(bo.getProjectHandbookId() != null, ProjectApplication::getProjectHandbookId, bo.getProjectHandbookId());
         return lqw;
     }
 
@@ -76,9 +84,16 @@ public class ProjectApplicationServiceImpl implements IProjectApplicationService
      */
     @Override
     public Boolean insertByBo(ProjectApplicationBo bo) {
+        // 新增的时候默认设置为未立项状态
+        bo.setProjectAppStaus(ProjectBaseBo.PROJECT_NO_INIT);
+        // 新增项目默认设置为未申报状态
+        bo.setProjectDeclareStatus(ProjectBaseBo.PROJECT_NO_DECLARE);
+        // 数据转换
         ProjectApplication add = BeanUtil.toBean(bo, ProjectApplication.class);
+        // 保存实体信息
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
+        // 如果数据库成功插入，那么就可以获得项目的Id
         if (flag) {
             bo.setProjectId(add.getProjectId());
         }
@@ -95,6 +110,20 @@ public class ProjectApplicationServiceImpl implements IProjectApplicationService
         return baseMapper.updateById(update) > 0;
     }
 
+    /**
+     * 项目预算追加流程
+     */
+    @Override
+    public Boolean updateBudgetProc(ProjectApplicationBo bo) {
+//        ProjectApplication update = BeanUtil.toBean(bo, ProjectApplication.class);
+//        validEntityBeforeSave(update);
+        // 将项目的表单转换为Map
+        UpdateBudgetBo budgetBo = new UpdateBudgetBo();
+        budgetBo.setProjectId(bo.getProjectId());
+        //budgetBo.se
+        return true;
+    }
+
     /**
      * 保存前的数据校验
      */
@@ -112,4 +141,23 @@ public class ProjectApplicationServiceImpl implements IProjectApplicationService
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 根据给定的Id更新预算信息,这个功能用于支持项目预算变更。当用户发起预算变更流程，当流程
+     * 完成后，通过监听流程审批是否完成，确定是否更新预算信息
+     * @author : zhanli
+     */
+    public Boolean updateBudgetInfoById(Long projectId, Long newProjectBudget){
+        // 获取项目的详细信息
+        ProjectApplication projectApplication  = baseMapper.selectById(projectId);
+        if (projectApplication == null) {
+            return false;
+        }
+        // 更新预算信息
+        projectApplication.setProjectBudget(newProjectBudget);
+        // 保存信息
+        validEntityBeforeSave(projectApplication);
+        // 返回结果取决于是否更新成功
+        return baseMapper.updateById(projectApplication) > 0;
+    }
 }

scientific/src/main/java/com/ruoyi/scientific/service/impl/ProjectHandbookServiceImpl.java

@@ -0,0 +1,132 @@
+package com.ruoyi.scientific.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.scientific.domain.ProjectApplication;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.ruoyi.scientific.domain.bo.ProjectHandbookBo;
+import com.ruoyi.scientific.domain.vo.ProjectHandbookVo;
+import com.ruoyi.scientific.domain.ProjectHandbook;
+import com.ruoyi.scientific.mapper.ProjectHandbookMapper;
+import com.ruoyi.scientific.service.IProjectHandbookService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 项目申报v2Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@RequiredArgsConstructor
+@Service
+public class ProjectHandbookServiceImpl implements IProjectHandbookService {
+
+    private final ProjectHandbookMapper baseMapper;
+
+    /**
+     * 查询项目申报v2
+     */
+    @Override
+    public ProjectHandbookVo queryById(Long handbookId){
+        return baseMapper.selectVoById(handbookId);
+    }
+
+    /**
+     * 查询项目申报v2列表
+     */
+    @Override
+    public TableDataInfo<ProjectHandbookVo> queryPageList(ProjectHandbookBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProjectHandbook> lqw = buildQueryWrapper(bo);
+        Page<ProjectHandbookVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询项目申报v2列表
+     */
+    @Override
+    public List<ProjectHandbookVo> queryList(ProjectHandbookBo bo) {
+        LambdaQueryWrapper<ProjectHandbook> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProjectHandbook> buildQueryWrapper(ProjectHandbookBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProjectHandbook> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getHandbookName()), ProjectHandbook::getHandbookName, bo.getHandbookName());
+        lqw.eq(StringUtils.isNotBlank(bo.getHandbookProcId()), ProjectHandbook::getHandbookProcId, bo.getHandbookProcId());
+        lqw.eq(StringUtils.isNotBlank(bo.getHandbookStatus()), ProjectHandbook::getHandbookStatus, bo.getHandbookStatus());
+
+        lqw.eq(StringUtils.isNotBlank(bo.getHandbookLevel()), ProjectHandbook::getHandbookLevel, bo.getHandbookLevel());
+
+        lqw.eq(bo.getProjectAppStTime() != null, ProjectHandbook::getProjectAppStTime, bo.getProjectAppStTime());
+        lqw.eq(bo.getProjectAppEndTime() != null, ProjectHandbook::getProjectAppEndTime, bo.getProjectAppEndTime());
+
+        return lqw;
+    }
+
+    /**
+     * 新增项目申报v2
+     */
+    @Override
+    public Boolean insertByBo(ProjectHandbookBo bo) {
+        ProjectHandbook add = BeanUtil.toBean(bo, ProjectHandbook.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setHandbookId(add.getHandbookId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改项目申报v2
+     */
+    @Override
+    public Boolean updateByBo(ProjectHandbookBo bo) {
+        ProjectHandbook update = BeanUtil.toBean(bo, ProjectHandbook.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProjectHandbook entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除项目申报v2
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    public Boolean updateHandbookInfoById(Long handbookId, String status){
+        // 获取项目的详细信息
+        ProjectHandbook update  = baseMapper.selectById(handbookId);
+        if (update == null) {
+            return false;
+        }
+        // 更新预算信息
+        update.setHandbookStatus(status);
+        // 保存信息
+        validEntityBeforeSave(update);
+        // 返回结果取决于是否更新成功
+        return baseMapper.updateById(update) > 0;
+    }
+}

scientific/src/main/resources/mapper/scientific/ProjectApplicationMapper.xml

@@ -2,17 +2,24 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.mapper.ProjectApplicationMapper">
+<mapper namespace="com.ruoyi.scientific.mapper.ProjectApplicationMapper">
 
-    <resultMap type="com.ruoyi.project.domain.ProjectApplication" id="ProjectApplicationResult">
+    <resultMap type="com.ruoyi.scientific.domain.ProjectApplication" id="ProjectApplicationResult">
         <result property="projectId" column="project_id"/>
         <result property="projectName" column="project_name"/>
         <result property="projectStatus" column="project_status"/>
+        <result property="projectAppProcId" column="project_app_proc_id"/>
+        <result property="projectDeclareStatus" column="project_declare_status"/>
+        <result property="projectAppStaus" column="project_app_staus"/>
         <result property="projectAppStTime" column="project_app_st_time"/>
         <result property="projectAppEndTime" column="project_app_end_time"/>
         <result property="projectLeader" column="project_leader"/>
         <result property="projectBudget" column="project_budget"/>
         <result property="projectLeaderPhone" column="project_leader_phone"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
 

scientific/src/main/resources/mapper/scientific/ProjectHandbookMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.scientific.mapper.ProjectHandbookMapper">
+
+    <resultMap type="com.ruoyi.scientific.domain.ProjectHandbook" id="ProjectHandbookResult">
+        <result property="handbookId" column="handbook_id"/>
+        <result property="handbookName" column="handbook_name"/>
+        <result property="handbookProcId" column="handbook_proc_id"/>
+        <result property="handbookStatus" column="handbook_status"/>
+        <result property="handbookType" column="handbook_type"/>
+        <result property="handbookLevel" column="handbook_level"/>
+        <result property="declareStatus" column="declare_status"/>
+        <result property="projectAppStTime" column="project_app_st_time"/>
+        <result property="projectAppEndTime" column="project_app_end_time"/>
+        <result property="handbookLeader" column="handbook_leader"/>
+        <result property="projectLeaderPhone" column="project_leader_phone"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>