From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
web_standard/src/views/ext/salaryStatistic.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/web_standard/src/views/ext/salaryStatistic.vue b/web_standard/src/views/ext/salaryStatistic.vue
index b448f9d..8383e36 100644
--- a/web_standard/src/views/ext/salaryStatistic.vue
+++ b/web_standard/src/views/ext/salaryStatistic.vue
@@ -60,18 +60,21 @@
<el-table-column prop="userInfo.departName" label="閮ㄩ棬" min-width="100px"> </el-table-column>
<el-table-column prop="jijianSalary" label="璁′欢宸ヨ祫" min-width="100px">
<template slot-scope="{row}">
- {{ accDiv(Math.round(row.jijianSalary), 100) }}
+ <!-- {{ accDiv(Math.round(row.jijianSalary), 100) }} -->
+ {{ row.jijianSalary }}
</template>
</el-table-column>
<el-table-column prop="jishiSalary" label="璁℃椂宸ヨ祫" min-width="100px">
<template slot-scope="{row}">
- {{ accDiv(Math.round(row.jishiSalary), 100) }}
+ <!-- {{ accDiv(Math.round(row.jishiSalary), 100) }} -->
+ {{ row.jishiSalary }}
</template>
</el-table-column>
<el-table-column prop="num" label="鎶ュ伐鍗曟�绘暟" min-width="100px"></el-table-column>
<el-table-column prop="totalSalary" label="灏忚宸ヨ祫(鍏�)" min-width="100px">
<template slot-scope="{row}">
- {{ accDiv(Math.round(row.totalSalary), 100) }}
+ <!-- {{ accDiv(Math.round(row.totalSalary), 100) }} -->
+ {{ row.totalSalary }}
</template>
</el-table-column>
@@ -179,7 +182,6 @@
return '-'
},
customIndex(index) {
- console.log();
return (this.tableData.pagination.pageIndex-1) * this.tableData.pagination.pageSize + index + 1
}
}
--
Gitblit v1.9.3