3333

src/api/index.js

@@ -562,9 +562,6 @@ export default {
         getAuditListByPage (params) {
             return fetch(`/v1/science-admin/com-talent-assign/getAuditListByPage`, params)
         },
-        getTalentAssignListByPage (params) {
-            return fetch(`/v1/science-admin/com-talent-assign/getTalentAssignListByPage`, params)
-        },
         expertEvaluation (params) {
             return fetch(`/v1/science-admin/com-talent-assign/expertEvaluation`, params, 'post', 'json')
         },

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

@@ -111,6 +111,7 @@ export default {
         totalScore += e.score
       })
       this.totalScore = totalScore
+      this.$emit('totalScore', totalScore)
       return totalScore;
     },
   },

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">
-                  <edit :scoreList.sync="formData.scoreList" :totalScore.sync="formData.totalScore" />
+                  <edit :scoreList.sync="formData.scoreList" @totalScore="setTotalScore" />
                 </a-form-model>
               </div>
             </div>
@@ -160,6 +160,9 @@ export default {
     closeWindow (value) {
       this.$emit('close', 'error')
     },
+    setTotalScore (value) {
+      this.formData.totalScore = value
+    },
     countStart () {
       this.check.disabled = true
       this.check.title = '下一步'

src/views/evaluation/talent/index.vue

@@ -18,7 +18,7 @@
       <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">
+    <a-table :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }"  rowKey="id" :pagination="false" :loading="loading">
       <template slot="talentInfo" slot-scope="record">
         <a @click="recordClick(record, 'tView')">{{record.personName}}</a>
       </template>
@@ -69,9 +69,9 @@ export default {
         { title: '手机号', dataIndex: 'mobile', align: 'center' },
         { title: '现从事专业', dataIndex: 'professionName', align: 'center' },
         { title: '职称', dataIndex: 'titleName', align: 'center' },
-        { title: '申报年度', dataIndex: 'reportYear', align: 'center' },
+        { title: '申报年度', dataIndex: 'assignYear', align: 'center' },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
-        { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation', colName: 'gradeScore' }, align: 'center' },
+        { title: '评审状态', dataIndex: 'stateName', align: 'center'},
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
       ],
       pagination: { pageIndex: 1, pageSize: 50, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, },
@@ -116,7 +116,7 @@ export default {
       this.searchForm.systemType = getType()
       let pars = isEmptyParams(this.searchForm)
       let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize }
-      this.$api.talentAssign.getTalentAssignListByPage(par).then(({ data = {} }) => {
+      this.$api.talentAssign.getAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
           this.tableData = dataList