前端

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

@@ -63,10 +63,10 @@ export function listProjectPoolId(id) {
 
 
 
-// demo获取代办
-export function getNum() {
+// 查询评估考察列表数量 /dev-api/invest/pool/getReviewNumber
+export function getReviewNumber() {
   return request({
-    url: '/invest/getNum',
+    url: '/invest/pool/getReviewNumber',
     method: 'get'
   })
 }

ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -77,5 +77,6 @@ export default {
   margin-left: 5px;
   font-size: 12px;
   font-weight: bold;
+  margin-top: -1px;
 }
 </style>

ruoyi-ui/src/permission.js

@@ -27,6 +27,7 @@ router.beforeEach((to, from, next) => {
           store.dispatch('GenerateRoutes').then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
+            store.dispatch("getReviewNumber"); //初始化评估考察代办数量
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
 
           })

ruoyi-ui/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { getNum } from '@/api/invest/pool'
+import { getReviewNumber } from '@/api/invest/pool'
 
 const user = {
   state: {
@@ -213,25 +213,24 @@ const user = {
       })
     },
 
-    // 更新代办数量并且刷新侧边栏
-    updataNum({ commit, state }) {
-      // this.$store.dispatch("updataNum"); //初始化和操作后更新代办数量
+    // 更新评估考察代办数量
+    getReviewNumber({ commit, state }) {
+      // this.$store.dispatch("getReviewNumber"); //初始化评估考察代办数量
       return new Promise(resolve => {
         // 这里走接口更新代办数量
-        const inspectNum = parseInt(9);//评估考察
-        commit('SET_INSPECTNUM', inspectNum);//更新评估考察代办
-        // getNum().then(res => {
-        //   const inspectNum = parseInt(res.data.inspectNum);//评估考察
-        //   const projectLXNum = parseInt(res.data.projectLXNum);//项目立项
-        //   const dueNum = parseInt(res.data.dueNum);//尽职背调
-        //   const projectTJNum = parseInt(res.data.projectTJNum);//项目投决
-        //   commit('SET_INSPECTNUM', inspectNum);
-        //   commit('SET_PROJECTLXNUM', projectLXNum);
-        //   commit('SET_DUENUM', dueNum);
-        //   commit('SET_PROJECTTJNUM', projectTJNum);
-        //   window.location.reload()
+        // const inspectNum = parseInt(9);//评估考察
+        // commit('SET_INSPECTNUM', inspectNum);//更新评估考察代办
+        getReviewNumber().then(res => {
+          const inspectNum = parseInt(res.data);//评估考察
+          // const projectLXNum = parseInt(res.data.projectLXNum);//项目立项
+          // const dueNum = parseInt(res.data.dueNum);//尽职背调
+          // const projectTJNum = parseInt(res.data.projectTJNum);//项目投决
+          commit('SET_INSPECTNUM', inspectNum);
+          // commit('SET_PROJECTLXNUM', projectLXNum);
+          // commit('SET_DUENUM', dueNum);
+          // commit('SET_PROJECTTJNUM', projectTJNum);
 
-        // })
+        })
       })
     }
 

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

@@ -148,7 +148,7 @@ export default {
     },
     // 修改业务节点
     handleBusinessUpdate(row) {
-    //   console.log("row=", row);
+      //   console.log("row=", row);
       this.projectStage_org = row.projectStage;
       this.projectState_org = row.projectState;
       this.reset();
@@ -194,6 +194,15 @@ export default {
             that.$modal.msgSuccess("修改成功");
             that.open = false;
           } else {
+            if (this.projectStage_org !== this.form.projectStage) {
+              if (this.form.stageName === "项目立项") {
+                this.form.approvalFlag = "0";
+              } else if (this.form.stageName === "尽职背调") {
+                this.form.investigateFlag = "0";
+              } else if (this.form.stageName === "项目投决") {
+                this.form.decisionFlag = "0";
+              }
+            }
             editStage(this.form).then((response) => {
               that.$modal.msgSuccess("修改成功");
               that.open = false;

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

@@ -110,11 +110,11 @@
         <el-table-column
           label="打分人"
           align="center"
-          prop="investCommissioner"
+          prop="createBy"
         >
           <template slot-scope="scope">
-            <div :title="scope.row.investCommissioner">
-              {{ scope.row.investCommissioner }}
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
             </div>
           </template>
         </el-table-column>
@@ -655,7 +655,7 @@
           </tr>
         </tbody>
       </table>
-      <table v-if="formType === 2" border="1" cellpadding="0" cellspacing="0">
+      <table v-if="formType === 2" border="1" cellpadding="0" cellspacing="0" class="allScoring">
         <thead>
           <tr>
             <th colspan="10" class="bg-blue">项目立项评估评审汇总表</th>
@@ -829,8 +829,8 @@
               <input
                 autocomplete="off"
                 type="text"
-                v-model="collectForm.teamExperienceAvg"
-                name="teamExperienceAvg"
+                v-model="collectForm.teamBackgroundAvg"
+                name="teamBackgroundAvg"
                 class="table-input"
                 disabled
               />
@@ -1634,7 +1634,7 @@
           </tr>
         </tbody>
       </table>
-      <table v-if="formType === 4" border="1" cellpadding="0" cellspacing="0">
+      <table v-if="formType === 4" border="1" cellpadding="0" cellspacing="0" class="allScoring">
         <thead>
           <tr>
             <th colspan="10" class="bg-blue">项目投决会评估评审汇总表</th>
@@ -1808,8 +1808,8 @@
               <input
                 autocomplete="off"
                 type="text"
-                v-model="collectForm.teamExperienceAvg"
-                name="teamExperienceAvg"
+                v-model="collectForm.teamBackgroundAvg"
+                name="teamBackgroundAvg"
                 class="table-input"
                 disabled
               />
@@ -2486,7 +2486,7 @@ export default {
     font-size: 20px;
     font-weight: bold;
     text-align: center;
-    // margin-top: 20px;
+     margin-top: 20px;
   }
   .bg-blue,
   .specificTr > th:nth-child(2n-1) {
@@ -2517,4 +2517,9 @@ export default {
 .tableWrapper {
   margin: 20px 0;
 }
+.allScoring{
+    .table-input{
+      margin-top:0px !important;
+    }
+}
 </style>

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

@@ -67,10 +67,22 @@
         <el-step title="投后"></el-step>
       </el-steps>
       <el-divider></el-divider>
-      <div class="public-flex-between basicsInfo" v-if="detailInfo.projectState != '1'">
+      <div
+        class="public-flex-between basicsInfo"
+        v-if="detailInfo.projectState != '1'"
+      >
         <div class="public-flex-center-column">
           <div>项目公司名称</div>
-          <p style="width:250px;text-align:center;" class="yichu1" v-if="detailInfo.tProjectCompany && detailInfo.tProjectCompany.companyName">{{ detailInfo.tProjectCompany.companyName }}</p>
+          <p
+            style="width: 250px; text-align: center"
+            class="yichu1"
+            v-if="
+              detailInfo.tProjectCompany &&
+              detailInfo.tProjectCompany.companyName
+            "
+          >
+            {{ detailInfo.tProjectCompany.companyName }}
+          </p>
         </div>
         <div class="public-flex-center-column">
           <div>渠道</div>
@@ -138,7 +150,7 @@
         <div v-if="activeName === '2'">
           <followList :type="'2'" ref="followList" :projectId="id"></followList>
         </div>
-        <div v-if="activeName === '3'" class="public-padded-20">
+        <div v-if="activeName === '3'" class="public-padded-20 detail-meeting">
           <el-tabs type="border-card">
             <el-tab-pane label="项目立项申请表">
               <el-form
@@ -224,7 +236,7 @@
             @changeShowDueApply="changeShowDueApply"
           ></dueDiligenceList>
         </div>
-        <div v-if="activeName === '5'" class="public-padded-20">
+        <div v-if="activeName === '5'" class="public-padded-20 detail-meeting">
           <el-tabs type="border-card">
             <el-tab-pane label="项目投决申请表">
               <el-form
@@ -631,4 +643,5 @@ export default {
   padding: 5px 10px;
   margin-left: 10px;
 }
+
 </style>

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

@@ -213,7 +213,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"
@@ -493,16 +498,32 @@ export default {
             type: "error",
           });
         } else if (type === 8) {
-          // 立项-去打分  判断此时要不要去打分
-          // this.$refs.meetingList.handleMark(row, "1", false);
-          if (row.investHead === this.user.nickName) {
-            this.$message({
-              message: "请先发起立项会议",
-              duration: 1500,
-              type: "warning",
-            });
+          // 有立项会议
+          if (row.tProjectMeeting) {
+            // 参与人
+            if (
+              row.tProjectMeeting.participants.indexOf(this.user.nickName) > -1
+            ) {
+              // 是否打过分
+              if (row.tProjectScoring) {
+                this.$message.warning("您已打分,无需重复操作");
+              } else {
+                // 立项-去打分
+                this.$refs.meetingList.handleMark(row.tProjectMeeting, "1", false);
+              }
+            } else {
+              this.$message.warning("无权限");
+            }
           } else {
-            this.$message.warning("无权限");
+            if (row.investHead === this.user.nickName) {
+              this.$message({
+                message: "请先发起立项会议",
+                duration: 1500,
+                type: "warning",
+              });
+            } else {
+              this.$message.warning("无权限");
+            }
           }
         } else if (row.investHead === this.user.nickName) {
           // 项目负责人

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

@@ -213,7 +213,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"
@@ -492,16 +497,36 @@ export default {
             type: "error",
           });
         } else if (type === 13) {
-          // 投决-去打分  判断此刻能不能去打分
-          // this.$refs.meetingList.handleMark(row, "3", false);
-          if (row.investHead === this.user.nickName) {
-            this.$message({
-              message: "请先发起投决会议",
-              duration: 1500,
-              type: "warning",
-            });
+          // 有立项会议
+          if (row.tProjectMeeting) {
+            // 参与人
+            if (
+              row.tProjectMeeting.participants.indexOf(this.user.nickName) > -1
+            ) {
+              // 是否打过分
+              if (row.tProjectScoring) {
+                this.$message.warning("您已打分,无需重复操作");
+              } else {
+                // 投决-去打分 
+                this.$refs.meetingList.handleMark(
+                  row.tProjectMeeting,
+                  "3",
+                  false
+                );
+              }
+            } else {
+              this.$message.warning("无权限");
+            }
           } else {
-            this.$message.warning("无权限");
+            if (row.investHead === this.user.nickName) {
+              this.$message({
+                message: "请先发起投决会议",
+                duration: 1500,
+                type: "warning",
+              });
+            } else {
+              this.$message.warning("无权限");
+            }
           }
         } else if (row.investHead === this.user.nickName) {
           if (type === 2) {

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]: ''