11482-【CR】【投资系统】增加审批流程-项目详情加入个流程审批信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ApproveUserController.java

@@ -92,7 +92,7 @@ public class ApproveUserController extends BaseController
         }catch(Exception e){
             e.printStackTrace();
             map.put("status", false);
-            map.put("msg", "保存失败！");
+            map.put("msg", "保存异常！");
         }
 
         return map;

ruoyi-system/src/main/resources/mapper/invest/TProjectDecisionMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TProjectDecision" id="TProjectDecisionResult">
         <result property="id"    column="id"    />
+        <result property="procInstId" column="proc_inst_id"/>
         <result property="projectPoolId"    column="project_pool_id"    />
         <result property="participantsId"    column="participants_id"    />
         <result property="participants"    column="participants"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProjectDecisionVo">
-        select id, project_pool_id, participants_id, participants, provision, remark, del_flag, create_by, create_time, update_by, update_time from t_project_decision
+        select id,proc_inst_id, project_pool_id, participants_id, participants, provision, remark, del_flag, create_by, create_time, update_by, update_time from t_project_decision
     </sql>
 
     <select id="selectTProjectDecisionList" parameterType="TProjectDecision" resultMap="TProjectDecisionResult">

ruoyi-ui/src/views/project/approval/myTask.vue

@@ -47,7 +47,7 @@
             border
             :data="myTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -220,7 +220,7 @@
             border
             :data="myDoneTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -384,7 +384,7 @@
             border
             :data="myList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"

ruoyi-ui/src/views/project/decision/myTask.vue

@@ -39,7 +39,7 @@
             border
             :data="myTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -204,7 +204,7 @@
             border
             :data="myDoneTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -360,7 +360,7 @@
             border
             :data="myList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"

ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -81,7 +81,7 @@
             border
             :data="myTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -128,14 +128,14 @@
               />
             </template>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
                   :value="scope.row.projectStage"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
 <!--            <el-table-column
               label="项目状态"
               align="center"
@@ -150,7 +150,7 @@
               </template>
             </el-table-column>-->
 
-            <el-table-column
+<!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -160,10 +160,10 @@
               parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
             }}</span>
               </template>
-            </el-table-column>
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            </el-table-column>-->
+<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
+                &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
                   :type="{
                     0: 'success',
@@ -178,7 +178,7 @@
                 }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -218,13 +218,13 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="申请人" align="center" prop="startUserName">
+<!--            <el-table-column label="申请人" align="center" prop="startUserName">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
                 </div>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="申请日期" align="center" prop="createTime">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
@@ -294,7 +294,7 @@
             border
             :data="myDoneTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -341,14 +341,14 @@
               />
             </template>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
                   :value="scope.row.projectStage"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
 <!--            <el-table-column
               label="项目状态"
               align="center"
@@ -362,9 +362,9 @@
                 />
               </template>
             </el-table-column>-->
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
+                &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
                   :type="{
                     0: 'success',
@@ -379,8 +379,8 @@
                 }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
-            </el-table-column>
-            <el-table-column
+            </el-table-column>-->
+<!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -390,7 +390,7 @@
               parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
             }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -488,7 +488,7 @@
             border
             :data="myList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -535,14 +535,14 @@
               />
             </template>
             </el-table-column>
-            <el-table-column label="项目阶段" align="center" prop="projectStage">
+<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
                   :value="scope.row.projectStage"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
 <!--            <el-table-column
               label="项目状态"
               align="center"
@@ -556,9 +556,9 @@
                 />
               </template>
             </el-table-column>-->
-            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
+                &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
                   :type="{
                     0: 'success',
@@ -573,8 +573,8 @@
                 }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
-            </el-table-column>
-            <el-table-column
+            </el-table-column>-->
+<!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -584,7 +584,7 @@
               parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
             }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">

ruoyi-ui/src/views/project/investigate/dueDiligenceList.vue

@@ -635,6 +635,9 @@
         </div>
       </el-tab-pane>-->
     </el-tabs>
+    <section v-if="showDetail">
+      <flowBase :procInstId="dueForm.procInstId" :id="dueForm.projectPoolId" v-if="dueForm.procInstId"></flowBase>
+    </section>
     <!--选择人员-->
     <selecUser
       ref="flowUser"
@@ -662,6 +665,7 @@ import projectItem from "./projectItem";
 import fileItem from "../../invest/components/fileItem";
 import selecDept from "../../invest/components/selecDept";
 import selecUser from "../../invest/components/selecUser";
+import flowBase from "../flowBase.vue";
 import { mapGetters } from "vuex";
 
 export default {
@@ -676,7 +680,7 @@ export default {
     },
   },
   dicts: ["up_way", "project_stage"],
-  components: { projectItem, fileItem, selecDept, selecUser },
+  components: { projectItem, fileItem, selecDept, selecUser,flowBase },
   data() {
     const validateLogo = (rule, value, callback) => {
       if (this.reportFileList.length <= 0) {

ruoyi-ui/src/views/project/investigate/myTask.vue

@@ -54,7 +54,7 @@
             border
             :data="myTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -213,7 +213,7 @@
             border
             :data="myDoneTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -362,7 +362,7 @@
             border
             :data="myList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"

ruoyi-ui/src/views/project/poolDetail.vue

@@ -145,7 +145,7 @@
           </el-timeline>
         </div>
         <div v-show="activeName === '1'">
-          <poolForm :type="type" :id="id"></poolForm>
+          <poolForm :type="type" :id="id" :isShowFlow="true"></poolForm>
         </div>
         <div v-if="activeName === '2'">
           <followList :type="'2'" ref="followList" :projectId="id"></followList>
@@ -216,6 +216,9 @@
               ></tableForm>
             </el-tab-pane>-->
           </el-tabs>
+          <section>
+            <flowBase :procInstId="formLXApply.procInstId" :id="formLXApply.projectPoolId" v-if="formLXApply.procInstId"></flowBase>
+          </section>
         </div>
         <div v-if="activeName === '4'">
           <!-- 尽职调查 -->
@@ -294,6 +297,9 @@
               ></tableForm>
             </el-tab-pane>
           </el-tabs>
+          <section>
+            <flowBase :procInstId="formTJApply.procInstId" :id="formTJApply.projectPoolId" v-if="formTJApply.procInstId"></flowBase>
+          </section>
         </div>
         <div v-if="activeName === '6'">
           <meetingList
@@ -341,7 +347,7 @@
   </div>
 </template>
 <script>
-import poolForm from "../invest/components/poolForm";
+import poolForm from "./poolForm";
 import contractList from "../invest/components/contractList";
 import fileList from "../invest/components/fileList";
 import followList from "../invest/components/followList";
@@ -365,10 +371,12 @@ import {
 } from "@/api/invest/meeting";
 
 import { mapGetters } from "vuex";
+import flowBase from "./flowBase.vue";
 
 export default {
   name: "investPoolDetail",
   components: {
+    flowBase,
     poolForm,
     contractList,
     fileList,
@@ -417,6 +425,7 @@ export default {
         listFile: null,
         participants: null,
         participantsId: null,
+        procInstId:null,
       },
       formTJApply: {
         id: null,
@@ -426,7 +435,9 @@ export default {
         listFile: null,
         participants: null,
         participantsId: null,
+        procInstId:null
       },
+      isShowFlow: false // 父组件中的变量
     };
   },
   computed: {

ruoyi-ui/src/views/project/poolForm.vue

@@ -491,6 +491,9 @@
         >
       </el-form-item>
     </el-form>
+    <section v-if="isShowFlow">
+      <flowBase :procInstId="form.procInstId" :id="form.id" v-if="form.procInstId"></flowBase>
+    </section>
   </div>
 </template>
 <script>
@@ -506,6 +509,7 @@ import fileItem from "../invest/components/fileItem";
 import channelItem from "../invest/components/channelItem";
 import selecDept from "../invest/components/selecDept";
 import { mapGetters } from "vuex";
+import flowBase from "./flowBase.vue";
 export default {
   props: {
     id: {
@@ -515,8 +519,13 @@ export default {
       type: String,
       default: "1", //1可编辑  2不可编辑
     },
+    // 声明接收的 props，名称与父组件传递时一致（驼峰式在模板中用短横线）
+    isShowFlow: {
+      type: Boolean,
+      default: false // 默认值
+    },
   },
-  components: { fileItem, channelItem, selecDept },
+  components: {flowBase, fileItem, channelItem, selecDept },
   dicts: [
     "CUSTOMER_TRADE",
     "project_group",
@@ -600,6 +609,7 @@ export default {
         listFile: null,
         bpFile: null,
         otherFile: null,
+        procInstId:null,
       },
       fileList: [],
       fileListBP: [],

ruoyi-ui/src/views/project/termination/myTask.vue

@@ -39,7 +39,7 @@
             border
             :data="myTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -203,7 +203,7 @@
             border
             :data="myDoneTaskList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"
@@ -357,7 +357,7 @@
             border
             :data="myList"
           >
-            <el-table-column type="selection" width="40" align="center" />
+<!--            <el-table-column type="selection" width="40" align="center" />-->
             <el-table-column
               type="index"
               label="序号"