Merge remote-tracking branch 'origin/master'

src/views/myTopic/topicList/index.vue

@@ -74,8 +74,12 @@
 
         <el-table-column label="操作" class-name="small-padding fixed-width" width="70">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.state === '验收完成' || scope.row.state === '立项评审中'" icon="el-icon-search" />
-            <el-button v-else icon="el-icon-edit-outline" />
+            <el-button
+              v-if="scope.row.state === '验收完成' || scope.row.state === '立项评审中'"
+              icon="el-icon-search"
+              @click="handleProject(scope.row)"
+            />
+            <el-button v-else icon="el-icon-edit-outline" @click="handleProject(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -99,6 +103,16 @@ export default {
       total: 100,
       loading: false,
       busStudentInfoList: [
+        {
+          topicType: '2024YB01036',
+          topicName: '测试课题190530',
+          declarationType: '一般课题',
+          nameOfThePersonInCharge: '于力',
+          phoneNumber: '15821163326',
+          creationTime: '2024-05-28 10:10',
+          stage: '中期',
+          state: '中期申请中'
+        },
         {
           topicType: '2024YB01033',
           topicName: 'text123456190528',
@@ -262,13 +276,9 @@ export default {
   },
   methods: {
     handleNewProject() {
-      // 先跳转到TabPage页面
-      this.$router.push({ name: 'TabPage', params: { tab: '申报信息' }})
-      // 然后发送事件通知TabPage页面显示月报标签页
-      this.$emit('showMonthlyReport')
       this.$router.push({
         path: '/myTopic/newTopic',
-        query: {}
+        query: { activeTab: 'first' }
       })
     },
     /** 查询按钮操作 */
@@ -276,6 +286,16 @@ export default {
       this.queryParams.page = 1
       this.getList()
     },
+    /** 评审中操作按钮*/
+    handleProject(row) {
+      console.log('row', row)
+      this.$router.push({
+        path: '/myTopic/newTopic',
+        query: {
+          state: row.state
+        }
+      })
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams = {