From 083bc1030f7dda031f04976c7f02109d31eeff0e Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 07 八月 2024 16:06:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/tool/value-table.vue | 135 +++++++++++++++++++++++++++++++-------------
1 files changed, 94 insertions(+), 41 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 6416a82..d9df2a2 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>
@@ -115,12 +119,12 @@
:summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record.id"
:current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
:span-method="spanMethod" :key="specialKey">
- <el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
+ <el-table-column type="selection" :width="selectionWidth" v-if="data.showSelect" :key="Math.random()">
</el-table-column>
- <el-table-column type="index" align="center" label="搴忓彿" width="65" v-if="data.isIndex" :key="Math.random()">
+ <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'"
- v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="155" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
+ <el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :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">
<template v-if="typeof(scope.row[a.label]) == 'object'">
@@ -335,6 +339,22 @@
} from 'jquery';
export default {
props: {
+ selectionWidth: {
+ type: String,
+ default: () => '65'
+ },
+ columnMinWidth: {
+ type: String,
+ default: () => '155'
+ },
+ isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
+ isShowZero: {
+ type: Boolean,
+ default: () => false
+ },
tableRowClassName: {
type: Function
},
@@ -574,9 +594,14 @@
this.selectList('page')
},
selectList(val) {
+ // console.log('val---', val)
+ // console.log('this.page---', this.page)
this.loading = true
if(val===undefined){
this.page.current = 1;
+ }
+ if (val === 'lastPage') {
+ this.page.current = this.page.current - 1 // 渚嬪鍒犻櫎鏈〉鏈�鍚庝竴鏉℃暟鎹紝灏嗗綋鍓嶉〉闈㈠畾涓轰笂涓�椤碉紝闄ょ涓�椤靛
}
if (this.data.isPage != undefined && this.data.isPage != true) {
this.page = {
@@ -599,6 +624,49 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ if (this.data.needSort !== undefined) {
+ for (var i = 0; i < this.data.needSort.length; i++) {
+ this.tableHead.forEach(item => {
+ if (item.label === this.data.needSort[i]) {
+ item.sort = 'custom'
+ }
+ })
+ }
+ }
+ if (this.isShowZero) {
+ this.tableData.map(item => {
+ Object.keys(item).forEach(val => {
+ if (item[val] === null && (val.includes('Hours') || val === 'total')) {
+ item[val] = 0
+ }
+ })
+ })
+ }
+ if (this.tableData.length === 0 && this.page.current > 1) {
+ this.selectList('lastPage')
+ }
+ // if (this.isColumnWidth) {
+ // this.tableHead.forEach(item => {
+ // if(!item.width){
+ // if (item.value.length === 4) {
+ // item.width = 120
+ // } else if (item.value.length === 3){
+ // item.width = item.label.includes('Hours') ? 50 : 100
+ // } else if (item.value.length === 5){
+ // item.width = 130
+ // } else if (item.value.length === 7){
+ // item.width = 160
+ // } else if (item.value.length === 6){
+ // item.width = 150
+ // } else if (item.value.length === 2){
+ // item.width = item.label.includes('Hours') ? 52 : 86
+ // } else {
+ // item.width = item.label.includes('Hours') ? 46 : 86
+ // }
+ // }
+ // })
+ // }
+
// console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
for (var a in this.data.selectField) {
if (this.data.selectField[a].choose == true) {
@@ -766,7 +834,7 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
this.$emit('delete')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
@@ -828,7 +896,7 @@
}
this.$message.success('淇敼鎴愬姛')
this.upDia = false
- this.selectList()
+ this.selectList('page')
this.$refs.eltable.doLayout();
this.upLoad = false
}).catch(e => {
@@ -920,7 +988,7 @@
}
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
- this.selectList()
+ this.selectList('page')
this.addLoad = false
}).catch(e => {
this.addDia = false
@@ -1097,7 +1165,7 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
})
@@ -1110,41 +1178,26 @@
batchCheck(e) {
if (this.multipleSelection && this.multipleSelection.length > 0) {
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 => {
- if (e == 0) {
- item.state = '宸插鏍�'
- this.$axios.post(this.$api.auxiliaryWorkingHoursDay.check, {
- ...item
- },{
- headers: {
- 'Content-Type': 'application/json'
- }
- }
- ).then(res => {
- if (res.code === 201) {
- return
- }
- this.$parent.submitBatchCheckDialog()
- this.$message.success('鎿嶄綔鎴愬姛')
- })
- } else {
- item.state = '宸叉壒鍑�'
- this.$axios.post(this.$api.auxiliaryWorkingHoursDay.approve, {
- id: item.id,
- state: item.state
- },{
- headers: {
- 'Content-Type': 'application/json'
- }
- }
- ).then(res => {
- if (res.code === 201) {
- return
- }
- this.$parent.submitBatchCheckDialog()
- this.$message.success('鎿嶄綔鎴愬姛')
- })
+ 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('鎿嶄綔鎴愬姛')
})
} else {
this.$message.error('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�')
--
Gitblit v1.9.3