前端

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

@@ -8,6 +8,14 @@ export function listPool(query) {
     params: query
   })
 }
+// 查询阶段列表
+export function listStagePool(query) {
+  return request({
+    url: '/invest/pool/listStage',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询项目池详细
 export function getPool(id) {

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

@@ -759,7 +759,7 @@
           ></fileItem>
         </el-form-item>
         <el-form-item
-          label="参与人"
+          label="通知名单"
           prop="participants"
           class="special-el-form-item public-input-height-2"
         >
@@ -831,7 +831,7 @@
           ></fileItem>
         </el-form-item>
         <el-form-item
-          label="参与人"
+          label="通知名单"
           prop="participants"
           class="special-el-form-item public-input-height-2"
         >

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

@@ -18,7 +18,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="渠道" prop="channel">
+      <el-form-item label="渠道" prop="tProjectChannel.channelName">
         <el-select
           :disabled="type === '2'"
           v-model="form.tProjectChannel.channelName"
@@ -32,14 +32,8 @@
             :label="item.channelName"
             :value="item.id"
           />
+          <el-option label="无" value="-1" />
         </el-select>
-        <!-- <div class="el-input__inner inputSimulation" @click="handleChannelItem">
-          {{
-            form.tProjectChannel && form.tProjectChannel.channelName
-              ? form.tProjectChannel.channelName
-              : "请选择渠道"
-          }}
-        </div> -->
         <!-- <channelItem
           ref="channelItem"
           @getChannelInfo="getChannelInfo"
@@ -622,6 +616,9 @@ export default {
         industry: [{ required: true, trigger: "change", message: "请选择" }],
         investHead: [{ required: true, trigger: "blur", message: "请输入" }],
         bpFile: [{ required: true, validator: validateLogo }],
+        "tProjectChannel.channelName": [
+          { required: true, trigger: "change", message: "请选择" },
+        ],
         // description: [{ required: true, trigger: "blur", message: "请输入" }],
         "tProjectCompany.companyName": [
           { required: true, trigger: "blur", message: "请输入" },
@@ -758,8 +755,8 @@ export default {
         this.form.tProjectChannel.channelName = obj.channelName;
         this.form.tProjectChannel.channelGroup = obj.channelGroup;
       } else {
-        this.form.channel = "";
-        this.form.tProjectChannel.channelName = "";
+        this.form.channel = -1;
+        this.form.tProjectChannel.channelName = "无";
         this.form.tProjectChannel.channelGroup = "";
       }
     },
@@ -779,7 +776,7 @@ export default {
           this.form.tProjectChannel.channelGroup = channeItem.channelGroup;
         } else {
           this.form.tProjectChannel = {
-            channelName: "",
+            channelName: "无",
             channelGroup: "",
           };
         }
@@ -826,6 +823,9 @@ export default {
     /** 提交按钮 */
     submitForm(type) {
       let that = this;
+      if (this.form.channel == "") {
+        this.form.channel = -1;
+      }
       if (type === 1) {
         // 暂存
         if (!this.form.projectName) {

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

@@ -42,6 +42,7 @@
             :label="item.channelName"
             :value="item.id"
           />
+          <el-option label="无" value="-1" />
         </el-select>
       </el-form-item>
       <el-form-item label="所属组别" prop="projectGroup">
@@ -336,7 +337,12 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="项目状态" align="center" prop="projectState" width="120">
+      <el-table-column
+        label="项目状态"
+        align="center"
+        prop="projectState"
+        width="120"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.project_state"
@@ -590,7 +596,7 @@
 </template>
 
 <script>
-import { listPool, delPool, editStage } from "@/api/invest/pool";
+import { listPool, listStagePool, delPool, editStage } from "@/api/invest/pool";
 import { selectByFlowKey } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
 import dueDiligenceList from "./dueDiligenceList";
@@ -707,11 +713,19 @@ export default {
     /** 查询项目池列表 */
     getList() {
       this.loading = true;
-      listPool(this.queryParams).then((response) => {
-        this.poolList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      if (this.stage === "0") {
+        listPool(this.queryParams).then((response) => {
+          this.poolList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else {
+        listStagePool(this.queryParams).then((response) => {
+          this.poolList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
     },
     /** 搜索按钮操作 */
     handleQuery() {

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

@@ -171,7 +171,7 @@
               ></textarea>
             </th>
 
-            <th>投资总监</th>
+            <th>项目负责人</th>
             <th>
               <textarea
                 class="table-textarea"
@@ -682,7 +682,7 @@
               ></textarea>
             </th>
 
-            <th>投资总监</th>
+            <th>项目负责人</th>
             <th>
               <textarea
                 class="table-textarea"
@@ -1156,7 +1156,7 @@
                 disabled
               ></textarea>
             </th>
-            <th>投资总监</th>
+            <th>项目负责人</th>
             <th>
               <textarea
                 class="table-textarea"
@@ -1666,7 +1666,7 @@
                 disabled
               ></textarea>
             </th>
-            <th>投资总监</th>
+            <th>项目负责人</th>
             <th>
               <textarea
                 class="table-textarea"
@@ -2181,7 +2181,7 @@ export default {
         illustrate: null, //说明
         industryAdvantage: null,
         industryAdvantageNote: null,
-        investCommissioner: null, //投资总监
+        investCommissioner: null, //项目负责人
         marketSpace: null, //市场空间
         marketSpaceNote: null,
         meetingId: null, //
@@ -2372,7 +2372,7 @@ export default {
         this.form.projectName = response.data.tProjectPool.projectName;
         // 打分人
         this.form.scoringPerson = this.user.userId;
-        //  投资总监
+        //  项目负责人
         this.form.investCommissioner = response.data.tProjectPool.investHead;
         this.collectForm.investCommissioner =
           response.data.tProjectPool.investHead;

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

@@ -197,7 +197,7 @@
                   ></fileItem>
                 </el-form-item>
                 <el-form-item
-                  label="参与人"
+                  label="通知名单"
                   prop="participants"
                   class="special-el-form-item"
                 >
@@ -270,7 +270,7 @@
                   ></fileItem>
                 </el-form-item>
                 <el-form-item
-                  label="参与人"
+                  label="通知名单"
                   prop="participants"
                   class="special-el-form-item"
                 >

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

@@ -42,6 +42,10 @@
             :label="item.channelName"
             :value="item.id"
           />
+          <el-option
+            label="无"
+            value="-1"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="所属组别" prop="projectGroup">

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

@@ -42,6 +42,10 @@
             :label="item.channelName"
             :value="item.id"
           />
+          <el-option
+            label="无"
+            value="-1"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="所属组别" prop="projectGroup">

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

@@ -42,6 +42,10 @@
             :label="item.channelName"
             :value="item.id"
           />
+          <el-option
+            label="无"
+            value="-1"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="所属组别" prop="projectGroup">

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

@@ -42,6 +42,10 @@
             :label="item.channelName"
             :value="item.id"
           />
+          <el-option
+            label="无"
+            value="-1"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="所属组别" prop="projectGroup">

ruoyi-ui/vue.config.js

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