徐俊

src/views/peAssign/projKeyAssign.vue

@@ -400,35 +400,58 @@ export default {
     },
     exportEvaluationExcel () {
       this.loading = true
-
-      const rowMarks = ['A', 'B', 'C', 'D', 'K']
-      this.$api.statistical.getEvaluationExportExcel({ reportYear: this.reportYear, startRow: 3, rowMarks: rowMarks }).then(({ data = {} }) => {
+      const rowMarks = ['A', 'B', 'C', 'D', 'E', 'P', 'Q']
+      
+      this.$api.statistical.getEvaluationExportExcel({ 
+        reportYear: this.reportYear, 
+        startRow: 3, 
+        rowMarks: rowMarks 
+      }).then(({ data = {} }) => {
         if (data) {
           this.eTableData = data.evaluationList
           this.eMergeList = data.mergeList
 
           import('@/views/utils/Export2Excel').then(excel => {
-            const multiHeader = [[this.reportYear + '项目评审结果列表', '', '']] // 标题
-            const header = ['项目编号', '项目名称', '二级学科', '所属市州', '证件号', '专家姓名', '专家单位', '手机号', '评分', '评审内容', '平均分'] // 表头
-            const filterVal = ['projNo', 'projName', 'knowledgeName', 'unitName', 'certId', 'personName', 'expertUnitName', 'mobile', 'totalScore', 'remark', 'averageScore'] // 数据属性
-            const list = this.eTableData //请求来的数据
-            const merges = ['A1:K1'].concat(this.eMergeList) //需要合并的单元格
-            const data = list.map(item => filterVal.map(j => item[j])) // 转换二维数组
-            const filename = this.reportYear + '项目评审结果列表'
-            excel.exportJsonToExcel({
-              multiHeader, // 标题--非必要
-              header, // 表头
-              data,  // 具体数据--二维数组
-              merges, // 合并--非必要
-              filename, // 下载文件名
-              autoWidth: true,  // 不自动调整列宽
-            })
+            try {
+              const multiHeader = [[this.reportYear + '项目评审结果列表', '', '']]
+              const header = ['项目编号', '项目名称', '一级学科', '二级学科', '所属市州', '证件号', '专家姓名', '专家单位', '手机号', '专家类型', '专家评分', '评审类别', '是否支持立项', '评审内容', '评审状态', '总分', '最终得分']
+              const filterVal = ['projNo', 'projName', 'parentName', 'knowledgeName', 'unitName', 'certId', 'personName', 'expertUnitName', 'mobile', 'expertTypeName', 'evaluationScore', 'evaluationTypeName', 'supportStateName', 'remark', 'auditStateName', 'totalScore', 'calculateScore']
+              const list = this.eTableData
+              const merges = ['A1:Q1'].concat(this.eMergeList)
+              const data = list.map(item => filterVal.map(j => item[j]))
+              const filename = this.reportYear + '项目评审结果列表'
+              
+              excel.exportJsonToExcel({
+                multiHeader,
+                header,
+                data,
+                merges,
+                filename,
+                autoWidth: true,
+              })
+              
+              this.$message.success('导出成功')
+            } catch (err) {
+              console.error('Excel导出错误:', err)
+              this.$message.error(`导出失败: ${err.message || '未知错误'}`)
+            }
+            
             this.loading = false
             this.eTableData = []
             this.eMergeList = []
-          }).catch(() => { this.loading = false })
+          }).catch(err => {
+            console.error('加载Export2Excel模块错误:', err)
+            this.$message.error(`加载导出模块失败: ${err.message || '未知错误'}`)
+            this.loading = false
+          })
         }
-      }).catch(() => { this.loading = false })
+      }).catch(err => {
+        console.error('获取评审数据错误:', err)
+        this.$message.error(`获取评审数据失败: ${err.message || '未知错误'}`)
+        this.loading = false
+        this.eTableData = []
+        this.eMergeList = []
+      })
     },
     exportProjGroupScoreExcel () {
       this.loading = true