333

src/views/assign/components/projectAssignDetail.vue

@@ -60,15 +60,12 @@ export default {
       columns: [
         { title: '姓名', dataIndex: 'personName', align: 'center' },
         { title: '性别', dataIndex: 'sex', align: 'center' },
-        // { title: '证件号', dataIndex: 'certId', 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: 'username', align: 'center' },
+        { title: '专家单位', dataIndex: 'workUnit', align: 'center' },
+        { title: "评审意见", dataIndex: "remark", align: 'center' },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
-        { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation', colName: 'gradeScore' }, align: 'center' },
+        { title: '评审结果', dataIndex: '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

@@ -32,12 +32,13 @@
         <btn-group :data="tabDate" :itemCount="itemCount" v-model="activekey" @change="callback" />
       </div>
       <div style="display: inline-block;width:50%;text-align: right;">
+        <a-tag :color="technology">{{ '技术专家' }}</a-tag>&nbsp;<a-tag :color="finance">{{ '财务专家' }}</a-tag>
         <a-button type="primary" @click="exportData" icon="download">Excel</a-button>
       </div>
     </div>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <span class="form-description" v-if="description"> ※ 审核时间：{{ description }}</span>
-    <a-table :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="id" :pagination="false" :loading="loading">
+    <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>
       </template>
@@ -51,6 +52,13 @@
         <a-button type="link" size="small" @click="recordClick(record, 'evaluation')">专家评审明细</a-button>
         <a-button type="link" size="small" v-if="record.auditResult == 1" @click="recordClick(record, 'audit')">审核</a-button>
       </template>
+      <p slot="expandedRowRender" slot-scope="record" style="margin: 0;">
+        <a-table :dataSource="record.assignList" :columns="innerColumns" rowKey="id" :pagination="false">
+          <template slot="personName" slot-scope="obj">
+            <a-tag :color="obj.expertType == 1 ? technology : finance">{{obj.personName}}</a-tag>
+          </template>
+        </a-table>
+      </p>
     </a-table>
     <a-pagination v-if="pagination.total > 0" :total="pagination.total" show-size-changer show-quick-jumper v-model="pagination.pageIndex" :page-size="pagination.pageSize" :page-size-options="pagination.pageSizeOptions" @showSizeChange="showSizeChange" @change="change" :showTotal="() => `共 ${pagination.total} 条`" />
     <a-modal v-model="assignInfoVisible" title="分配详情" width="85%" :dialog-style="{ top: '8%' }" :footer="null" destroyOnClose>
@@ -86,6 +94,8 @@ export default {
   },
   data () {
     return {
+      technology: "#2db7f5",
+      finance: "#f50",
       // 选项卡
       panes: { count1: 0, count2: 0, count3: 0, count4: 0, count5: 0, },
       form: this.$form.createForm(this, { name: 'advanced_search' }),
@@ -112,20 +122,29 @@ export default {
         { key: "", tab: "所有" },
       ],
       itemCount: [0, 0, 0, 0, 0],
-      tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },
         { title: "项目编号", dataIndex: "projNo", align: 'center' },
-        { title: "专家评分(总分/平均分)", dataIndex: "gradeScore", align: 'center' },
-        { title: "开始时间", dataIndex: "startDate", align: 'center' },
-        { title: "结束时间", dataIndex: "endDate", align: 'center' },
-        { title: "申报年度", dataIndex: "reportYear", align: 'center' },
         { title: '申报单位', dataIndex: 'appUnitName', align: 'center' },
         { title: '申报人', dataIndex: 'appPersonName', align: 'center' },
+        { title: '技术专家评分', dataIndex: 'gradeScore1', align: 'center' },
+        { title: '财务专家评分', dataIndex: 'gradeScore2', align: 'center' },
+        { title: '最终得分', dataIndex: 'calculateScore', align: 'center' },
+        // { title: "开始时间", dataIndex: "startDate", align: 'center' },
+        // { title: "结束时间", dataIndex: "endDate", align: 'center' },
+        // { title: "申报年度", dataIndex: "reportYear", align: 'center' },
         //{ title: '是否选择接受立项不资助', dataIndex: 'isAccept', align: 'center' },
         //{ title: '是否存在境外机构或人员参与', dataIndex: 'isOverseas', align: 'center' },
         { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
+        { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', width: 120, },
+      ],
+      tableData: [],
+      innerColumns: [
+        { title: "姓名", scopedSlots: { customRender: 'personName' }, align: 'center' },
+        { title: "单位", dataIndex: "workUnit", align: 'center' },
+        { title: "评审意见", dataIndex: "remark", align: 'center' },
+        { title: '评分', dataIndex: 'totalScore', align: 'center' },
+        { title: '评审结果', dataIndex: 'evaluationType', align: 'center' },
       ],
       excelCol: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' } },
@@ -202,10 +221,10 @@ 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.totalScore)
+            //   e.gradeScore = e.totalScore + '/' + e.averageScore
+            // else
+            //   e.gradeScore = ' 0/0'
           })
           this.loading = false
         }