Commit aad5e249 authored by 许珑标's avatar 许珑标

Merge remote-tracking branch 'origin/develop' into develop

parents 06cf68d3 d389f912
......@@ -49,20 +49,20 @@
</el-table-column>
<el-table-column prop="companyName" label="单位名称">
</el-table-column>
<el-table-column prop="actualPayable" label="实发工资">
<el-table-column prop="actualPayable" label="实发工资(元)">
</el-table-column>
<el-table-column label="公司承担部分">
<el-table-column prop="gsbxCompanyMoney" label="工商保险">
<el-table-column prop="gsbxCompanyMoney" label="工商保险(元)">
</el-table-column>
<el-table-column prop="providentFundCompanyMoney" label="公积金">
<el-table-column prop="providentFundCompanyMoney" label="公积金(元)">
</el-table-column>
<el-table-column prop="sybxCompanyMoney" label="失业保险">
<el-table-column prop="sybxCompanyMoney" label="失业保险(元)">
</el-table-column>
<el-table-column prop="syubxCompanyMoney" label="生育保险">
<el-table-column prop="syubxCompanyMoney" label="生育保险(元)">
</el-table-column>
<el-table-column prop="ylbxCompanyMoney" label="养老保险">
<el-table-column prop="ylbxCompanyMoney" label="养老保险(元)">
</el-table-column>
<el-table-column prop="ysbxCompanyMoney" label="医疗保险">
<el-table-column prop="ysbxCompanyMoney" label="医疗保险(元)">
</el-table-column>
</el-table-column>
</el-table>
......@@ -121,20 +121,20 @@
</el-table-column>
<el-table-column prop="companyName" label="单位名称">
</el-table-column>
<el-table-column prop="actualPayable" label="实发工资">
<el-table-column prop="actualPayable" label="实发工资(元)">
</el-table-column>
<el-table-column label="公司承担部分">
<el-table-column prop="gsbxCompanyMoney" label="工商保险">
<el-table-column prop="gsbxCompanyMoney" label="工商保险(元)">
</el-table-column>
<el-table-column prop="providentFundCompanyMoney" label="公积金">
<el-table-column prop="providentFundCompanyMoney" label="公积金(元)">
</el-table-column>
<el-table-column prop="sybxCompanyMoney" label="失业保险">
<el-table-column prop="sybxCompanyMoney" label="失业保险(元)">
</el-table-column>
<el-table-column prop="syubxCompanyMoney" label="生育保险">
<el-table-column prop="syubxCompanyMoney" label="生育保险(元)">
</el-table-column>
<el-table-column prop="ylbxCompanyMoney" label="养老保险">
<el-table-column prop="ylbxCompanyMoney" label="养老保险(元)">
</el-table-column>
<el-table-column prop="ysbxCompanyMoney" label="医疗保险">
<el-table-column prop="ysbxCompanyMoney" label="医疗保险(元)">
</el-table-column>
</el-table-column>
</el-table>
......@@ -254,7 +254,7 @@ export default {
sums.forEach((ele, index) => {
if (index != 0 && index != 1 && index != 2) {
let tys = null
tys = Math.floor(Number(ele) * 100) / 100
tys = Math.floor(Number(ele) * 100) / 100 + '元'
arrAY.push(tys)
} else {
arrAY.push(ele)
......@@ -299,7 +299,7 @@ export default {
sums.forEach((ele, index) => {
if (index != 0 && index != 1 && index != 2) {
let tys = null
tys = Math.floor(Number(ele) * 100) / 100
tys = Math.floor(Number(ele) * 100) / 100 + '元'
arrAY.push(tys)
} else {
arrAY.push(ele)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment