课程管理-页面修改

src/views/projectManagement/allTopics/index.vue

@@ -3,16 +3,17 @@
     <div class="tableTitle">
       <span>所有课题</span>
     </div>
-    <div>
+    <div class="search">
       <el-form
         v-show="showSearch"
         ref="queryForm"
+        style="padding: 0 0 0 10px"
+        class="formClass"
         :model="queryParams"
         :inline="true"
-        style="margin: 10px 15px -5px 0;"
       >
         <el-form-item label="课题类型" prop="applicationType">
-          <el-select v-model="queryParams.applicationType" clearable size="small" style="width: 120px" filterable>
+          <el-select v-model="queryParams.applicationType" clearable size="small" style="width: 220px" filterable>
             <el-option
               v-for="dict in topicType"
               :key="dict.typeNumber"
@@ -27,7 +28,7 @@
             placeholder="请选择状态"
             clearable
             size="small"
-            style="width: 120px"
+            style="width: 220px"
             filterable
           >
             <el-option
@@ -45,7 +46,7 @@
             clearable
             :maxlength="255"
             size="small"
-            style="width: 390px"
+            style="width: 250px"
           />
         </el-form-item>
         <el-form-item>
@@ -53,6 +54,7 @@
             :class="commonField.queryClass"
             :type="commonField.typePrimary"
             :size="commonField.smallSize"
+            icon="el-icon-search"
             @click="handleQuery"
           >查询
           </el-button>
@@ -60,15 +62,17 @@
             :class="commonField.queryClass"
             :type="commonField.typePrimary"
             :size="commonField.smallSize"
+            icon="el-icon-data-analysis"
             @click="analysisReport"
-          >分析报告
+          >分析
           </el-button>
           <el-button
             :class="commonField.queryClass"
             :type="commonField.typePrimary"
             :size="commonField.smallSize"
+            icon="el-icon-download"
             @click="exportDeclarationSummaryTable"
-          >导出申报汇总表
+          >导出
           </el-button>
         </el-form-item>
       </el-form>
@@ -80,13 +84,6 @@
           {{ scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column min-width="120" label="课程号" prop="courseId" align="center" :show-overflow-tooltip="true" />
-      <el-table-column
-        min-width="220"
-        label="课程名称"
-        prop="courseName"
-        align="center"
-      />
       <el-table-column
         min-width="100"
         label="申报类型"
@@ -94,40 +91,62 @@
         align="center"
         :show-overflow-tooltip="true"
       />
+      <el-table-column min-width="160" label="课程号" prop="courseId" align="center" :show-overflow-tooltip="true" />
       <el-table-column
-        min-width="100"
-        label="负责人姓名"
+        min-width="180"
+        label="申报名称"
+        prop="courseName"
+        align="center"
+      />
+      <el-table-column
+        min-width="80"
+        label="负责人"
         prop="responsiblePersonName"
         align="center"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        min-width="120"
+        min-width="160"
         label="手机号"
         prop="phoneNumber"
         align="center"
         :show-overflow-tooltip="true"
       />
+      <el-table-column min-width="80" label="阶段" prop="stage" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-tag
+            :type="getTagColor(scope.row.stage)"
+            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" />
       <el-table-column
-        min-width="120"
+        min-width="180"
         label="创建时间"
         prop="createTime"
         align="center"
         :show-overflow-tooltip="true"
-      />
-      <el-table-column min-width="80" label="阶段" prop="stage" align="center" :show-overflow-tooltip="true" />
-      <el-table-column min-width="160" label="状态" prop="status" align="center" :show-overflow-tooltip="true" />
-      <el-table-column min-width="120" label="操作" align="center" class-name="small-padding fixed-width">
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column min-width="200" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            :class="commonField.updateClass"
+            :type="commonField.typeParent"
+            :size="commonField.size"
             v-if="scope.row.status === '验收完成' || scope.row.status === '立项评审中'"
-            icon="el-icon-search"
-          />
+          >查看</el-button>
           <el-button
             v-else
-            icon="el-icon-edit-outline"
+            :class="commonField.updateClass"
+            :type="commonField.typeParent"
+            :size="commonField.size"
             @click="projectInitiation(scope.row)"
-          />
+          >编辑
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -373,6 +392,19 @@ export default {
       this.loading = true
       this.loading = false
     },
+    /** 阶段标签颜色操作 */
+    getTagColor(stage) {
+      switch (stage) {
+        case '立项':
+          return ''
+        case '验收':
+          return 'warning'
+        case '结项':
+          return 'success'
+        default:
+          return 'default'
+      }
+    },
     /** 查询按钮操作 */
     handleQuery() {
       this.queryParams.page = 1

src/views/projectManagement/approvalProcess/projectInitiation.vue

@@ -584,23 +584,47 @@
             </div>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="项目中期" name="fourth" v-if="secondReview ==='中期申请中'||secondReview ==='中期评审中'" >
+        <el-tab-pane label="项目中期" name="fourth" v-if="secondReview ==='中期申请中'|| secondReview ==='中期评审中'||secondReview === '中期评审完成'" >
           <MidProject @download="console.log('下载成功')"/>
-          <div v-if="buttonSwitch2 === '中期申请完成'">
+          <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>
+            </div>
+            <el-descriptions column="4">
+              <el-descriptions-item span="4" label="评审结果">
+                <el-select v-model="selectedValue" style="width: 100%">
+                  <el-option label="通过" value="1" />
+                  <el-option label="不通过" value="0" />
+                </el-select>
+              </el-descriptions-item>
+            </el-descriptions>
+          </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>
             </div>
           </div>
-          <div v-if="buttonSwitch2 === '中期评审中'">
+          <div v-if="buttonSwitch === '中期评审中'">
+            <div style="display: flex;justify-content: center;margin-top: 15px">
+              <el-button type="primary" @click="saveMidtermResult">保存中期评审结果</el-button>
+              <el-button type="primary" @click="publishMidtermResult">公布中期评审结果</el-button>
+            </div>
+          </div>
+          <div v-if="buttonSwitch === '开始验收'">
             <div style="display: flex;justify-content: center;margin-top: 15px">
-              <el-button type="primary" @click="saveProjectApprovalResult">保存中期评审结果</el-button>
-              <el-button type="primary" @click="publishProjectApprovalResult">公布中期评审结果</el-button>
+              <el-button type="primary" @click="startAcceptance ">开始验收</el-button>
             </div>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="项目验收" name="fifth" v-if="thirdReview ==='中期评审完成'">
+        <el-tab-pane label="项目验收" name="fifth" v-if="thirdReview ==='验收申请中'">
           <Acceptance />
+          <div v-if="buttonSwitch === '开始验收'">
+            <div style="display: flex;justify-content: center;margin-top: 15px">
+              <el-button type="primary" @click="saveAcceptanceApplication">驳回验收申请</el-button>
+              <el-button type="primary" @click="submitAcceptanceApplication">通过验收申请</el-button>
+            </div>
+          </div>
         </el-tab-pane>
       </el-tabs>
       <el-button
@@ -637,14 +661,13 @@ export default {
       // 通过不通过
       selectedValue: '1',
       // 初审
-      firstReview: '申报完成',
+      firstReview: '立项评审',
       // 中期审核
-      secondReview: '中期评审完成',
+      secondReview: '中期评审',
       // 验收
-      thirdReview: '验收完成',
+      thirdReview: '验收',
       // （初审到中期审核）按钮显示状态
       buttonSwitch: '',
-      buttonSwitch2: '',
       dialogAddExpert: false,
       // 显示搜索条件
       showSearch: true,
@@ -819,20 +842,31 @@ export default {
     // 初审两步骤
     if (this.$route.query.state === '立项审批中') {
       this.state = 1
-      this.active = 2
+      this.active = 1
       this.activeName = 'second'
     }
     if (this.$route.query.state === '立项审核结果') {
       this.state = 1
-      this.active = 2
+      this.active = 1
       this.activeName = 'third'
     }
-    // 中期申请
+    // 中期
     if (this.$route.query.state === '中期申请中') {
       this.state = 1
       this.active = 2
       this.activeName = 'fourth'
     }
+    if (this.$route.query.state === '中期评审完成') {
+      this.state = 1
+      this.active = 2
+      this.activeName = 'fourth'
+    }
+    // 验收
+    if (this.$route.query.state === '验收申请') {
+      this.state = 1
+      this.active = 2
+      this.activeName = 'fifth'
+    }
   },
   methods: {
     goBack() {
@@ -963,25 +997,63 @@ export default {
       this.buttonSwitch = '开始中期评审'
       this.active = 1
     },
+    /** 通过项目中期*/
+    passMidtermApplication() {
+      this.Success()
+      this.buttonSwitch = '中期评审中'
+      this.secondReview = '中期评审中'
+      this.active = 2
+    },
+    /** 驳回项目中期*/
+    rejectMidtermApplication() {
+      this.Success()
+    },
     /** 开始中期评审*/
     startMidTermReview() {
       this.Success()
       this.activeName = 'fourth'
       this.firstReview = '立项评审完成'
       this.secondReview = '中期申请中'
-      this.buttonSwitch2 = '中期申请完成'
+      this.buttonSwitch = '中期申请完成'
       this.active = 2
     },
-    /** 通过项目中期*/
-    passMidtermApplication() {
+    /** 保存中期评审结果*/
+    saveMidtermResult() {
       this.Success()
-      this.buttonSwitch2 = '中期评审中'
       this.secondReview = '中期评审中'
       this.active = 2
     },
-    /** 驳回项目中期*/
-    rejectMidtermApplication() {
+    /** 公布中期评审结果*/
+    publishMidtermResult() {
+      this.successTwo()
+      this.activeName = 'fourth'
+      this.secondReview = '中期评审完成'
+      this.buttonSwitch = '开始验收'
+      this.active = 2
+    },
+    /** 中期评审-开始验收*/
+    startAcceptance() {
+      this.Success()
+      this.activeName = 'fifth'
+      this.secondReview = '中期评审完成'
+      this.thirdReview = '验收申请中'
+      this.active = 3
+    },
+    /** 驳回验收申请*/
+    saveAcceptanceApplication() {
+      this.Success()
+      this.activeName = 'fifth'
+      this.secondReview = '中期评审完成'
+      this.thirdReview = '验收申请中'
+      this.active = 3
+    },
+    /** 通过验收申请*/
+    submitAcceptanceApplication() {
       this.Success()
+      this.activeName = 'fifth'
+      this.secondReview = '中期评审完成'
+      this.thirdReview = '验收申请中'
+      this.active = 3
     },
     /** 勾选专家列表数据*/
     selectionChange(val) {