Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/evaluation/components/score.vue

@@ -340,7 +340,7 @@ export default {
           this.loading = false
         }).catch(() => { this.loading = false })
       } else {
-        this.$message.warn('请填写信息后再保存！')
+        this.$message.warn('请至少填写评审意见后再保存！')
       }
     },
     checkInfo () {
@@ -406,4 +406,3 @@ export default {
   }
 }
 </style>
-ant-tabs
\ No newline at end of file

src/views/evaluation/components/technologyEvalucation.vue

@@ -274,6 +274,7 @@ td {
   text-align: left;
   line-height: 25px;
   height: 25px;
+  padding: 4px;
 }
 .bg-title {
   background-color: #f8fafc;

src/views/evaluation/index.vue

@@ -26,6 +26,9 @@
       <template slot="expertEvaluation" slot-scope="record">
         <a-tag :color="evaluationColor(record)">{{evaluationText(record)}}</a-tag>
       </template>
+      <template slot="projClassInfo" slot-scope="record">
+        {{ record.projClass == 1 ? "一般项目" : "重点项目" }}
+      </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-button type="link" size="small" v-if="isButten" @click="recordClick(record,'eva')">评分</a-button>
@@ -71,8 +74,9 @@ export default {
       searchForm: { projName: null, appNo: null, assignYear: null, personId: null, projType: getType() },
       tableData: [],
       columns: [
-        { title: "项目名称", scopedSlots: { customRender: 'projectName', colName: 'projName' }, align: 'left' },
         { title: '申请编号', dataIndex: 'appNo', align: 'center' },
+        { title: "项目名称", scopedSlots: { customRender: 'projectName', colName: 'projName' }, align: 'left' },
+        { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center', width: 80 },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
         { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation', colName: 'gradeScore' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },

src/views/peAssign/projKeyAssign.vue

@@ -39,6 +39,7 @@
       <a-button type="primary" @click="onaAssignDetail">分配明细</a-button>
       <a-button icon="download" type="primary" @click="exportEvaluationExcel">项目评审结果导出</a-button>
       <a-button icon="download" type="primary" @click="exportProjGroupScoreExcel">项目分组排名导出</a-button>
+      <a-tag :color="technology">{{ '技术专家' }}</a-tag>&nbsp;<a-tag :color="finance">{{ '财务专家' }}</a-tag>
     </div>
     <a-table :dataSource="tableData2" :columns="columns2" rowKey="id" :pagination="false" :loading="loading" :row-selection="{ selectedRowKeys: projGroupSelectedRowKeys, onChange: onProjGroupSelectChange, type: selectType }" @expand="getInnerData" :expandedRowKeys="expandedRowKeys">
       <template slot="groupName" slot-scope="record">
@@ -46,7 +47,7 @@
       </template>
       <template slot="assignInfo" slot-scope="record">
         <a-tag v-if="!record.expertList||record.expertList.length===0" :color="'red'">未分配</a-tag>
-        <a-tag v-else v-for="data in record.expertList" :key="data.id" :color="'orange'" @click="evaluationView(data)">{{data.personName}}</a-tag>
+        <a-tag v-else v-for="data in record.expertList" :key="data.id" :color="data.expertType == 1 ? technology : finance" @click="evaluationView(data)">{{data.personName}}</a-tag>
       </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record, 'edit')">修改</a-button>
@@ -159,7 +160,9 @@ export default {
       eTableData: [],
       eMergeList: [],
       projectIntoGroupVisible: false,
-      projectIntoGroupTitle: null
+      projectIntoGroupTitle: null,
+      technology: "#2db7f5",
+      finance: "#f50",
     };
   },
   created () {