From 4923b169e7c0b2d5b516e414029b2b3dd04e2430 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 19 七月 2024 14:05:00 +0800
Subject: [PATCH] 日工时管理批量审核，批准接口传参修改
---
src/components/tool/value-table.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 68e01c5..6310c76 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -123,7 +123,7 @@
</el-table-column>
<el-table-column type="index" align="center" label="搴忓彿" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
- <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
+ <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width" :isShowZero="isShowZero"
v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
@@ -348,6 +348,10 @@
default: () => '155'
},
isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
+ isShowZero: {
type: Boolean,
default: () => false
},
@@ -620,6 +624,15 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ if (this.isShowZero) {
+ this.tableData.map(item => {
+ Object.keys(item).forEach(val => {
+ if (item[val] === null && !val.includes('Hours')) {
+ item[val] = '/'
+ }
+ })
+ })
+ }
if (this.tableData.length === 0 && this.page.current > 1) {
this.selectList('lastPage')
}
@@ -1157,14 +1170,7 @@
list.forEach(item => {
delete item.orderBy
item.state = state
- if (e === 0) {
- auxiliaryWorkingHoursDays.push(item)
- } else {
- auxiliaryWorkingHoursDays.push({
- id: item.id,
- state: item.state
- })
- }
+ auxiliaryWorkingHoursDays.push(item)
})
this.$axios.post(url, {auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays
},{
--
Gitblit v1.9.3