xujun

src/views/assign/components/assignDetail.vue

@@ -32,7 +32,12 @@
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <a-table :dataSource="tableData" :columns="columns" rowKey="id" :pagination="false" :loading="loading">
       <template slot="projName" slot-scope="record">
-        <a @click="recordClick(record,'view')">{{record.projName}}</a>
+        <a-tooltip placement="topLeft">
+          <template slot="title">
+            <span>{{ record.projName }}</span>
+          </template>
+          <a @click="recordClick(record,'view')">{{record.projName}}</a>
+        </a-tooltip>
       </template>
       <template slot="spec" slot-scope="record">
         <span v-for="data in record.specList" :key="data.id" :color="'green'">{{data.specName+' '}}</span>
@@ -40,6 +45,12 @@
       <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="expertInfo" slot-scope="record">
+        <a-tag :color="record.expertType == 1 ? technology : finance">{{ record.expertType == 1 ? "技术专家" : "财务专家" }}</a-tag>
+      </template>
       <template slot="option" slot-scope="record">
         <a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="recordClick(record,'del')">
           <a-button type="link" size="small">删除</a-button>
@@ -71,16 +82,20 @@ export default {
       searchForm: { projName: null, projNo: null, assignYear: null, personName: null, certId: null, sex: "", projType: getType() },
       tableData: [],
       columns: [
-        { title: "项目名称", scopedSlots: { customRender: 'projName' } },
-        { title: '项目编号', dataIndex: 'projNo', align: 'center' },
-        { title: '专家姓名', dataIndex: 'personName', align: 'center' },
+        { title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true, width: 300, },
+        { title: "项目分组", dataIndex: 'groupName', align: 'center' },
+        { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center' },
+        { title: '申报单位', dataIndex: 'appUnitName', align: 'center' },
+        // { title: '项目编号', dataIndex: 'projNo', align: 'center' },
         // { title: '性别', dataIndex: 'sex', align: 'center' },
-        { title: '证件号', dataIndex: 'certId', align: 'center' },
+        // { title: '证件号', dataIndex: 'certId', align: 'center' },
+        { title: '专家姓名', dataIndex: 'personName', align: 'center' },
+        { title: "专家类型", scopedSlots: { customRender: 'expertInfo' }, align: 'center' },
+        { title: '专家单位', dataIndex: 'unitName', align: 'center' },
         { title: '手机号', dataIndex: 'mobile', align: 'center' },
         // { title: '邮箱', dataIndex: 'email', align: 'center' },
         // { title: '职称', dataIndex: 'titleName', align: 'center' },
         // { title: '评审专业', scopedSlots: { customRender: 'spec' }, align: 'center' },
-        { title: '单位', dataIndex: 'unitName', align: 'center' },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
         { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation', colName: 'gradeScore' }, align: 'center' },
         // { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
@@ -89,6 +104,8 @@ export default {
       loading: false,
       projId: null,
       visibleView: false,
+      technology: "#2db7f5",
+      finance: "#87d068",
     }
   },
   created () {

src/views/peAssign/projKeyAssign.vue

@@ -83,7 +83,7 @@
     <a-modal v-model="evaluationVisible" title="专家查看" width="1000px" :dialog-style="{ top: '15%' }" :footer="null" destroyOnClose>
       <assign-group-expert-view v-model="evaluationId" @close="closeAssignExpertView" />
     </a-modal>
-    <a-modal v-model="assignDetailVisible" title="专家查看" width="90%" :dialog-style="{ top: '5%' }" :footer="null" destroyOnClose>
+    <a-modal v-model="assignDetailVisible" title="分配明细" width="90%" :dialog-style="{ top: '5%' }" :footer="null" destroyOnClose>
       <assign-detail />
     </a-modal>
     <a-modal v-model="projectIntoGroupVisible" :title="projectIntoGroupTitle" width="70%" :dialog-style="{ top: '15%' }" :maskClosable="false" destroyOnClose>