444

src/views/assign/components/projectAssignDetail.vue

@@ -24,9 +24,14 @@
       <template slot="spec" slot-scope="record">
         <span v-for="data in record.specList" :key="data.id" :color="'green'">{{data.specName+' '}}</span>
       </template>
-      <template slot="expertEvaluation" slot-scope="record">
-        <a-tag :color="evaluationColor(record)">{{evaluationText(record)}}</a-tag>
+      <template slot="evaluationType" slot-scope="record">
+        <a-tag :color="'#87d068'" v-if="record.evaluationType==1">A类(通过)</a-tag>
+        <a-tag :color="'#2db7f5'" v-if="record.evaluationType==2">B类(建议修改)</a-tag>
+        <a-tag :color="'#f50'" v-if="record.evaluationType==3">C类(不通过)</a-tag>
       </template>
+      <!-- <template slot="expertEvaluation" slot-scope="record">
+        <a-tag :color="evaluationColor(record)">{{evaluationText(record)}}</a-tag>
+      </template> -->
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" v-if="!!record.auditState && record.auditState == 2" @click="recordClick(record,'eView')">查看</a-button>
         <!-- <a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="recordClick(record,'del')">
@@ -61,11 +66,11 @@ export default {
         { title: '姓名', dataIndex: 'personName', align: 'center' },
         { title: '性别', dataIndex: 'sex', align: 'center' },
         { title: '职称', dataIndex: 'titleName', align: 'center' },
-        { title: '专家单位', dataIndex: 'workUnit', align: 'center' },
+        { title: "专家单位", dataIndex: "workUnit", align: 'center' },
         { title: "评审意见", dataIndex: "remark", align: 'center' },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
-        { title: '评审结果', dataIndex: 'evaluationType', align: 'center' },
-        { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation'}, align: 'center' },
+        { title: '评审结果', scopedSlots: { customRender: 'evaluationType' }, align: 'center' },
+        // { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
       ],
       pagination: { pageIndex: 1, pageSize: this.$defaultPageSize, total: 0, pageSizeOptions: this.$defaultPageSizeOptions },

src/views/audit/project/final.vue

@@ -37,7 +37,7 @@
       </div>
     </div>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
-    <span class="form-description" v-if="description"> ※ 审核时间：{{ description }}</span>
+    <span style="margin:6px;display: block;color:red;">评分为 总分/平均分，最终得分=技术专家平均分X80% + 财务专家X20%</span>
     <a-table :dataSource="tableData" :columns="columns" rowKey="id" :scroll="{ x: 'max-content' }" :pagination="false" :loading="loading">
       <template slot="projName" slot-scope="record">
         <a @click="recordClick(record, 'view')">{{record.projName}}</a>
@@ -57,6 +57,11 @@
           <template slot="personName" slot-scope="obj">
             <a-tag :color="obj.expertType == 1 ? technology : finance">{{obj.personName}}</a-tag>
           </template>
+          <template slot="evaluationType" slot-scope="obj">
+            <a-tag :color="'#87d068'" v-if="obj.evaluationType==1">A类(通过)</a-tag>
+            <a-tag :color="'#2db7f5'" v-if="obj.evaluationType==2">B类(建议修改)</a-tag>
+            <a-tag :color="'#f50'" v-if="obj.evaluationType==3">C类(不通过)</a-tag>
+          </template>
         </a-table>
       </p>
     </a-table>
@@ -129,7 +134,7 @@ export default {
         { title: '申报人', dataIndex: 'appPersonName', align: 'center' },
         { title: '技术专家评分', dataIndex: 'gradeScore1', align: 'center' },
         { title: '财务专家评分', dataIndex: 'gradeScore2', align: 'center' },
-        { title: '最终得分', dataIndex: 'calculateScore', align: 'center' },
+        { title: '最终得分', dataIndex: 'gradeScore', align: 'center' },
         // { title: "开始时间", dataIndex: "startDate", align: 'center' },
         // { title: "结束时间", dataIndex: "endDate", align: 'center' },
         // { title: "申报年度", dataIndex: "reportYear", align: 'center' },
@@ -144,7 +149,7 @@ export default {
         { title: "单位", dataIndex: "workUnit", align: 'center' },
         { title: "评审意见", dataIndex: "remark", align: 'center' },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
-        { title: '评审结果', dataIndex: 'evaluationType', align: 'center' },
+        { title: '评审结果', scopedSlots: { customRender: 'evaluationType' }, align: 'center' },
       ],
       excelCol: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },
@@ -221,10 +226,21 @@ export default {
           this.tableData.forEach(e => {
             e.startDate = moment(e.startDate).format('YYYY-MM-DD')
             e.endDate = moment(e.endDate).format('YYYY-MM-DD')
-            // if (e.totalScore)
-            //   e.gradeScore = e.totalScore + '/' + e.averageScore
-            // else
-            //   e.gradeScore = ' 0/0'
+            // 技术专家
+            if (!!e.technologyScore)
+              e.gradeScore1 = e.technologyScore + '/' + e.technologyAverageScore
+            else
+              e.gradeScore1 = ' 0/0'
+            // 财务专家
+            if (!!e.economyScore)
+              e.gradeScore2 = e.economyScore + '/' + e.economyAverageScore
+            else
+              e.gradeScore2 = ' 0/0'
+            // 最后得分
+            if (!!e.calculateScore)
+              e.gradeScore = e.calculateScore + ''
+            else
+              e.gradeScore = '0'
           })
           this.loading = false
         }