From 17e098aa3cbde6934121c95247816dfa58c44e7d Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 23 七月 2024 17:47:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/tool/value-table.vue | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index cf0b8b7..5a44dd5 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -52,6 +52,9 @@
.red{
color: red !important;
}
+ >>>.el-loading-parent--relative {
+ z-index: 1 !important;
+ }
</style>
<style>
/* .value-table .highlight-warning-row-border td {
@@ -104,6 +107,7 @@
display: inline-block;
margin-left: 200px;
}
+
</style>
<template>
@@ -119,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">
@@ -344,6 +348,10 @@
default: () => '155'
},
isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
+ isShowZero: {
type: Boolean,
default: () => false
},
@@ -616,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] = 0
+ }
+ })
+ })
+ }
if (this.tableData.length === 0 && this.page.current > 1) {
this.selectList('lastPage')
}
@@ -624,7 +641,7 @@
if (item.value.length === 4) {
item.width = 120
} else if (item.value.length === 3){
- item.width = 100
+ item.width = this.data.sort === false && item.value.includes('鏃�') ? 60 : 100
} else if (item.value.length === 5){
item.width = 130
} else if (item.value.length === 7){
@@ -632,7 +649,7 @@
} else if (item.value.length === 6){
item.width = 150
} else {
- item.width = 86
+ item.width = this.data.sort === false && item.value.includes('鏃�') ? 60 : 86
}
})
}
@@ -1134,7 +1151,7 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
})
@@ -1149,20 +1166,24 @@
const list = JSON.parse(JSON.stringify(this.multipleSelection))
const url = e === 0 ? this.$api.auxiliaryWorkingHoursDay.check : this.$api.auxiliaryWorkingHoursDay.approve
const state = e === 0 ? '宸插鏍�' : '宸叉壒鍑�'
+ let auxiliaryWorkingHoursDays = []
list.forEach(item => {
- this.$axios.post(url, {id: item.id, state: state
- },{
- headers: {
- 'Content-Type': 'application/json'
- }
+ delete item.orderBy
+ item.state = state
+ auxiliaryWorkingHoursDays.push(item)
+ })
+ this.$axios.post(url, {auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays
+ },{
+ headers: {
+ 'Content-Type': 'application/json'
}
- ).then(res => {
- if (res.code === 201) {
- return
- }
- this.$parent.submitBatchCheckDialog()
- this.$message.success('鎿嶄綔鎴愬姛')
- })
+ }
+ ).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$parent.submitBatchCheckDialog()
+ this.$message.success('鎿嶄綔鎴愬姛')
})
} else {
this.$message.error('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�')
--
Gitblit v1.9.3