课题列表分步流程-立项评审结果页面完成

src/views/myTopic/newTopic/index.vue

@@ -22,14 +22,17 @@
           <div>
             <el-form ref="ruleForm" :model="ruleForm" label-width="120px">
               <el-row>
+                <el-col :span="12">
+                  <el-form-item label="课题号" label-width="80px">
+                    <el-input v-model="ruleForm.topicNumber" disabled style="width: 460px" />
+                  </el-form-item>
+                </el-col>
 
-                <el-form-item label="课题号" label-width="80px">
-                  <el-input v-model="ruleForm.topicNumber" disabled style="width: 100%" />
-                </el-form-item>
-
-                <el-form-item label="课题名称" label-width="80px">
-                  <el-input v-model="ruleForm.name" style="width: 100%" />
-                </el-form-item>
+                <el-col :span="12">
+                  <el-form-item label="课题名称" label-width="80px">
+                    <el-input v-model="ruleForm.name" style="width: 460px" />
+                  </el-form-item>
+                </el-col>
 
               </el-row>
               <el-row>
@@ -38,6 +41,7 @@
                     <el-select v-model="ruleForm" placeholder="请选择类型" style="width: 260px">
                       <el-option label="一般课题" value="general" />
                       <el-option label="重点课题" value="key" />
+
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -46,6 +50,7 @@
                     <el-select v-model="ruleForm.identity" placeholder="请选择身份" style="width: 260px">
                       <el-option label="计算机科学教授" value="computer_science_professor" />
                       <el-option label="工程学教授" value="engineering_professor" />
+                      <el-option label="工程学ee授" value="engineering_prowwfessor" />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -197,22 +202,18 @@
                 />
                 <el-table-column min-width="120" align="right">
                   <template slot="header" scope="scope">
-                    <el-button icon="el-icon-plus" size="mini" @click="showForm = true" />
+                    <el-button icon="el-icon-plus" size="mini" @click="tableShowForm = true" />
                     <el-button icon="el-icon-delete" size="mini" @click="deleteItem(scope.$index)" />
                   </template>
                   <template slot-scope="scope">
-                    <el-button icon="el-icon-edit" size="mini" @click="editItem(scope.row, scope.$index)" />
+                    <el-button icon="el-icon-edit" size="mini" @click="tableEditItem(scope.row, scope.$index)" />
                     <el-button icon="el-icon-delete" size="mini" @click="deleteItem(scope.$index)" />
                   </template>
-                  <template slot-scope="scope">
-                    <el-button icon="el-icon-edit" @click="editItem(scope.row, scope.$index)" />
-                    <el-button icon="el-icon-delete" @click="deleteItem(scope.$index)" />
-                  </template>
                 </el-table-column>
               </el-table>
 
               <!-- 弹出表单 -->
-              <el-dialog title="添加课题参加者" :visible.sync="showForm">
+              <el-dialog title="添加课题参加者" :visible.sync="tableShowForm">
                 <el-form :model="formData">
                   <el-form-item label="姓名">
                     <el-input v-model="formData.name" />
@@ -231,8 +232,8 @@
                   </el-form-item>
                 </el-form>
                 <span slot="footer" class="dialog-footer">
-                  <el-button @click="showForm = false">取消</el-button>
-                  <el-button type="primary" @click="addData">确认</el-button>
+                  <el-button @click="tableShowForm = false">取消</el-button>
+                  <el-button type="primary" @click="topicAddData">确认</el-button>
                 </span>
               </el-dialog>
 
@@ -1046,6 +1047,7 @@ export default {
       fifthVisible: false,
       checked: false,
       showForm: false,
+      tableShowForm:false,
       showBtn: true,
       implementationPlan: '',
       content: '',
@@ -1055,7 +1057,14 @@ export default {
         age: '',
         position: '',
         unit: '',
-        specialty: ''
+        specialty: '',
+        nameOfTheAchievement: '',
+        formOfResults: '',
+        signed: '',
+        publishingHouse: '',
+        professionalAndTechnicalPositions: '',
+        researchExpertise: '',
+        contribute: ''
       },
       tableData: [
         // 初始表格数据
@@ -1174,7 +1183,7 @@ export default {
       // 关闭表单
       this.showForm = false
     },
-    addData() {
+    topicAddData() {
       // 将表单数据添加到表格数据中
       this.tableData.push({
         ...this.formData,
@@ -1189,12 +1198,17 @@ export default {
         specialty: ''
       }
       // 关闭表单
-      this.showForm = false
+      this.tableShowForm = false
+    },
+    tableEditItem(item, index) {
+      // 编辑项时，将数据赋值给表单
+      this.formData = { ...item }
+      this.tableShowForm = true
     },
     editItem(item, index) {
       // 编辑项时，将数据赋值给表单
       this.formData = { ...item }
-      this.showForm = true
+      this.ShowForm = true
     },
     mainResearchDeleteItem(index) {
       // 删除项

src/views/projectManagement/allTopics/index.vue

@@ -116,7 +116,8 @@
         <template slot-scope="scope">
           <el-tag
             :type="getTagColor(scope.row.stage)"
-            disable-transitions>{{scope.row.stage}}</el-tag>
+            disable-transitions
+          >{{ scope.row.stage }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column min-width="160" label="状态" prop="status" align="center" :show-overflow-tooltip="true" />
@@ -134,10 +135,10 @@
       <el-table-column min-width="200" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.status === '验收完成' || scope.row.status === '立项评审中'"
             :class="commonField.updateClass"
             :type="commonField.typeParent"
             :size="commonField.size"
-            v-if="scope.row.status === '验收完成' || scope.row.status === '立项评审中'"
           >查看</el-button>
           <el-button
             v-else

src/views/projectManagement/approvalProcess/midProject.vue

@@ -61,7 +61,7 @@
         </div>
       </el-descriptions-item>
     </el-descriptions>
-<!--    <div style="display: flex;justify-content: center">
+    <!--    <div style="display: flex;justify-content: center">
       <el-button type="primary" style="margin-top: 20px" @click="$emit('Approve')">通过中期申请</el-button>
       <el-button type="primary" style="margin-top: 20px" @click="$emit('Reject')">驳回中期申请</el-button>
     </div>-->
@@ -75,7 +75,7 @@ import ElDescriptions from '@/components/descriptionsList/e-desc.vue'
 export default {
   name: 'MidProject',
   components: { ElDescriptions, ElDescriptionsItem },
-/*  emits: ['download', 'Approve', 'Reject'],*/
+  /*  emits: ['download', 'Approve', 'Reject'],*/
   data() {
     return {
       comments: '',

src/views/projectManagement/approvalProcess/projectInitiation.vue

@@ -268,7 +268,7 @@
             <el-button type="primary" style="margin-top: 20px" @click="Reject">驳回</el-button>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="专家列表" name="second" v-if="firstReview ==='立项审批中（立项评审专家指定中）'">
+        <el-tab-pane v-if="firstReview ==='立项审批中（立项评审专家指定中）'" label="专家列表" name="second">
           <div style="display: flex;width: 100%;justify-content: center;margin-top: 15px">
             <p style="margin: 10px 0;font-size: 18px">立项评审专家列表</p>
           </div>
@@ -428,7 +428,7 @@
             </div>
           </el-dialog>
         </el-tab-pane>
-        <el-tab-pane label="立项评审结果" name="third" v-if="firstReview ==='立项审批中（专家立项评审中）'|| firstReview ==='专家立项评审完成'|| firstReview ==='立项评审完成'" >
+        <el-tab-pane v-if="firstReview ==='立项审批中（专家立项评审中）'|| firstReview ==='专家立项评审完成'|| firstReview ==='立项评审完成'" label="立项评审结果" name="third">
           <div>
             <div class="review-content">
               <div style="text-align: center; margin: 20px 0; font-size: 24px; color: #000000">
@@ -584,8 +584,8 @@
             </div>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="项目中期" name="fourth" v-if="secondReview ==='中期申请中'|| secondReview ==='中期评审中'||secondReview === '中期评审完成'" >
-          <MidProject @download="console.log('下载成功')"/>
+        <el-tab-pane v-if="secondReview ==='中期申请中'|| secondReview ==='中期评审中'||secondReview === '中期评审完成'" label="项目中期" name="fourth">
+          <MidProject @download="console.log('下载成功')" />
           <div v-if="secondReview === '中期申请完成'|| secondReview ==='中期评审中'||secondReview === '中期评审完成'">
             <div style="display: flex;width: 100%;justify-content: center;margin-top: 15px">
               <p style="margin: 10px 0;font-size: 18px">管理员评审结果</p>
@@ -601,8 +601,8 @@
           </div>
           <div v-if="buttonSwitch === '中期申请完成'">
             <div style="display: flex;justify-content: center;margin-top: 15px">
-            <el-button type="primary" style="margin-top: 20px" @click="passMidtermApplication">通过中期申请</el-button>
-            <el-button type="primary" style="margin-top: 20px" @click="rejectMidtermApplication">驳回中期申请</el-button>
+              <el-button type="primary" style="margin-top: 20px" @click="passMidtermApplication">通过中期申请</el-button>
+              <el-button type="primary" style="margin-top: 20px" @click="rejectMidtermApplication">驳回中期申请</el-button>
             </div>
           </div>
           <div v-if="buttonSwitch === '中期评审中'">
@@ -617,7 +617,7 @@
             </div>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="项目验收" name="fifth" v-if="thirdReview ==='验收申请中'">
+        <el-tab-pane v-if="thirdReview ==='验收申请中'" label="项目验收" name="fifth">
           <Acceptance />
           <div v-if="buttonSwitch === '开始验收'">
             <div style="display: flex;justify-content: center;margin-top: 15px">
@@ -635,7 +635,7 @@
       >
         返回
       </el-button>
-      <el-backtop target=".page-component__scroll .el-scrollbar__wrap"></el-backtop>
+      <el-backtop target=".page-component__scroll .el-scrollbar__wrap" />
     </div>
   </div>
 </template>