前端

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

@@ -39,7 +39,7 @@
           />
         </el-select>
       </el-form-item>
-      
+
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker
           style="width: 205px"
@@ -151,20 +151,12 @@
           />
         </template>
       </el-table-column>
-      <el-table-column
-        label="会议开始时间"
-        align="center"
-        prop="startTime"
-      >
+      <el-table-column label="会议开始时间" align="center" prop="startTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="会议结束时间"
-        align="center"
-        prop="endTime"
-      >
+      <el-table-column label="会议结束时间" align="center" prop="endTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -179,6 +171,20 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document-remove"
+            @click="handleMark(scope.row, '1')"
+            >去打分</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="handleLookMark(scope.row, '2')"
+            >查看打分表</el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -481,6 +487,20 @@ export default {
     this.getList();
   },
   methods: {
+    // 去打分
+    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 },
+      });
+    },
     // 选择部门人
     openSelectDept(type) {
       if (type == 2) {
@@ -588,7 +608,7 @@ export default {
         this.form.meetingType = this.meetingType;
       }
       this.open = true;
-      this.title = "添加会议记录";
+      this.title = "添加会议";
       setTimeout(() => {
         that.$refs.fileItems.fileList = [];
       }, 200);
@@ -603,7 +623,7 @@ export default {
         this.form.projectStage = response.data.tProjectPool.projectStage;
         this.form.projectGroup = response.data.tProjectPool.projectGroup;
         this.open = true;
-        this.title = "修改会议记录";
+        this.title = "修改会议";
         setTimeout(() => {
           this.$refs.fileItems.getListFileBusinessId(id);
         }, 200);

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

@@ -386,22 +386,7 @@
             @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"
@@ -750,20 +735,7 @@ 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/meeting/mark.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <tableForm  ref="tableForm"></tableForm>
+    <tableForm  :formType="formType" :id="id"></tableForm>
   </div>
 </template>
 <script>
@@ -10,14 +10,12 @@ export default {
   data() {
     return {
       id:"",
-      formType:""
+      formType:null
     };
   },
   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)
+    this.formType = parseInt(this.$route.query.formType);
   }
 };
 </script>

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

@@ -28,7 +28,7 @@
           type="primary"
           icon="el-icon-plus"
           @click="handleTab('6', 'meetingList')"
-          >新增会议记录</el-button
+          >新增会议</el-button
         >
       </div>
     </section>