From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
web_standard/src/views/business/salaryParam.vue | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/web_standard/src/views/business/salaryParam.vue b/web_standard/src/views/business/salaryParam.vue
index 11a2579..bac64ca 100644
--- a/web_standard/src/views/business/salaryParam.vue
+++ b/web_standard/src/views/business/salaryParam.vue
@@ -3,7 +3,7 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐗╂枡" prop="keyWord">
+ <el-form-item label="鐗╂枡淇℃伅" prop="keyWord">
<el-input v-model="searchForm.keyWord" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="宸ュ簭" prop="procedureName">
@@ -16,21 +16,32 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >
- </el-option>
+ ></el-option>
</el-select>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:salaryparam:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:salaryparam:create', 'business:salaryparam:delete']">
- <li><el-button type="primary" @click="$refs.operaSalaryParamWindow.open('鏂板缓缁╂晥宸ヨ祫閰嶇疆')" icon="el-icon-plus" v-permissions="['business:salaryparam:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:salaryparam:delete']">鍒犻櫎</el-button></li>
+ <ul class="toolbar" v-permissions="['business:salaryparam:create', 'business:salaryparam:delete', 'business:salaryparam:exportExcel', 'business:salaryparam:importExcel']">
+ <li><el-button type="primary" @click="$refs.operaSalaryParamWindow.open('鏂板缓缁╂晥宸ヨ祫閰嶇疆')" v-permissions="['business:salaryparam:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="deleteByIdInBatch" v-permissions="['business:salaryparam:delete']">鎵归噺鍒犻櫎</el-button></li>
+ <li>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:salaryparam:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+ </li>
+ <li v-permissions="['business:salaryparam:importExcel']">
+ <ImportButton
+ text="瀵煎叆"
+ template-name="salary_import_template.xlsx"
+ template-path="/template/salary_import_template.xlsx"
+ action="/business/salaryParam/importBatch"
+ @success="search"
+ />
+ </li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -40,19 +51,28 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
+ <!-- align="center" -->
+ <el-table-column prop="id" label="搴忓彿" min-width="100px"></el-table-column>
<el-table-column prop="type" label="璁′环鏂瑰紡" min-width="100px">
<template slot-scope="{row}">
{{ row.type == 0 ? '璁′欢' : '璁℃椂' }}
</template>
</el-table-column>
+ <el-table-column prop="departName" label="鎵�灞炲伐鍘�" min-width="100px"></el-table-column>
<el-table-column prop="materialName" label="鐗╂枡鍚嶇О" min-width="140px"></el-table-column>
<el-table-column prop="materialCode" label="鐗╂枡缂栫爜" min-width="100px"></el-table-column>
<el-table-column prop="procedureName" label="宸ュ簭鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="salary" label="宸ヨ祫鍗曚环锛堝厓)" min-width="100px"></el-table-column>
- <el-table-column prop="num" label="鏍囧噯鏁伴噺" min-width="100px">
+ <el-table-column prop="salary" label="宸ヨ祫鍗曚环锛堝厓)" min-width="100px">
+ <!-- <template slot-scope="{row}">
+ {{ accDiv(row.salary, 100) }}
+ </template> -->
</el-table-column>
- <el-table-column prop="times" label="鏍囧噯鏃堕暱" min-width="100px">
+ <el-table-column prop="num" label="鏍囧噯浜у嚭" min-width="100px">
+ <template slot-scope="{row}">
+ {{ (row.num == 0 || !row.num) ? '-' : row.num }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="times" label="鏍囧噯宸ユ椂" min-width="100px">
<template slot-scope="{row}">
{{ timesToStr(row.times) }}
</template>
@@ -63,11 +83,10 @@
</template>
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
- <!-- <el-table-column prop="updateUser" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column> -->
+ <el-table-column prop="createUserName" label="鍒涘缓浜�" min-width="100px"></el-table-column>
<!-- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="rootDepartId" label="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�" min-width="100px"></el-table-column>
- <el-table-column prop="departId" label="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級" min-width="100px"></el-table-column>
<el-table-column prop="bomId" label="bom缂栫爜锛堝叧鑱攂om琛級" min-width="100px"></el-table-column> -->
<el-table-column
@@ -98,11 +117,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import ImportButton from '@/components/common/ImportButton'
import OperaSalaryParamWindow from '@/components/business/OperaSalaryParamWindow'
export default {
name: 'SalaryParam',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaSalaryParamWindow },
+ components: { TableLayout, Pagination, OperaSalaryParamWindow, ImportButton },
data () {
return {
// 鎼滅储
@@ -128,7 +148,7 @@
},
methods: {
timesToStr(times) {
- if (!times) {
+ if (times==0||!times) {
return '-'
}
let sec = times%60
--
Gitblit v1.9.3