From d80dbcd093573d191053b8c3034acfc47e040ebd Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期二, 20 五月 2025 14:16:44 +0800
Subject: [PATCH] 修改
---
src/views/safetyReview/projectManage/index.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 4e08d65..a0e6af0 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -206,6 +206,8 @@
'姓名':'expertName',
'处室':'deptName',
'专家费': 'expertFee',
+ '交通费': 'travelExpenses',
+ '住宿费':'accommodationFee',
'申请时间': 'createTime',
'事由': 'projectName',
'发现重大隐患':'majorDangers',
@@ -367,17 +369,17 @@
const title = [[`自治区应急管理厅外聘专家劳务费发放表（项目编码${row.projectCode}）`]]
// 固定一行：填报处室和单位
const fixedHeader = [
- ["填报处室：" + row.deptName, "", "", "", "", "单位：元", "", "", "", "",""]
+ ["填报处室：" + row.deptName, "", "", "", "", "单位：元", "", "", "", "","", "",""]
]
if(res.data && res.data[0] && Array.isArray(res.data[0].projectExpertExportResps) && res.data[0].projectExpertExportResps.length>0){
let mainData = res.data[0].projectExpertExportResps
const data = mainData.map((item,index)=>{
- return [index+1,item.name,item.companyName,item.title,item.idCard,item.freightBasis,item.billingDuration,item.taxExpertFee,item.incomeTaxPayable,item.openBank,item.bankCard]
+ return [index+1,item.name,item.companyName,item.title,item.idCard,item.freightBasis,item.billingDuration,item.taxExpertFee,item.incomeTaxPayable,item.travelExpenses,item.accommodationFee,item.openBank,item.bankCard]
})
console.log(data,'data')
// 定义表头
const headers = [
- ["序号", "姓名", "工作单位", "职称", "身份证号", "计费标准", "计费时长", "专家费", "应缴税费", "开户银行", "卡号"]
+ ["序号", "姓名", "工作单位", "职称", "身份证号", "计费标准", "计费时长", "专家费", "应缴税费", "交通费", "住宿费","开户银行", "卡号"]
]
// 固定一行：经办人和负责人
const footer = [
@@ -399,9 +401,9 @@
const dataRowCount = data.length;
// 合并单元格的范围
ws['!merges'] = [
- { s: { r: 0, c: 0 }, e: { r: 0, c: 10 } }, // 合并标题：第1行 0列到12列
+ { s: { r: 0, c: 0 }, e: { r: 0, c: 12 } }, // 合并标题：第1行 0列到12列
{ s: { r: 1, c: 0 }, e: { r: 1, c: 4 } }, // 合并填报处室：第2行 第0列到4列
- { s: { r: 1, c: 5 }, e: { r: 1, c: 10 } }, // 合并单位：第2行 第5列到12列
+ { s: { r: 1, c: 5 }, e: { r: 1, c: 12 } }, // 合并单位：第2行 第5列到12列
{ s: { r: 3 + dataRowCount, c: 0 }, e: { r: 3 + dataRowCount, c: 4 } }, // 合并经办人：最后一行的第0列到4列
{ s: { r: 3 + dataRowCount, c: 5 }, e: { r: 3 + dataRowCount, c: 6} }, // 合并负责人：最后一行的第5列到+6列
]
@@ -420,7 +422,7 @@
// 设置数据区（包括填报处室、单位、数据行和最后一行）为左对齐
const totalRows = 3 + dataRowCount + 1; // 标题、固定行和数据行的总数
for (let r = 3; r <= totalRows; r++) { // 遍历每一行
- for (let c = 0; c < 11; c++) { // 遍历每一列
+ for (let c = 0; c < 13; c++) { // 遍历每一列
const cellRef = `${String.fromCharCode(65 + c)}${r}`;
if (!ws[cellRef]) ws[cellRef] = {}; // 确保单元格存在
ws[cellRef].s = {
@@ -440,7 +442,7 @@
}
// 设置最后一行（经办人、负责人）左对齐
const lastRowStart = 3 + dataRowCount;
- for (let c = 0; c < 11; c++) {
+ for (let c = 0; c < 13; c++) {
const cellRef = `${String.fromCharCode(65 + c)}${lastRowStart + 1}`;
console.log(cellRef,'ref')
if (!ws[cellRef]) ws[cellRef] = {}; // 确保单元格存在
--
Gitblit v1.9.2