33

src/views/evaluation/talent/components/score.vue

@@ -13,7 +13,7 @@
             <div style="height:calc(100% - 40px);overflow: auto;" ref="main">
               <div class="x_modal_content">
                 <a-form-model ref="form" :model="formData" :rules="rules" class="from-table font-line-space">
-                  <score-edit v-model="formData" />
+                  <edit v-model="formData" />
                 </a-form-model>
               </div>
             </div>
@@ -24,7 +24,7 @@
             </div>
           </div>
           <div v-show="tabsActive==='2'" style="height:100%;overflow: auto;">
-            <project-info v-model="projectInfo" :tabsData.sync="tabsData" />
+            <!-- <project-info v-model="projectInfo" :tabsData.sync="tabsData" /> -->
           </div>
         </div>
       </div>
@@ -96,7 +96,7 @@
 import { isEmptyParams, getEvaluationType } from "@/views/utils/common"
 import moment from 'moment'
 import projectInfo from '@/views/evaluation/project/components/projectInfo'
-import edit from '@/views/evaluation/project/components/edit'
+import edit from '@/views/evaluation/talent/components/edit'
 
 export default {
   name: "score",
@@ -129,17 +129,17 @@ export default {
     return {
       loading: false,
       isShow: false,
-      isExpertInfoLoad: false,
-      isProjectInfoLoad: false,
+      isScoreTableLoad: false,
+      isTalectLoad: false,
       tabsActive: '1',
       check: {
         time: 5, title: '我已阅读', count: 5, disabled: false,
       },
       formData: {
-        id: null, projId: null, expertId: null, expertName: null,
+        id: null, talentId: null, expertId: null, expertName: null,
         score1: null, score2: null, score3: null, score4: null, score4: null, score5: null, score6: null, score7: null, score8: null, score9: null,
         score10: null, score11: null, score12: null, score13: null, score14: null, score15: null, score16: null, score17: null,
-        totalScore: null, remark: null, supportState: null, projName: null, projNo: null,
+        totalScore: null, remark: null, supportState: null,
       },
       rules: {
         score1: { required: true, message: "*", trigger: "blur" },
@@ -164,42 +164,13 @@ export default {
         score18: { required: true, message: "*", trigger: "blur" },
         score19: { required: true, message: "*", trigger: "blur" },
         additionalScore: { required: true, message: "*", trigger: "blur" },
-        recommendFunding: { required: true, message: "*", trigger: "blur" },
         supportState: { required: true, message: "请选择是否推荐立项", trigger: "change" },
         noSupportReason: { required: true, message: "请填写不推荐原因", trigger: "blur" },
         evaluationType: { required: true, message: "*", trigger: "change" },
       },
-      projectInfo: {
-        projName: '',
-        startDate: '',
-        endDate: '',
-        applyMoney: '',
-        projClassName: '',
-        appPersonName: '',
-        sex: '',
-        titleName: '',
-        degreeName: '',
-        specName: '',
-        jobUnit: '',
-        mobile: '',
-        address: '',
-        appUnitName: '',
-        linkName: '',
-        linkEmail: '',
-        linkTel: '',
-        knowledgeName: '',
-        projContent: '',
-        projTarget: '',
-        projKeywords: '',
-        // 合作单位
-        together: [],
-        // 项目组成员
-        members: [],
-        projDoc: null,
-        fileList: [],
-        auditList: [],
+      talectInfo: {
+
       },
-      comBatch: { expertStart: '', expertEnd: '' },
       tabsData: [
         { title: '全部', key: '0', isShow: true },
         { title: '项目基本信息', key: '1', isShow: true },
@@ -215,18 +186,10 @@ export default {
   },
   created () {
     this.getAssignExpertById()
-    this.getYear()
     this.countStart()
   },
   methods: {
     moment,
-    getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 5, systemType: getType(), timeType: 1 }).then(({ data = {} }) => {
-        if (data) {
-          this.comBatch = data
-        }
-      }).catch(() => { this.loading = false })
-    },
     countStart () {
       this.check.disabled = true
       this.check.title = '下一步'
@@ -239,7 +202,7 @@ export default {
     },
     loadExpertInfo () {
       this.isShow = true
-      if (!this.isExpertInfoLoad)
+      if (!this.isScoreTableLoad)
         this.loading = false
     },
     getAssignExpertById () {
@@ -248,8 +211,8 @@ export default {
         this.$api.projectAssign.getAssignExpertById({ id: this.value }).then(({ data = {} }) => {
           if (data) {
             this.formData = data
-            this.getProjectInfoById(data.projId)
-            this.isExpertInfoLoad = true
+            // this.getProjectInfoById(data.projId)
+            this.isScoreTableLoad = true
             this.loading = false
           } else
             this.$emit('close', 'error')
@@ -268,7 +231,7 @@ export default {
           this.formData.appPersonName = data.appPersonName
           this.formData.applyFunding = data.govFunding
           this.formData.recommendFunding = data.govFunding
-          this.isProjectInfoLoad = true
+          this.isTalectLoad = true
           this.loading = false
         } else
           this.$emit('close', 'error')

src/views/evaluation/talent/index.vue

@@ -16,6 +16,7 @@
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <div class="submit-btn">
       <a-button type="primary" @click="exportData">导出Excel</a-button>
+      <a-button type="primary" @click="testScoreView">查看评分表</a-button>
       <span class="form-description">※ 注：保存评审内容后，请及时提交！ 专家评分时间：{{description}}</span>
     </div>
     <a-table :dataSource="tableData" :columns="columns" rowKey="id" :pagination="false" :loading="loading">
@@ -41,7 +42,7 @@
       <score-view v-model="id" @close="() => this.scoreViewVisible = false" />
     </a-modal>
     <a-modal v-model="scoreVisible" title="专家评分" width="90%" :dialog-style="{ top: '5%' }" :footer="null" destroyOnClose>
-      <score v-model="id" :exportTime="exportTime" :totalFunding="totalFunding" @close="closeWindow" ref="scoreEdit" />
+      <score v-model="id" :exportTime="exportTime" @close="closeWindow" ref="scoreEdit" />
     </a-modal>
     <a-modal v-model="visibleStandard" title="专家评分标准" width="1000px" :dialog-style="{ top: '5%' }" :footer="null" destroyOnClose>
       <pdf-view v-model="url.downloadUrl" :fileName="url.fileDownload"></pdf-view>
@@ -56,8 +57,8 @@
 import { getType } from '@/views/utils/auth'
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName, getEvaluationType } from '@/views/utils/common'
-import score from '@/views/evaluation/project/components/score'
-import scoreView from '@/views/evaluation/project/components/scoreView'
+import score from '@/views/evaluation/talent/components/score'
+import scoreView from '@/views/evaluation/talent/components/scoreView'
 import projectView from '@/views/evaluation/project/components/projectView'
 import pdfView from '@/views/components/common/pdfView'
 
@@ -96,13 +97,16 @@ export default {
       },
       visibleStandard: false,
       exportTime: { expertStart: null, expertEnd: null },
-      totalFunding: 0.00,
     }
   },
   created () {
     this.getYear()
   },
   methods: {
+    testScoreView () {
+      this.id = ''
+      this.scoreVisible = true
+    },
     moment,
     getYear () {
       this.$api.batch.getCurrentYearBatch({ type: 5, systemType: getType(), timeType: 4 }).then(({ data = {} }) => {
@@ -156,7 +160,6 @@ export default {
         this.scoreViewVisible = true
       } else if (type === 'score') {
         this.id = record.id
-        this.totalFunding = record.totalFunding
         this.scoreVisible = true
       } else if (type === 'pView') {
         this.projectId = record.projId