From 2837bdd57f72e386bbf9a725e7b3a13e5eb9e930 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 09:19:57 +0800
Subject: [PATCH] 修复bug
---
web_standard/src/views/ext/salaryStatistic.vue | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/web_standard/src/views/ext/salaryStatistic.vue b/web_standard/src/views/ext/salaryStatistic.vue
index e58ab8d..396fb7b 100644
--- a/web_standard/src/views/ext/salaryStatistic.vue
+++ b/web_standard/src/views/ext/salaryStatistic.vue
@@ -12,7 +12,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐗╂枡缂栫爜" prop="mmodelCode">
+ <!-- <el-form-item label="鐗╂枡缂栫爜" prop="mmodelCode">
<el-input v-model="searchForm.mmodelCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="宸ュ簭" prop="procedureId">
@@ -24,7 +24,7 @@
:value="item.id">
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鎶ュ伐鏃堕棿">
<el-date-picker
v-model="planDate"
@@ -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}">
- {{ 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}">
- {{ 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}">
- {{ row.totalSalary / 100 }}
+ <!-- {{ accDiv(Math.round(row.totalSalary), 100) }} -->
+ {{ row.totalSalary }}
</template>
</el-table-column>
@@ -131,7 +134,13 @@
'field.main': 'name',
sorts: [{ direction: 'DESC', property: 'CREATE_TIME' }]
})
-
+ let tempDate = new Date()
+ let year = tempDate.getFullYear()
+ let month = tempDate.getMonth() + 1
+ let day = tempDate.getDate()
+ this.searchForm.startDate = `${year}-${month}-01`
+ this.searchForm.endDate = `${year}-${month}-${day}`
+ this.planDate = [this.searchForm.startDate, this.searchForm.endDate]
this.search()
},
activated() {
@@ -142,7 +151,7 @@
.catch(err => {
console.log(err)
})
- companyUserExtAllUser({ departmentId: this.$store.state.userInfo.curComDepartment.id })
+ companyUserExtAllUser({ companyId: this.$store.state.userInfo.company.id })
.then(res => {
this.proUsers = res
})
--
Gitblit v1.9.3