armg преди 1 година
родител
ревизия
4409f29258
променени са 2 файла, в които са добавени 69 реда и са изтрити 22 реда
  1. 22 12
      ruoyi-ui/src/views/invest/components/tableForm.vue
  2. 47 10
      ruoyi-ui/src/views/invest/pool/detail.vue

+ 22 - 12
ruoyi-ui/src/views/invest/components/tableForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="" v-if="id != '0'">
     <el-form
       class="special-el-form"
       ref="form"
@@ -2032,6 +2032,7 @@
       </el-form-item>
     </el-form>
   </div>
+  <div v-else class="public-flex-center public-padded-t-20">暂无数据</div>
 </template>
  
 <script>
@@ -2040,6 +2041,7 @@ import {
   addScoring,
   getScoring,
   selectMeetingId,
+  
 } from "@/api/invest/meeting";
 export default {
   props: {
@@ -2192,18 +2194,24 @@ export default {
     };
   },
   mounted() {
-    this.getDetail(this.id);
     this.user = this.$store.getters.user;
-    // 汇总表
-    if (this.formType === 2 || this.formType === 4) {
-      this.getSelectMeetingId(this.id);
-    } else if (this.readonly) {
-      // 打分详情
-      this.form = this.$store.getters.tProjectScoring;
-      // this.getScoringList(this.id);
+    if (this.id && this.id != "0") {
+      this.initialize(this.id);
     }
   },
   methods: {
+    initialize(id) {
+      this.id = id;
+      this.getDetail(id);
+      // 汇总表
+      if (this.formType === 2 || this.formType === 4) {
+        this.getSelectMeetingId(id);
+      } else if (this.readonly) {
+        // 打分详情
+        this.form = this.$store.getters.tProjectScoring;
+        // this.getScoringList(id);
+      }
+    },
     // 根据会议ID查询汇总分数和平均分数
     getSelectMeetingId(id) {
       selectMeetingId(id).then((response) => {
@@ -2233,7 +2241,7 @@ export default {
     },
     submitForm() {
       let that = this;
-      console.log("this.form", this.form);
+      // console.log("this.form", this.form);
       this.$refs["form"].validate((valid, rules) => {
         if (valid) {
           addScoring(this.form).then((response) => {
@@ -2274,7 +2282,7 @@ export default {
 }
 ::v-deep .el-input.is-disabled .el-input__inner {
   background-color: #fff !important;
-  color:#606266;
+  color: #606266;
 }
 /*表格样式开始*/
 .ss_scoreTable {
@@ -2295,6 +2303,7 @@ export default {
   //   // border: 1px solid transparent!important;
   // }
   table {
+  // width:80%;
     // width: 600px;
     margin: 0 80px;
     -moz-user-select: none;
@@ -2322,14 +2331,15 @@ export default {
     text-align: left;
   }
   .table-textarea {
+    width: 100%;
     // width: 180px;
-    // width: 15%;
     border: none;
     height: 50px;
     resize: none;
   }
   .table-input {
     width: 100%;
+    // width: 100%;
     // height: 80px;
     border: none;
     font-size: 20px;

+ 47 - 10
ruoyi-ui/src/views/invest/pool/detail.vue

@@ -85,9 +85,9 @@
         <el-tab-pane label="活动" name="0"></el-tab-pane>
         <el-tab-pane label="详细信息" name="1"></el-tab-pane>
         <el-tab-pane label="跟进记录" name="2"></el-tab-pane>
-        <!-- <el-tab-pane label="立项汇总表" name="3"></el-tab-pane> -->
+        <el-tab-pane label="立项汇总表" name="3"></el-tab-pane>
         <el-tab-pane label="尽调报告" name="4"></el-tab-pane>
-        <!-- <el-tab-pane label="投决汇总表" name="5"></el-tab-pane> -->
+        <el-tab-pane label="投决汇总表" name="5"></el-tab-pane>
         <el-tab-pane label="会议记录" name="6"></el-tab-pane>
         <el-tab-pane label="文件资料" name="7"></el-tab-pane>
         <el-tab-pane label="合同" name="8"></el-tab-pane>
@@ -100,7 +100,7 @@
               :key="index"
               :timestamp="activity.createTime"
             >
-              {{ activity.createBy }}:创建{{ activity.stageName }}
+              {{ activity.createBy }}:{{ activity.stageName }}
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -110,9 +110,14 @@
         <div v-show="activeName === '2'">
           <followList :type="'2'" ref="followList" :projectId="id"></followList>
         </div>
-        <!-- <div v-show="activeName === '3'">
-          <tableForm :formType="2" :id="meetingId" ref="tableForm" :projectId="id"></tableForm>
-        </div> -->
+        <div v-show="activeName === '3'">
+          <tableForm
+            :formType="2"
+            :id="meetingId"
+            ref="approvalTableForm"
+            :readonly="true"
+          ></tableForm>
+        </div>
         <div v-show="activeName === '4'">
           <!-- 尽职调查 -->
           <projectList
@@ -122,9 +127,14 @@
             :projectId="id"
           ></projectList>
         </div>
-        <!-- <div v-show="activeName === '5'">
-          <tableForm :formType="4" :id="meetingId" ref="tableForm" :projectId="id"></tableForm>
-        </div> -->
+        <div v-show="activeName === '5'">
+          <tableForm
+            :formType="4"
+            :id="meetingId"
+            ref="voteTableForm"
+            :readonly="true"
+          ></tableForm>
+        </div>
         <div v-show="activeName === '6'">
           <meetingList
             :type="'2'"
@@ -155,6 +165,7 @@ import meetingList from "../components/meetingList";
 import projectList from "../components/projectList";
 import tableForm from "../components/tableForm";
 import { getPool, listProjectPoolId } from "@/api/invest/pool";
+import { listMeeting } from "@/api/invest/meeting";
 export default {
   name: "investPoolDetail",
   components: {
@@ -203,8 +214,34 @@ export default {
       this.$store.commit("SET_PROJECTITEMMESSAGE", this.detailInfo);
       this.$refs[name].handleAdd(this.id);
     },
+    getMettingId(type) {
+      let queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        meetingType: type,
+        orderByColumn: "createTime",
+        isAsc: "desc",
+      };
+      listMeeting(queryParams).then((response) => {
+        let meetingList = response.rows;
+        if (meetingList.length > 0) {
+          let meetingId = meetingList[0].id;
+          if (type === "LX") {
+            this.$refs.approvalTableForm.initialize(meetingId);
+          } else if (type === "TJ") {
+            this.$refs.voteTableForm.initialize(meetingId);
+          }
+        }
+      });
+    },
     handleClick(tab, event) {
-      // console.log(tab, event);
+      if (this.activeName === "0") {
+        this.getListProjectPoolId();
+      } else if (this.activeName === "3") {
+        this.getMettingId("LX");
+      } else if (this.activeName === "5") {
+        this.getMettingId("TJ");
+      }
     },
     getDetail() {
       getPool(this.id).then((response) => {