diff --git a/src/components/DetailComponent/ExpenseDetail.vue b/src/components/DetailComponent/ExpenseDetail.vue
index d8d67cf..b01267c 100644
--- a/src/components/DetailComponent/ExpenseDetail.vue
+++ b/src/components/DetailComponent/ExpenseDetail.vue
@@ -14,15 +14,27 @@
:label="childColumn.label"
:width="childColumn.prop === 'subtotal' ? 160 : 130">
- {{ columnScope.row[column.prop][childColumn.prop] }}
+
+ {{
+ columnScope.row[column.prop][childColumn.prop] ? columnScope.row[column.prop][childColumn.prop] : '/'
+ }}
+
+
+ {{ columnScope.row[column.prop][childColumn.prop] }}
+
+
+ v-if="(column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost') && (tableData.length -1) !== scope.$index">
{{ getTotalSeparation(scope.row, column.prop) }}
+
+ {{ getTotalSummary(scope.row, column.prop) }}
+
{{ scope.row[column.prop] }}
@@ -33,12 +45,10 @@
-
diff --git a/src/utils/export-excel.js b/src/utils/export-excel.js
index b05118e..afeeb79 100644
--- a/src/utils/export-excel.js
+++ b/src/utils/export-excel.js
@@ -7,8 +7,9 @@ import XLSX from "xlsx-style-vite";
* @param $table 表格html dom元素
* @param columnLength 列长度
* @param excelName 导出文件名称
+ * @param bigWidthIndex 更宽列的索引
*/
-export function exportExcel($table, columnLength, excelName,bigWidth) {
+export function exportExcel($table, columnLength, excelName, bigWidthIndex) {
//从el-table表生成工作簿对象
//使用原始的格式,保留表格中的格式如%、小数末尾的0等
let workbook = utils.table_to_book($table, {
@@ -16,7 +17,7 @@ export function exportExcel($table, columnLength, excelName,bigWidth) {
});
//列宽,需要导出的表格有多少列这里的i就小于多少
for (let i = 1; i < columnLength; i++) {
- if(i==bigWidth){
+ if (i === bigWidthIndex) {
workbook.Sheets.Sheet1["!cols"].push({wpx: 300});
}
workbook.Sheets.Sheet1["!cols"].push({wpx: 100});
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 02215e4..84910b3 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -38,7 +38,7 @@
-
+
{{ chooseUserInfo() }}
{{ chooseUserInfo() == null ? '请选择研发人员' : '更改' }}
@@ -183,7 +183,7 @@ const rules = reactive({
shareName: [{required: true, message: '请输入分摊名称', trigger: 'blur'}],
apportionmentMonth: [{required: true, message: '请选择月份', trigger: 'blur'}],
projectId: [{required: true, message: '请选择项目名称', trigger: 'blur'}],
- researchPersonnel: [{required: true, message: '请选择研发人员', trigger: 'blur'}],
+ // researchPersonnel: [{required: true, message: '请选择研发人员', trigger: 'blur'}],
wagesPayable: [{required: true, message: '请输入应发工资', trigger: 'blur'}],
performance: [{required: true, message: '请输入绩效', trigger: 'blur'}],
reserveFund: [{required: true, message: '请输入公积金', trigger: 'blur'}],
@@ -299,7 +299,6 @@ const handleSubmit = (instance) => {
// }
formData.value.tableData.forEach(item => {
item.projectName = getProjectName(item.projectId)
- // item.researchPersonnel
})
let params = {
shareName: formData.value.shareName,