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 | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/web_standard/src/views/business/salaryParam.vue b/web_standard/src/views/business/salaryParam.vue
index c690bb2..bac64ca 100644
--- a/web_standard/src/views/business/salaryParam.vue
+++ b/web_standard/src/views/business/salaryParam.vue
@@ -16,8 +16,7 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >
- </el-option>
+ ></el-option>
</el-select>
</el-form-item>
<section>
@@ -52,19 +51,25 @@
@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="salary" label="宸ヨ祫鍗曚环锛堝厓)" min-width="100px">
+ <!-- <template slot-scope="{row}">
+ {{ accDiv(row.salary, 100) }}
+ </template> -->
+ </el-table-column>
<el-table-column prop="num" label="鏍囧噯浜у嚭" min-width="100px">
<template slot-scope="{row}">
- {{ row.num == 0 ? '-' : row.num }}
+ {{ (row.num == 0 || !row.num) ? '-' : row.num }}
</template>
</el-table-column>
<el-table-column prop="times" label="鏍囧噯宸ユ椂" min-width="100px">
@@ -82,7 +87,6 @@
<!-- <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
@@ -144,7 +148,6 @@
},
methods: {
timesToStr(times) {
-
if (times==0||!times) {
return '-'
}
--
Gitblit v1.9.3