前端

ruoyi-ui/src/api/invest/pool.js

@@ -55,4 +55,13 @@ export function editStage(data) {
     method: 'put',
     data: data
   })
+}
+
+// 根据项目ID获取项目流转记录
+export function listProjectPoolId(id) {
+  return request({
+    url: '/system/circulation/listProjectPoolId',
+    method: 'get',
+    params: {projectPoolId:id}
+  })
 }

ruoyi-ui/src/views/invest/channel/index.vue

@@ -25,7 +25,7 @@
         />
       </el-form-item>
       <el-form-item label="渠道类别" prop="channelType">
-        <el-select v-model="form.channelType" placeholder="请选择渠道类别">
+        <el-select v-model="queryParams.channelType" placeholder="全部">
           <el-option
             v-for="dict in dict.type.channel_type"
             :key="dict.value"
@@ -135,11 +135,27 @@
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="渠道名称" align="center" prop="channelName" />
       <el-table-column label="渠道编号" align="center" prop="channelCode" />
-      <el-table-column label="渠道类别" align="center" prop="channelType" />
+      <el-table-column label="渠道类别" align="center" prop="channelType">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.channel_type"
+            :value="scope.row.channelType"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="联系人" align="center" prop="contacts" />
       <el-table-column label="联系电话" align="center" prop="telephone" />
       <el-table-column label="渠道负责人" align="center" prop="channelHead" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.channel_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column
         label="操作"
         align="center"
@@ -290,7 +306,7 @@ import fileItem from "../components/fileItem";
 export default {
   name: "Channel",
   components: { fileItem, selecDept },
-  dicts: ["channel_type", "channel_status","project_group"],
+  dicts: ["channel_type", "channel_status", "project_group"],
   data() {
     return {
       fileList: [],

ruoyi-ui/src/views/invest/components/contractList.vue

@@ -17,22 +17,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="项目ID" prop="projectPoolId">
+      <!-- <el-form-item label="项目ID" prop="projectPoolId">
         <el-input
           v-model="queryParams.projectPoolId"
           placeholder="请输入项目ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="项目阶段" prop="projectStage">
+      </el-form-item> -->
+      <!-- <el-form-item label="项目阶段" prop="projectStage">
         <el-input
           v-model="queryParams.projectStage"
           placeholder="请输入项目阶段"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="会议编号" prop="fileBusinessId">
         <el-input
           v-model="queryParams.fileBusinessId"
@@ -129,6 +129,10 @@
           />
         </template>
       </el-table-column>
+      
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
       <!-- <el-table-column label="合同类别" align="center" prop="contractType">
         
       </el-table-column> -->

ruoyi-ui/src/views/invest/components/fileList.vue

@@ -17,13 +17,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="项目阶段" prop="projectStage">
-        <el-input
-          v-model="queryParams.projectStage"
-          placeholder="请输入项目阶段"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="文件类别" prop="fileType">
+        <el-select v-model="queryParams.fileType" placeholder="全部" clearable>
+          <el-option
+            v-for="dict in dict.type.file_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
 
       <el-form-item>
@@ -101,6 +103,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="文件类别" align="center" prop="fileType">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.file_type"
+            :value="scope.row.fileType"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="项目名称"
         align="center"
@@ -114,15 +124,10 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="文件类别" align="center" prop="fileType">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.file_type"
-            :value="scope.row.fileType"
-          />
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="会议编号" align="center" prop="fileBusinessId" /> -->
+
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/invest/components/followList.vue

@@ -45,6 +45,7 @@
       </el-form-item>
       <el-form-item label="跟进日期" prop="realityUpDate">
         <el-date-picker
+          style="width: 205px"
           clearable
           v-model="queryParams.realityUpDate"
           type="date"
@@ -151,6 +152,7 @@
           <span>{{ parseTime(scope.row.realityUpDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column
         label="操作"

ruoyi-ui/src/views/invest/components/meetingList.vue

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="90px"
+      label-width="70px"
     >
       <el-form-item label="会议主题" prop="meetingTheme">
         <el-input
@@ -25,8 +25,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="会议开始时间" prop="startTime">
+      <el-form-item label="会议类别" prop="meetingType">
+        <el-select
+          v-model="queryParams.meetingType"
+          placeholder="全部"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.meeting_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      
+      <el-form-item label="开始时间" prop="startTime">
         <el-date-picker
+          style="width: 205px"
           clearable
           v-model="queryParams.startTime"
           type="date"
@@ -35,8 +51,9 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="会议结束时间" prop="endTime">
+      <el-form-item label="结束时间" prop="endTime">
         <el-date-picker
+          style="width: 205px"
           clearable
           v-model="queryParams.endTime"
           type="date"
@@ -138,7 +155,6 @@
         label="会议开始时间"
         align="center"
         prop="startTime"
-        width="180"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
@@ -148,7 +164,6 @@
         label="会议结束时间"
         align="center"
         prop="endTime"
-        width="180"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
@@ -156,6 +171,8 @@
       </el-table-column>
       <el-table-column label="会议地点" align="center" prop="place" />
       <el-table-column label="会议发起人" align="center" prop="promoter" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/invest/components/projectList.vue

@@ -17,13 +17,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="渠道id" prop="channel">
-        <el-input
-          v-model="queryParams.channel"
-          placeholder="请输入渠道id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="渠道" prop="channel">
+        <el-select v-model="queryParams.channel" placeholder="全部" clearable>
+          <el-option
+            v-for="item in channelList"
+            :key="item.id"
+            :label="item.channelName"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="所属组别" prop="projectGroup">
         <el-select
@@ -144,6 +146,7 @@
       </el-form-item> -->
       <el-form-item label="创建日期" prop="createTime">
         <el-date-picker
+          style="width: 205px"
           clearable
           v-model="queryParams.createTime"
           type="date"
@@ -231,7 +234,24 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="projectName"
+        width="150"
+      />
+      <el-table-column
+        label="投资负责人"
+        align="center"
+        prop="investHead"
+        width="100px"
+      />
+      <!-- <el-table-column label="项目编号" align="center" prop="id" /> -->
+      <el-table-column
+        label="渠道"
+        align="center"
+        prop="tProjectChannel.channelName"
+      />
       <el-table-column label="所属组别" align="center" prop="projectGroup">
         <template slot-scope="scope">
           <dict-tag
@@ -240,24 +260,33 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="项目编号" align="center" prop="projectCode" />
-      <el-table-column label="渠道" align="center" prop="channel" />
-      <el-table-column label="投资负责人" align="center" prop="investHead" />
-       <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 label="项目状态" align="center" prop="projectState" />
 
+      <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
+        label="项目状态"
+        align="center"
+        prop="projectState"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.project_state"
+            :value="scope.row.projectState"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="初次接触日期"
         align="center"
         prop="contactDate"
-        width="180"
+        width="100"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.contactDate, "{y}-{m}-{d}") }}</span>
@@ -267,7 +296,7 @@
         label="立项通过日期"
         align="center"
         prop="projectDate"
-        width="180"
+        width="100"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
@@ -277,7 +306,7 @@
         label="投决通过日期"
         align="center"
         prop="decisionDate"
-        width="180"
+        width="100"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
@@ -325,6 +354,13 @@
       <el-table-column label="投资类型" align="center" prop="investType" />
       <el-table-column label="投资策略" align="center" prop="investPloy" />
       <el-table-column label="投资价值" align="center" prop="investWorth" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="100"
+      />
       <el-table-column
         width="300"
         fixed="right"
@@ -350,6 +386,22 @@
             @click="handleMeeting(scope.row, 'LX')"
             >发起立项会议</el-button
           >
+          <el-button
+            v-if="stage == '3'"
+            size="mini"
+            type="text"
+            icon="el-icon-document-remove"
+            @click="handleMark(scope.row, '1')"
+            >去打分</el-button
+          >
+          <el-button
+            v-if="stage == '3'"
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="handleLookMark(scope.row, '3')"
+            >查看打分表</el-button
+          >
           <el-button
             v-if="stage == '4'"
             size="mini"
@@ -452,6 +504,7 @@ import {
   editStage,
 } from "@/api/invest/pool";
 
+import { listChannel } from "@/api/invest/channel";
 export default {
   props: {
     type: {
@@ -466,7 +519,7 @@ export default {
       type: String,
     },
   },
-  dicts: ["project_group", "project_stage"],
+  dicts: ["project_group", "project_stage", "project_state"],
   data() {
     return {
       project_state: [],
@@ -602,6 +655,7 @@ export default {
         projectState: "",
         stageName: "",
       },
+      channelList: [],
     };
   },
   mounted() {
@@ -614,6 +668,13 @@ export default {
     }
 
     this.getList();
+    // 渠道
+    listChannel({
+      pageNum: 1,
+      pageSize: 100,
+    }).then((response) => {
+      this.channelList = response.rows;
+    });
   },
   activated() {
     // 项目阶段
@@ -689,6 +750,20 @@ export default {
     },
     // 发起尽调申请
     handleSurvey(row) {},
+    // 去打分
+    handleMark(row, type) {
+      this.$router.push({
+        path: "/invest/meeting/mark",
+        query: { id: row.id, formType: type },
+      });
+    },
+    // 查看打分表
+    handleLookMark(row, type) {
+      this.$router.push({
+        path: "/invest/meeting/mark",
+        query: { id: row.id, formType: type },
+      });
+    },
     // 上传跟进记录
     handlefollowRecord(row) {
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);

ruoyi-ui/src/views/invest/components/tableForm.vue

@@ -322,10 +322,10 @@
             持久重大：4-5
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -340,10 +340,10 @@
             颠覆性的：8-9
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -356,10 +356,10 @@
             15年以上产业经验：3-4
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -371,10 +371,10 @@
             行业内知名专家、世界名校博士、行业内龙头企业技术团队：3-4
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -386,10 +386,10 @@
             很强：3-4
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -402,10 +402,10 @@
             卓越：6-8
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -417,20 +417,20 @@
           </td>
           <td>2</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
           <td colspan="3">具有明确的盈利模式</td>
           <td>2</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -440,10 +440,10 @@
           </td>
           <td>1</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -452,10 +452,10 @@
           </td>
           <td>1</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -463,10 +463,10 @@
           <td colspan="3">估值水平、预期收益合理</td>
           <td>1</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -482,10 +482,10 @@
             200亿以上：2
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -497,10 +497,10 @@
             收入年增长率70%以上：3
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -515,7 +515,7 @@
             退出收益1倍以上：4
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
             <input type="text" class="table-input" disabled />
@@ -854,10 +854,10 @@
             持久重大：4-5
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -872,10 +872,10 @@
             颠覆性的：8-9
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -888,10 +888,10 @@
             15年以上产业经验：3-4
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -903,10 +903,10 @@
             行业内知名专家、世界名校博士、行业内龙头企业技术团队：3-4
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -918,10 +918,10 @@
             很强：3-4
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -934,10 +934,10 @@
             卓越：6-8
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -949,20 +949,20 @@
           </td>
           <td>2</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
           <td colspan="3">具有明确的盈利模式</td>
           <td>2</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -972,10 +972,10 @@
           </td>
           <td>1</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -984,10 +984,10 @@
           </td>
           <td>1</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -995,10 +995,10 @@
           <td colspan="3">估值水平、预期收益合理</td>
           <td>1</td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -1014,10 +1014,10 @@
             200亿以上：2
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -1029,10 +1029,10 @@
             收入年增长率70%以上：3
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -1047,10 +1047,10 @@
             退出收益1倍以上：4
           </td>
           <td colspan="2">
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
           <td>
-            <input type="text" class="table-input" disabled/>
+            <input type="text" class="table-input" disabled />
           </td>
         </tr>
         <tr>
@@ -1064,37 +1064,34 @@
         </tr>
       </tbody>
     </table>
-  </div>  
+  </div>
 </template>
  
 <script>
 export default {
   props: {
-    formType: {
-      type: Number,
-      default: 1, //1=立项打分表 2=立项汇总表 3=投决打分表 4=投决汇总表
-    },
-    projectId: {
-      type: String,
-    },
   },
   data() {
     return {
+      formType:""//1=立项打分表 2=立项汇总表 3=投决打分表 4=投决汇总表
     };
   },
   mounted() {},
   created() {
-    
     // this.IdStr=this.$route.params.id;
   },
-  methods: {},
+  methods: {
+    upData(formType){
+      this.formType = parseInt(formType) 
+    }
+  },
 };
 </script>
  
 <style lang="scss" scoped>
 /*表格样式开始*/
 .ss_scoreTable {
-  padding-bottom:50px;
+  padding-bottom: 50px;
   table {
     width: 500px;
     // margin-left: 50px;
@@ -1148,7 +1145,7 @@ export default {
     height: 50px;
   }
   input:disabled {
-    background-color: #fff!important;
+    background-color: #fff !important;
   }
 }
 </style>

ruoyi-ui/src/views/invest/meeting/mark.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <tableForm :formType="formType"></tableForm>
+    <tableForm  ref="tableForm"></tableForm>
   </div>
 </template>
 <script>
@@ -9,8 +9,15 @@ export default {
   components: { tableForm },
   data() {
     return {
-      formType: 1,
+      id:"",
+      formType:""
     };
   },
+  created(){
+    this.id = this.$route.query.id;
+    this.formType = this.$route.query.formType;
+    console.log("this.formType=",this.formType)
+    this.$refs.tableForm.upData( this.formType)
+  }
 };
 </script>

ruoyi-ui/src/views/invest/pool/detail.vue

@@ -96,11 +96,11 @@
         <div v-show="activeName === '0'">
           <el-timeline :reverse="false">
             <el-timeline-item
-              v-for="(activity, index) in activities"
+              v-for="(activity, index) in activeTimeList"
               :key="index"
-              :timestamp="activity.timestamp"
+              :timestamp="activity.createTime"
             >
-              {{ activity.content }}
+              {{activity.createBy}}：创建{{ activity.stageName }}
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -122,13 +122,21 @@
           <tableForm :formType="4" ref="tableForm" :projectId="id"></tableForm>
         </div>
         <div v-show="activeName === '6'">
-          <meetingList :type="'2'" ref="meetingList" :projectId="id"></meetingList>
+          <meetingList
+            :type="'2'"
+            ref="meetingList"
+            :projectId="id"
+          ></meetingList>
         </div>
         <div v-show="activeName === '7'">
           <fileList :type="'2'" ref="fileList" :projectId="id"></fileList>
         </div>
         <div v-show="activeName === '8'">
-          <contractList :type="'2'" ref="contractList" :projectId="id"></contractList>
+          <contractList
+            :type="'2'"
+            ref="contractList"
+            :projectId="id"
+          ></contractList>
         </div>
       </section>
     </section>
@@ -142,7 +150,7 @@ import followList from "../components/followList";
 import meetingList from "../components/meetingList";
 import projectList from "../components/projectList";
 import tableForm from "../components/tableForm";
-import { getPool } from "@/api/invest/pool";
+import { getPool, listProjectPoolId } from "@/api/invest/pool";
 export default {
   name: "investPoolDetail",
   components: {
@@ -156,6 +164,7 @@ export default {
   },
   data() {
     return {
+      activeTimeList:[],
       type: "2",
       id: "",
       active: 0,
@@ -180,6 +189,7 @@ export default {
   created() {
     this.id = this.$route.query.id;
     this.getDetail();
+    this.getListProjectPoolId();
   },
   methods: {
     // 切换tab并且打开新增
@@ -197,6 +207,13 @@ export default {
         this.active = parseInt(response.data.projectStage);
       });
     },
+
+    // 根据项目ID获取项目流转记录
+    getListProjectPoolId() {
+      listProjectPoolId(this.id).then((response) => {
+        this.activeTimeList = response.data;
+      });
+    },
   },
 };
 </script>

ruoyi-ui/src/views/study/gen/index.vue

@@ -113,6 +113,8 @@
           />
         </template>
       </el-table-column>
+      
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <!-- <el-table-column