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

src/api/index.js

@@ -291,6 +291,9 @@ export default {
         getExpertListByIdList (params) {
             return fetch(`/v1/science-admin/com-expert/getExpertListByIdList`, params, 'post', 'json')
         },
+        getEcaluationStatisticListByPage (params) {
+            return fetch('/v1/science-admin/com-expert/getEcaluationStatisticListByPage', params)
+        },
     },
     expertSpec: {
         getExpertListBySpecId (params) {

src/router/index.js

@@ -230,6 +230,7 @@ export const routes = [
     hidden: false,
     children: [
       { path: '/expert/list', name: '专家管理', component: () => import('@/views/expert/index.vue'), meta: { title: '专家管理', icon: '', noCache: true } },
+      { path: '/expert/evaluationStatistic', name: '专家评审统计', component: () => import('@/views/expert/evaluationStatistic.vue'), meta: { title: '专家评审统计', icon: '', noCache: true } },
       { path: '/expert/expertBRegister', name: '专家导入', component: () => import('@/views/expert/components/expertImport.vue'), meta: { title: '专家导入', icon: '', noCache: true } },
       { path: '/expert/group', name: '专家组管理', component: () => import('@/views/expertGroup/expertBatch.vue'), meta: { title: '专家组管理', icon: '', noCache: true } },
       { path: '/expert/group/members', name: '专家组成员管理', component: () => import('@/views/expertGroup/expertGroupMembers.vue'), meta: { title: '专家组成员管理', icon: '', noCache: true } },

src/views/assign/components/assignDetail.vue

@@ -249,7 +249,7 @@ export default {
       this.$api.projectAssign.getListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
-          this.$ToDoExcel(`项目分配列表`, tableColumnsName(column), filterExportExcelData(column, this.tableData))
+          this.$ToDoExcel(`项目分配列表`, tableColumnsName(column), filterExportExcelData(column, dataList))
           dataList = []
         }
         this.loading = false

src/views/audit/project/Index.vue

@@ -114,8 +114,9 @@ export default {
         { title: "结束时间", dataIndex: "endDate", align: 'center' },
         { title: "申报年度", dataIndex: "reportYear", align: 'center' },
         { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center', width: 80 },
+        { title: "项目资金(万元)", dataIndex: "govFunding", align: 'center' },
         { title: '申报单位', dataIndex: 'appUnitName', align: 'center' },
-        { title: '申报学科', dataIndex: 'knowledgeName', align: 'center' },
+        { title: '申报学科', dataIndex: 'knowledgeName', align: 'center', ellipsis: true, width: 200 },
         { title: '申报人', dataIndex: 'appPersonName', align: 'center' },
         { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
@@ -193,8 +194,13 @@ export default {
       this.$api.auditManager.getAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data;
-          this.tableData = dataList;
           this.pagination.total = total;
+          this.tableData = dataList.map(item => {
+            return {
+              ...item,
+              projClassName: item.projClass === 1 ? "一般项目" : "重点项目",
+            }
+          })
           this.tableData.forEach(e => {
             e.startDate = moment(e.startDate).format('YYYY-MM-DD')
             e.endDate = moment(e.endDate).format('YYYY-MM-DD')
@@ -268,7 +274,21 @@ export default {
       this.taskFileInfoView = true
     },
     exportData () {
-      this.$ToDoExcel(`项目审核列表`, tableColumnsName(this.columns), filterExportExcelData(this.columns, this.tableData))
+      let column = [
+         { title: "项目名称", dataIndex: 'projName' },
+        //{ title: "项目编号", dataIndex: "projNo", align: 'center' },
+        { title: '申请编号', dataIndex: 'appNo' },
+        { title: "开始时间", dataIndex: "startDate" },
+        { title: "结束时间", dataIndex: "endDate" },
+        { title: "申报年度", dataIndex: "reportYear" },
+        { title: "项目类别", dataIndex: 'projClassName' },
+        { title: "项目资金(万元)", dataIndex: "govFunding" },
+        { title: '申报单位', dataIndex: 'appUnitName' },
+        { title: '申报学科', dataIndex: 'knowledgeName' },
+        { title: '申报人', dataIndex: 'appPersonName' },
+        { title: '审核状态', dataIndex: 'auditResultName' },
+      ]
+      this.$ToDoExcel(`项目审核列表`, tableColumnsName(column), filterExportExcelData(column, this.tableData))
     }
   },
 };