From 45d04a1212f6894c68063b77d911ed7a6ba9de96 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 17 二月 2023 11:14:46 +0800
Subject: [PATCH] 1.人员工资页面新增人员比例字段
---
src/views/scgl/sckbg.vue | 4 ++--
src/views/bbgl/rygz.vue | 23 +++++++++++++++++------
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 676909c..21f04ee 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -90,15 +90,15 @@
<el-tab-pane label="鏈亾宸ュ簭">
<div class="elTableDiv">
<el-table
- ref="tableDataRef2"
+ ref="tableDataRef"
class="tableFixed"
:data="tableData"
- :height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
+ :height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
border
:summary-method="getSummaries"
show-summary
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?(tableHeight-70):(tableHeight-30)+'px',}"
+ :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -198,6 +198,17 @@
</template>
</el-table-column>
<el-table-column
+ prop="ratio"
+ label="宸ュ簭鍗曚环"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.unprice">{{ row.ratio }} %</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="usermoney"
label="涓汉璁颁欢宸ヨ祫"
width="130"
@@ -237,15 +248,15 @@
<el-tab-pane label="閫愰亾宸ュ簭">
<div class="elTableDiv">
<el-table
- ref="tableDataRef"
+ ref="tableDataRef2"
class="tableFixed"
:data="tableData2"
- :height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
+ :height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
border
:summary-method="getSummaries"
show-summary
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?(tableHeight-70):(tableHeight-30)+'px',}"
+ :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 6e0f512..f9738fd 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -2211,9 +2211,9 @@
if (this.dialogForm.reckway === 'group') {
let sum = 0
this.userTableData.forEach(item => {
- sum += item.ratio
+ sum += parseFloat(item.ratio)
})
- if (sum !== 100) {
+ if (Math.round(sum * 100) / 100 !== 100) {
return this.$message.info('鍒嗛厤姣斾緥鎬诲拰蹇呴』涓�100锛�')
}
}
--
Gitblit v1.9.3