armg 1 year ago
parent
commit
0cc714e0b1

+ 1 - 1
ruoyi-ui/src/views/invest/components/channelItem.vue

@@ -91,7 +91,7 @@ export default {
       });
     },
     submit() {
-      console.log("确定", this.ids);
+    //   console.log("确定", this.ids);
       this.$emit("getChannelInfo", this.ids);
       this.showChannelItem = false;
     },

+ 43 - 15
ruoyi-ui/src/views/invest/components/contractList.vue

@@ -33,14 +33,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="会议编号" prop="meetingCode">
+      <!-- <el-form-item label="会议编号" prop="fileBusinessId">
         <el-input
-          v-model="queryParams.meetingCode"
+          v-model="queryParams.fileBusinessId"
           placeholder="请输入会议编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -116,10 +116,23 @@
       <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="contractName" />
-      <el-table-column label="合同类别" align="center" prop="contractType" />
-      <el-table-column label="项目ID" align="center" prop="projectPoolId" />
-      <el-table-column label="项目阶段" align="center" prop="projectStage" />
-      <el-table-column label="会议编号" align="center" prop="meetingCode" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="tProjectPool.projectName"
+      />
+      <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="contractType">
+        
+      </el-table-column> -->
+      <!-- <el-table-column label="会议编号" align="center" prop="fileBusinessId" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -175,6 +188,7 @@
           <div
             class="el-input__inner inputSimulation"
             @click="handleProjectItem"
+            :class="{ show_disabled: pageType === '1' }"
           >
             {{ form.projectName ? form.projectName : "请选择项目" }}
           </div>
@@ -198,7 +212,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="会议编号" prop="meetingCode">
+        <!-- <el-form-item label="会议编号" prop="fileBusinessId">
           <div
             class="el-input__inner inputSimulation"
             @click="handleMeetingItem"
@@ -209,7 +223,7 @@
             ref="meetingItem"
             @getMeetingInfo="getMeetingInfo"
           ></meetingItem>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="文件" prop="listFile">
           <fileItem
             ref="fileItems"
@@ -252,6 +266,9 @@ export default {
       type: String,
       default: "1", //1=显示全部列表  2=显示某项目下的详情列表
     },
+    projectId: {
+      type: String,
+    },
   },
   dicts: ["project_stage"],
   components: { projectItem, fileItem, meetingItem },
@@ -264,6 +281,7 @@ export default {
       }
     };
     return {
+      pageType: null,
       fileList: [],
       // 遮罩层
       loading: true,
@@ -291,7 +309,7 @@ export default {
         contractType: null,
         projectPoolId: null,
         projectStage: null,
-        meetingCode: null,
+        fileBusinessId: null,
       },
       // 表单参数
       form: {
@@ -301,7 +319,6 @@ export default {
         projectPoolId: null,
         projectName: null,
         projectStage: null,
-        meetingCode: null,
         meetingTheme: null,
         delFlag: null,
         fileBusinessId: null,
@@ -323,6 +340,9 @@ export default {
     };
   },
   created() {
+    if (this.projectId) {
+      this.queryParams.projectPoolId = this.projectId;
+    }
     this.getList();
   },
   methods: {
@@ -339,9 +359,8 @@ export default {
     },
     // 获取会议信息
     getMeetingInfo(info) {
-      this.form.meetingCode = info[0].meetingCode;
+      this.form.fileBusinessId = info[0].id;
       this.form.meetingTheme = info[0].meetingTheme;
-      // console.log("会议this.form=", this.form);
     },
     handleMeetingItem() {
       this.$refs.meetingItem.showMeetingItem = true;
@@ -373,7 +392,6 @@ export default {
         projectPoolId: null,
         projectName: null,
         projectStage: null,
-        meetingCode: null,
         meetingTheme: null,
         delFlag: null,
         fileBusinessId: null,
@@ -403,9 +421,16 @@ export default {
       this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(projectId) {
       let that = this;
       this.reset();
+      if (projectId && typeof projectId === "string") {
+        this.pageType = "1";
+        let projectItemMessage = this.$store.getters.projectItemMessage;
+        this.form.projectPoolId = projectItemMessage.id;
+        this.form.projectName = projectItemMessage.projectName;
+        this.form.projectStage = projectItemMessage.projectStage;
+      }
       this.open = true;
       this.title = "添加合同管理";
       setTimeout(() => {
@@ -418,6 +443,9 @@ export default {
       const id = row.id || this.ids;
       getContract(id).then((response) => {
         this.form = response.data;
+        this.form.projectName = response.data.tProjectPool.projectName;
+        this.form.projectStage = response.data.tProjectPool.projectStage;
+        this.form.projectGroup = response.data.tProjectPool.projectGroup;
         this.open = true;
         this.title = "修改合同管理";
       });

+ 1 - 5
ruoyi-ui/src/views/invest/components/fileItem.vue

@@ -22,10 +22,6 @@ import { getToken } from "@/utils/auth";
 import { listFileBusinessId, delFile } from "@/api/system/file";
 export default {
   props: {
-    id: {
-      type: String,
-      default: "0",
-    },
   },
   data() {
     return {
@@ -37,7 +33,7 @@ export default {
     };
   },
   mounted() {
-    console.log("----附件组件", this.id);
+    console.log("======文件组件")
     if (this.id) {
       this.getListFileBusinessId(this.id);
     }

+ 45 - 15
ruoyi-ui/src/views/invest/components/fileList.vue

@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
+
       <el-form-item>
         <el-button
           type="primary"
@@ -99,11 +99,30 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
+      <!-- <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" />
-      <el-table-column label="项目阶段" align="center" prop="projectStage" />
-      <el-table-column label="会议编号" align="center" prop="meetingCode" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="tProjectPool.projectName"
+      />
+      <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="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"
@@ -170,6 +189,7 @@
           <div
             class="el-input__inner inputSimulation"
             @click="handleProjectItem"
+            :class="{ show_disabled: pageType === '1' }"
           >
             {{ form.projectName ? form.projectName : "请选择项目" }}
           </div>
@@ -188,7 +208,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="会议编号" prop="meetingCode">
+        <!-- <el-form-item label="会议编号" prop="fileBusinessId">
           <div
             class="el-input__inner inputSimulation"
             @click="handleMeetingItem"
@@ -199,7 +219,7 @@
             ref="meetingItem"
             @getMeetingInfo="getMeetingInfo"
           ></meetingItem>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="文件" prop="listFile">
           <fileItem
             ref="fileItems"
@@ -241,9 +261,12 @@ export default {
       type: String,
       default: "1", //1=显示全部列表  2=显示某项目下的详情列表
     },
+    projectId: {
+      type: String,
+    },
   },
   components: { projectItem, fileItem, meetingItem },
-  dicts: ["file_type"],
+  dicts: ["file_type", "project_stage"],
   data() {
     const validateLogo = (rule, value, callback) => {
       if (this.fileList.length <= 0) {
@@ -253,6 +276,7 @@ export default {
       }
     };
     return {
+      pageType: null,
       id: "",
       fileList: [],
       // 遮罩层
@@ -280,7 +304,7 @@ export default {
         fileName: null,
         fileType: null,
         projectStage: null,
-        meetingCode: null,
+        fileBusinessId: null,
       },
       // 表单参数
       form: {
@@ -290,7 +314,6 @@ export default {
         projectPoolId: null,
         projectName: null,
         projectStage: null,
-        meetingCode: null,
         meetingTheme: null,
         fileBusinessId: null,
         delFlag: null,
@@ -311,6 +334,9 @@ export default {
     };
   },
   created() {
+    if (this.projectId) {
+      this.queryParams.projectPoolId = this.projectId;
+    }
     this.getList();
   },
   methods: {
@@ -320,7 +346,6 @@ export default {
       this.form.projectName = info[0].projectName;
       this.form.projectStage = info[0].projectStage;
       this.form.projectState = info[0].projectState;
-      console.log("获取公司信息",this.form)
     },
     //展示人员
     handleProjectItem() {
@@ -328,8 +353,7 @@ export default {
     },
     // 获取会议信息
     getMeetingInfo(info) {
-      console.log("会议info=", info);
-      this.form.meetingCode = info[0].meetingCode;
+      this.form.fileBusinessId = info[0].id;
       this.form.meetingTheme = info[0].meetingTheme;
     },
     handleMeetingItem() {
@@ -362,7 +386,6 @@ export default {
         projectPoolId: null,
         projectName: null,
         projectStage: null,
-        meetingCode: null,
         meetingTheme: null,
         fileBusinessId: null,
         delFlag: null,
@@ -392,9 +415,16 @@ export default {
       this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(projectId) {
       let that = this;
       this.reset();
+      if (projectId && typeof projectId === "string") {
+        this.pageType = "1";
+        let projectItemMessage = this.$store.getters.projectItemMessage;
+        this.form.projectPoolId = projectItemMessage.id;
+        this.form.projectName = projectItemMessage.projectName;
+        this.form.projectStage = projectItemMessage.projectStage;
+      }
       this.open = true;
       this.title = "添加文件资料";
       setTimeout(() => {

+ 10 - 3
ruoyi-ui/src/views/invest/components/followList.vue

@@ -311,6 +311,9 @@ export default {
       type: String,
       default: "1", //1=显示全部列表  2=显示某项目下的详情列表
     },
+    projectId: {
+      type: String,
+    },
   },
   dicts: ["up_way", "project_stage"],
   components: { projectItem, fileItem, selecDept },
@@ -397,6 +400,9 @@ export default {
       this.pageType = this.$route.query.type;
       this.handleAdd();
     }
+    if (this.projectId) {
+      this.queryParams.projectId = this.projectId;
+    }
     this.getList();
   },
   methods: {
@@ -416,7 +422,6 @@ export default {
       // 联系人
       this.form.contacts = info[0].tProjectContacts.name;
       // this.form.projectState = info[0].tProjectContacts;
-      console.log("this.form=", this.form);
     },
     //展示人员
     handleProjectItem() {
@@ -479,13 +484,15 @@ export default {
       this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(projectId) {
       let that = this;
       this.reset();
       // 直接绑定好项目
+      if (projectId && typeof projectId === "string" ) {
+        this.pageType = "1";
+      }
       if (this.pageType === "1") {
         let projectItemMessage = this.$store.getters.projectItemMessage;
-        console.log("projectItemMessage==", projectItemMessage);
         this.form.projectId = projectItemMessage.id;
         this.form.projectName = projectItemMessage.projectName;
         this.form.projectStage = projectItemMessage.projectStage;

+ 1 - 1
ruoyi-ui/src/views/invest/components/meetingItem.vue

@@ -109,7 +109,7 @@ export default {
       });
     },
     submit() {
-      console.log("确定", this.ids);
+      // console.log("确定", this.ids);
       this.$emit("getMeetingInfo", this.ids);
       this.showMeetingItem = false;
     },

+ 25 - 7
ruoyi-ui/src/views/invest/components/meetingList.vue

@@ -118,10 +118,22 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
+      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="会议主题" align="center" prop="meetingTheme" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="tProjectPool.projectName"
+      />
       <el-table-column label="会议编号" align="center" prop="meetingCode" />
-      <el-table-column label="类别" align="center" prop="meetingType" />
+      <el-table-column label="会议类别" align="center" prop="meetingType">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.meeting_type"
+            :value="scope.row.meetingType"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="会议开始时间"
         align="center"
@@ -203,7 +215,7 @@
           <el-select
             v-model="form.meetingType"
             placeholder="请选择会议类别"
-            :disabled="pageType === '1'"
+            :disabled="pageType === '1' && meetingType != null"
           >
             <el-option
               v-for="dict in dict.type.meeting_type"
@@ -337,6 +349,9 @@ export default {
       type: String,
       default: "1", //1=显示全部列表  2=显示某项目下的详情列表
     },
+    projectId: {
+      type: String,
+    },
   },
   dicts: ["meeting_type", "project_stage", "project_group"],
   components: { projectItem, selecDept, fileItem },
@@ -443,6 +458,9 @@ export default {
       this.pageType = this.$route.query.type;
       this.handleAdd();
     }
+    if (this.projectId) {
+      this.queryParams.projectPoolId = this.projectId;
+    }
     this.getList();
   },
   methods: {
@@ -455,12 +473,10 @@ export default {
       }
     },
     getDeptUserInfo(info) {
-      console.log("会议发起人", info);
       this.form.promoter = info[0].nickName;
     },
     // 多选人
     getDeptMoreUserInfo(info) {
-      console.log("====会议参与人", info);
       let peoList = [];
       for (let i in info) {
         peoList.push(info[i].nickName);
@@ -479,7 +495,6 @@ export default {
       this.form.projectStage = info[0].projectStage;
       this.form.projectGroup = info[0].projectGroup;
       this.form.projectState = info[0].projectState;
-      console.log("this.form=", this.form);
     },
     //展示人员
     handleProjectItem() {
@@ -541,9 +556,12 @@ export default {
       this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(projectId) {
       let that = this;
       this.reset();
+      if (projectId && typeof projectId === "string") {
+        this.pageType = "1";
+      }
       // 直接绑定好项目
       if (this.pageType === "1") {
         let projectItemMessage = this.$store.getters.projectItemMessage;

+ 18 - 4
ruoyi-ui/src/views/invest/components/poolForm.vue

@@ -62,7 +62,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="投资负责人" prop="investHead">
-        <el-input v-model="form.investHead" placeholder="请输入投资负责人" />
+        <div class="el-input__inner inputSimulation" @click="openSelectDept">
+          {{ form.investHead ? form.investHead : "请选择投资负责人" }}
+        </div>
+        <selecDept
+          ref="selecDepts"
+          @getDeptUserInfo="getDeptUserInfo"
+          :deptId="deptId"
+        ></selecDept>
       </el-form-item>
 
       <el-form-item
@@ -275,6 +282,7 @@ import {
 } from "@/api/invest/pool";
 import fileItem from "./fileItem";
 import channelItem from "./channelItem";
+import selecDept from "../components/selecDept";
 export default {
   props: {
     id: {
@@ -285,10 +293,11 @@ export default {
       default: "1", //1可编辑  2不可编辑
     },
   },
-  components: { fileItem, channelItem },
+  components: { fileItem, channelItem, selecDept },
   dicts: ["CUSTOMER_TRADE", "project_group"],
   data() {
     return {
+      deptId: "",
       title: "新增项目",
       baseUrl: process.env.VUE_APP_BASE_API,
 
@@ -442,13 +451,18 @@ export default {
     }
   },
   methods: {
+    // 选择部门人
+    openSelectDept() {
+      this.$refs.selecDepts.show();
+    },
+    getDeptUserInfo(info) {
+      this.form.investHead = info[0].nickName;
+    },
     // 获取渠道信息
     getChannelInfo(info) {
-      console.log("获取渠道信息", info);
       this.form.channel = info[0].id;
       this.form.tProjectChannel.channelName = info[0].channelName;
       this.form.tProjectChannel.channelGroup = info[0].channelGroup;
-      console.log("选完后的form=", this.form);
     },
     handleChannelItem() {
       this.$refs.channelItem.showChannelItem = true;

+ 1 - 1
ruoyi-ui/src/views/invest/components/projectItem.vue

@@ -110,7 +110,7 @@ export default {
       });
     },
     submit() {
-      console.log("确定", this.ids);
+      // console.log("确定", this.ids);
       this.$emit("getProjectInfo", this.ids);
       this.showProjectItem = false;
     },

+ 30 - 11
ruoyi-ui/src/views/invest/components/projectList.vue

@@ -243,7 +243,14 @@
       <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" />
+       <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
@@ -340,7 +347,7 @@
             size="mini"
             type="text"
             icon="el-icon-chat-line-round"
-            @click="handleMeeting(scope.row,'LX')"
+            @click="handleMeeting(scope.row, 'LX')"
             >发起立项会议</el-button
           >
           <el-button
@@ -356,7 +363,7 @@
             size="mini"
             type="text"
             icon="el-icon-chat-line-square"
-            @click="handleMeeting(scope.row,'TJ')"
+            @click="handleMeeting(scope.row, 'TJ')"
             >发起投决会议</el-button
           >
           <el-button
@@ -455,6 +462,9 @@ export default {
       type: String,
       default: "0", //0=全部 1=项目报备  2=评估考察 3=项目立项 4=尽职背调 5=项目投决
     },
+    projectId: {
+      type: String,
+    },
   },
   dicts: ["project_group", "project_stage"],
   data() {
@@ -560,6 +570,7 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        id: null,
         pageNum: 1,
         pageSize: 10,
         projectName: null,
@@ -586,6 +597,7 @@ export default {
         projectState: null,
       },
       form: {
+        id: null,
         projectStage: "",
         projectState: "",
         stageName: "",
@@ -597,6 +609,10 @@ export default {
     if (this.stage != "0") {
       this.queryParams.projectStage = this.stage;
     }
+    if (this.projectId) {
+      this.queryParams.id = this.projectId;
+    }
+
     this.getList();
   },
   activated() {
@@ -609,7 +625,6 @@ export default {
   methods: {
     // 下拉框改变
     handleProjectSelect(index, dict) {
-      console.log("dict=", dict);
       this.form.projectState = null;
       this.project_state = this.projectState[index];
       if (dict && dict.label) {
@@ -665,18 +680,22 @@ export default {
       this.title = "设置项目阶段";
     },
     // 发起会议
-    handleMeeting(row,meetingType){
+    handleMeeting(row, meetingType) {
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);
-      this.$router.push({ path: "/resource/meeting", query: { id: row.id,type:'1',meetingType:meetingType} });
+      this.$router.push({
+        path: "/resource/meeting",
+        query: { id: row.id, type: "1", meetingType: meetingType },
+      });
     },
     // 发起尽调申请
-    handleSurvey(row){
-
-    },
+    handleSurvey(row) {},
     // 上传跟进记录
-    handlefollowRecord(row){
+    handlefollowRecord(row) {
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);
-      this.$router.push({ path: "/resource/record", query: { id: row.id,type:'1' } });
+      this.$router.push({
+        path: "/resource/record",
+        query: { id: row.id, type: "1" },
+      });
     },
     // 表单重置
     reset() {

+ 6 - 6
ruoyi-ui/src/views/invest/components/selecDept.vue

@@ -126,11 +126,11 @@ export default {
     isSolo: {
       type: Boolean,
       default: true,
-    }
+    },
   },
   data() {
     return {
-      type:1,
+      type: 1,
       // 遮罩层
       visible: false,
       // 选中数组值
@@ -153,7 +153,9 @@ export default {
     // 显示弹框
     show(type) {
       this.queryParams.deptId = this.deptId;
-      this.type = type;
+      if (type) {
+        this.type = type;
+      }
       this.getList();
       this.visible = true;
     },
@@ -162,7 +164,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log("多选框选中数据",selection)
+      // console.log("多选框选中数据",selection)
       if (this.type == 1) {
         if (selection.length > 1) {
           this.$modal.msg("只能选择一个跟进人");
@@ -200,10 +202,8 @@ export default {
     },
     /** 选择用户操作 */
     handleSelectUser() {
-      console.log("handleSelectUser===this.type=",this.type)
       const deptId = this.queryParams.deptId;
       if (this.type === 2) {
-        console.log("222222222")
         this.$emit("getDeptMoreUserInfo", this.ids);
       } else {
         this.$emit("getDeptUserInfo", this.ids);

+ 3 - 0
ruoyi-ui/src/views/invest/components/tableForm.vue

@@ -1074,6 +1074,9 @@ export default {
       type: Number,
       default: 1, //1=立项打分表 2=立项汇总表 3=投决打分表 4=投决汇总表
     },
+    projectId: {
+      type: String,
+    },
   },
   data() {
     return {

+ 1 - 1
ruoyi-ui/src/views/invest/contract/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 合同 -->
-    <contractList :type="type"></contractList>
+    <contractList :type="type" id=""></contractList>
   </div>
 </template>
 

+ 1 - 1
ruoyi-ui/src/views/invest/information/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <fileList :type="type"></fileList>
+    <fileList :type="type" id=""></fileList>
   </div>
 </template>
 

+ 1 - 1
ruoyi-ui/src/views/invest/meeting/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <meetingList :type="type"></meetingList>
+    <meetingList :type="type"  id=""></meetingList>
   </div>
 </template>
 

+ 46 - 12
ruoyi-ui/src/views/invest/pool/detail.vue

@@ -6,10 +6,30 @@
         <p>{{ detailInfo.projectName }}</p>
       </div>
       <div>
-        <el-button type="primary" icon="el-icon-upload2">上传资料</el-button>
-        <el-button type="primary" icon="el-icon-upload2">上传合同</el-button>
-        <el-button type="primary" icon="el-icon-plus">跟进记录</el-button>
-        <el-button type="primary" icon="el-icon-plus">会议记录</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-upload2"
+          @click="handleTab('7', 'fileList')"
+          >上传文件资料</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-upload2"
+          @click="handleTab('8', 'contractList')"
+          >上传合同</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleTab('2', 'followList')"
+          >新增跟进记录</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleTab('6', 'meetingList')"
+          >新增会议记录</el-button
+        >
       </div>
     </section>
     <el-divider></el-divider>
@@ -37,7 +57,14 @@
         </div>
         <div class="public-flex-center-column">
           <div>渠道</div>
-          <p>{{ detailInfo.channel }}</p>
+          <p
+            v-if="
+              detailInfo.tProjectChannel &&
+              detailInfo.tProjectChannel.channelName
+            "
+          >
+            {{ detailInfo.tProjectChannel.channelName }}
+          </p>
         </div>
         <div class="public-flex-center-column">
           <div>投资负责人</div>
@@ -81,26 +108,27 @@
           <poolForm :type="type" :id="id"></poolForm>
         </div>
         <div v-show="activeName === '2'">
-          <followList :type="'2'"></followList>
+          <followList :type="'2'" ref="followList" :projectId="id"></followList>
         </div>
         <div v-show="activeName === '3'">
-          <tableForm :formType="2"></tableForm>
+          <tableForm :formType="2" ref="tableForm" :projectId="id"></tableForm>
         </div>
         <div v-show="activeName === '4'">
+          还没写
           <!-- 尽职调查 -->
-          <projectList :type="'2'" :stage="'4'"></projectList>
+          <!-- <projectList :type="'2'" :stage="'4'" ref="projectList" :projectId="id"></projectList> -->
         </div>
         <div v-show="activeName === '5'">
-          <tableForm :formType="4"></tableForm>
+          <tableForm :formType="4" ref="tableForm" :projectId="id"></tableForm>
         </div>
         <div v-show="activeName === '6'">
-          <meetingList :type="'2'"></meetingList>
+          <meetingList :type="'2'" ref="meetingList" :projectId="id"></meetingList>
         </div>
         <div v-show="activeName === '7'">
-          <fileList :type="'2'"></fileList>
+          <fileList :type="'2'" ref="fileList" :projectId="id"></fileList>
         </div>
         <div v-show="activeName === '8'">
-          <contractList :type="'2'"></contractList>
+          <contractList :type="'2'" ref="contractList" :projectId="id"></contractList>
         </div>
       </section>
     </section>
@@ -154,6 +182,12 @@ export default {
     this.getDetail();
   },
   methods: {
+    // 切换tab并且打开新增
+    handleTab(activeName, name) {
+      this.activeName = activeName.toString();
+      this.$store.commit("SET_PROJECTITEMMESSAGE", this.detailInfo);
+      this.$refs[name].handleAdd(this.id);
+    },
     handleClick(tab, event) {
       console.log(tab, event);
     },

+ 1 - 1
ruoyi-ui/src/views/invest/record/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <followList :type="type"></followList>
+    <followList :type="type" id=""></followList>
   </div>
 </template>